From: Valentin Villenave <valentin@villenave.net>
Date: Fri, 9 May 2008 07:33:42 +0000 (+0200)
Subject: Update from Neil in input/new
X-Git-Tag: release/2.11.46-1~19^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2e561be35adfe2c3f7d1a297d4507beab56b36a5;p=lilypond.git

Update from Neil in input/new
---

diff --git a/input/new/adding-text-indications-to-metronome-marks.ly b/input/new/adding-text-indications-to-metronome-marks.ly
deleted file mode 100644
index 59ce545537..0000000000
--- a/input/new/adding-text-indications-to-metronome-marks.ly
+++ /dev/null
@@ -1,58 +0,0 @@
-\version "2.11.45"
-\header {
-  lsrtags = "expressive-marks,tweaks-and-overrides"
-  texidoc = "
-Using Scheme code to override the stencil for @code{MetronomeMark}
-objects, this example allows the creation of metronome marks which include
-text directions.  The function @code{\movement} is called with three
-arguments: the text label, note duration, and beats per minute.
-"
-  doctitle = "Adding text indications to metronome marks"
-}
-
-#(define-markup-command (mvt layout props arg) (markup?)
-  (interpret-markup layout props
-     (markup #:huge #:bold arg)))
-
-#(define (string->duration duration-string)
-  "Parse the `duration-string', e.g. ''4..'' or ''breve.'', and return a duration object."
-  (let* ((length (string-length duration-string))
-         (dot-index (or (string-index duration-string #\.) length))
-         (len (substring duration-string 0 dot-index))
-         (dots (- length dot-index)))
-   (ly:make-duration (cond ((string=? len "breve") -1)
-                           ((string=? len "longa") -2)
-                           ((string=? len "maxima") -3)
-                           (else (log2 (string->number len))))
-                     dots 1 1)))
-
-movement = #(define-music-function (parser location text duration count music)
-                        (string? string? integer? ly:music?)
-   (define (format-movement-markup dur count context)
-     (markup #:mvt text #:hspace 1
-             #:concat ("(" #:general-align Y DOWN #:smaller #:note duration 1)
-             "="
-             #:concat ((number->string count) ")")))
-  #{
-    \set Score.metronomeMarkFormatter = #$format-movement-markup
-    \set Score.tempoWholesPerMinute = #$(ly:moment-mul (ly:make-moment count 1)
-                                         (ly:duration-length
-                                           (string->duration duration)))
-    \set Score.tempoUnitDuration = #$(string->duration duration)
-    \set Score.tempoUnitCount = $count
-    $music
-    \set Score.metronomeMarkFormatter = #format-metronome-markup
-  #})
-
-\layout { ragged-right = ##f }
-
-\relative c' { 
-  \time 3/4
-  \movement "Allegro" "2." #92
-  c2 e4
-  g2.
-  \movement "Moderato" "4" #104
-  f4 e d
-  \tempo 4 = 92
-  c2.
-}
diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly
index 484f07071d..8ff4fc4229 100644
--- a/input/new/broken-crescendo-hairpin.ly
+++ b/input/new/broken-crescendo-hairpin.ly
@@ -5,38 +5,35 @@
   texidoc = "
 In order to make parts of a crescendo hairpin invisible, the following
 method is used: A white rectangle is drawn on top of the respective
-part of the crescendo hairpin, making it invisible. The rectangle is
+part of the crescendo hairpin, making it invisible.  The rectangle is
 defined as postscript code within a text markup.
 
 To fine-tune the position and size of the markup, the number
 preceding @code{setgray} in the postscript definition can be set to a
-value <1 making it grey. The two numbers before @code{scale} in the
-postscript code are responsible for the width and height of the
+value less than one, making it grey.  The two numbers before @code{scale}
+in the postscript code are responsible for the width and height of the
 rectangle, the two numbers before @code{translate} change the x- and
-y-origin of the rectangle. 
+y-origin of the rectangle.
 
 Make sure to put the hairpin in a lower layer than the text markup to
-actually draw the rectangle above the hairpin. 
+draw the rectangle over the hairpin.
 "
   doctitle = "Broken crescendo hairpin"
 }
 
-\score {
-  \relative c' {
-    << {
-      \dynamicUp
-      \override DynamicLineSpanner #'staff-padding = #4
-      r2 r16 c'8.\pp r4
-    } \\ {
-      \override DynamicLineSpanner #'layer = #0
-      des,2\mf\< ~
-      \override TextScript #'layer = #2
-      des16_\markup {
-        \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1
+\relative c' {
+  << {
+    \dynamicUp
+    \override DynamicLineSpanner #'staff-padding = #4
+    r2 r16 c'8.\pp r4
+  } \\ {
+    \override DynamicLineSpanner #'layer = #0
+    des,2\mf\< ~
+    \override TextScript #'layer = #2
+    des16_\markup {
+      \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1
         lineto 1 1 lineto 1 0 lineto 0 0 lineto fill"
-      }
-      r8. des4 ~ des16->\sff
-    } >>
-  }
-  \layout { ragged-right = ##t }
+    }
+    r8. des4 ~ des16->\sff
+  } >>
 }
diff --git a/input/new/clip-systems.ly b/input/new/clip-systems.ly
index ad009a1a21..dcd51ce87e 100644
--- a/input/new/clip-systems.ly
+++ b/input/new/clip-systems.ly
@@ -12,10 +12,18 @@ snippets page may not adequately show the results.
 The result will be files named
 @file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}.
 
-@itemize @bullet
-@item If system starts and ends are included, they include extents of the System grob, e.g., instrument names.
-@item Grace notes at the end point of the region are not included.
-@item Regions can span multiple systems. In this case, multiple EPS files are generated.
+@itemize
+@item
+If system starts and ends are included, they include extents of the
+System grob, e.g., instrument names.
+
+@item
+Grace notes at the end point of the region are not included.
+
+@item
+Regions can span multiple systems.  In this case, multiple EPS files
+are generated.
+
 @end itemize
 "
   doctitle = "Clip systems"
@@ -74,7 +82,9 @@ origScore = \score {
   \score {
     \lyrics {
       \markup { from-2.0.1-to-4.0.1-clip.eps }
-      \markup { \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps" (ly:parser-output-name parser)) }
+      \markup {
+        \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps"
+                            (ly:parser-output-name parser)) }
     }
   }
 }
diff --git a/input/new/creating-simultaneous-rehearsal-marks.ly b/input/new/creating-simultaneous-rehearsal-marks.ly
index c6743d5abe..ec5302cb82 100644
--- a/input/new/creating-simultaneous-rehearsal-marks.ly
+++ b/input/new/creating-simultaneous-rehearsal-marks.ly
@@ -15,8 +15,6 @@ end of one system and the start of the following system.
 
 % Thanks to Risto Vääräniemi for this snippet
 
-\paper { ragged-right = ##t }
-
 {
   \key a \major
   \set Score.markFormatter = #format-mark-box-letters
@@ -36,5 +34,5 @@ end of one system and the start of the following system.
   \mark \markup { \box \bold "Intro" }
   d'1
   \mark \default
-  d'
+  d'1
 }
diff --git a/input/new/display-bracket-with-only-one-staff-in-a-system.ly b/input/new/display-bracket-with-only-one-staff-in-a-system.ly
new file mode 100644
index 0000000000..690f37114e
--- /dev/null
+++ b/input/new/display-bracket-with-only-one-staff-in-a-system.ly
@@ -0,0 +1,39 @@
+\version "2.11.38"
+\header {
+  lsrtags = "staff-notation,tweaks-and-overrides"
+  texidoc = "If there is only one staff in one of the staff types
+@code{ChoirStaff}, @code{InnerChoirStaff}, @code{InnerStaffGroup}
+or @code{StaffGroup}, the bracket and the starting bar line will not
+be displayed as standard behavior.  This can be changed by overriding
+the relevant properties, as demonstrated in this example.
+
+Note that in contexts such as @code{PianoStaff} and @code{GrandStaff}
+where the systems begin with a brace instead of a bracket, another
+property has to be set, as shown on the second system in the example.
+"
+  doctitle = "Display bracket with only one staff in a system"
+}
+
+\markup \column {
+  \score {
+    \new StaffGroup <<
+      % Must be lower than the actual number of staff lines
+      \override StaffGroup.SystemStartBracket #'collapse-height = #1
+      \override Score.SystemStartBar #'collapse-height = #1
+      \new Staff {
+        c'1
+      }
+    >>
+    \layout {}
+  }
+  \score {
+    \new PianoStaff <<
+      \override PianoStaff.SystemStartBrace #'collapse-height = #1
+      \override Score.SystemStartBar #'collapse-height = #1
+      \new Staff {
+        c'1
+      }
+    >>
+    \layout {}
+  }
+}
diff --git a/input/new/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly
index 489a9bd8a6..25521bf7b5 100644
--- a/input/new/drawing-boxes-around-grobs.ly
+++ b/input/new/drawing-boxes-around-grobs.ly
@@ -1,23 +1,22 @@
 \version "2.11.23"
-\layout { ragged-right= ##t }
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
 The @code{print-function} can be overridden to draw a box around an
-arbitrary grob.  
+arbitrary grob.
 "
   doctitle = "Drawing boxes around grobs"
 }
 
 \relative c'' {
-  \override TextScript  #'stencil =
-  #(make-stencil-boxer 0.1 0.3 ly:text-interface::print)
+  \override TextScript #'stencil =
+    #(make-stencil-boxer 0.1 0.3 ly:text-interface::print)
   c'4^"foo"
 
-  \override Stem  #'stencil =
-  #(make-stencil-boxer 0.05 0.25 ly:stem::print)
+  \override Stem #'stencil =
+    #(make-stencil-boxer 0.05 0.25 ly:stem::print)
   \override Score.RehearsalMark  #'stencil =
-  #(make-stencil-boxer 0.15 0.3 ly:text-interface::print)
+    #(make-stencil-boxer 0.15 0.3 ly:text-interface::print)
   b8
   
   \revert Stem #'stencil
diff --git a/input/new/drawing-circles-around-various-objects.ly b/input/new/drawing-circles-around-various-objects.ly
index 0fcd4ffee3..8b8a09ee2d 100644
--- a/input/new/drawing-circles-around-various-objects.ly
+++ b/input/new/drawing-circles-around-various-objects.ly
@@ -1,5 +1,4 @@
 \version "2.11.23"
-\layout { ragged-right= ##t }
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
@@ -14,14 +13,14 @@ such as @code{#'thickness}, @code{#'circle-padding} or @code{#'font-size}.
   doctitle = "Drawing circles around various objects"
 }
 
-\relative c'{
-c1
-\set Score.markFormatter
-  = #(lambda (mark context)
+\relative c' {
+  c1
+  \set Score.markFormatter =
+    #(lambda (mark context)
              (make-circle-markup (format-mark-numbers mark context)))
-\mark \default
-c2 d^\markup{\circle \finger "2"}
-\override Score.BarNumber #'break-visibility = #all-visible
-\override Score.BarNumber  #'stencil
-  = #(make-stencil-circler 0.1 0.25 ly:text-interface::print)
+  \mark \default
+  c2 d^\markup { \circle \finger 2 }
+  \override Score.BarNumber #'break-visibility = #all-visible
+  \override Score.BarNumber  #'stencil =
+    #(make-stencil-circler 0.1 0.25 ly:text-interface::print)
 }
diff --git a/input/new/incipit.ly b/input/new/incipit.ly
index 8b0081d0b1..51d5cc54c0 100644
--- a/input/new/incipit.ly
+++ b/input/new/incipit.ly
@@ -51,7 +51,8 @@ global = {
   
   %make the staff lines invisible on staves
   \override Staff.BarLine #'transparent = ##t
-  \skip 1*8 % the actual music
+  % the actual music
+  \skip 1*8
 
   % let finis bar go through all staves
   \override Staff.BarLine #'transparent = ##f
@@ -67,7 +68,7 @@ discantusIncipit = <<
       \clef "neomensural-c1"
       \key f \major
       \time 2/2
-      c''1. 
+      c''1.
     }
   >>
   \new Lyrics \lyricsto discantusIncipit { IV- }
@@ -81,7 +82,8 @@ discantusNotes = {
     c'4 e'4.( d'8 c' b |
     a4) b a2 |
     b4.( c'8 d'4) c'4 |
-    \once \override NoteHead #'transparent = ##t c'1 |
+    \once \override NoteHead #'transparent = ##t
+    c'1 |
     b\breve |
   }
 }
@@ -103,7 +105,7 @@ altusIncipit = <<
       \clef "neomensural-c3"
       \key f \major
       \time 2/2
-      r1 f'1. 
+      r1 f'1.
     }
   >>
   \new Lyrics \lyricsto altusIncipit { IV- }
@@ -112,17 +114,20 @@ altusIncipit = <<
 altusNotes = {
   \transpose c' c'' {
     \clef "treble"
-    r2 g2. e4 fis g | % two bars
+    % two measures
+    r2 g2. e4 fis g |
     a2 g4 e |
     fis g4.( fis16 e fis4) |
     g1 |
-    \once \override NoteHead #'transparent = ##t g1 |
+    \once \override NoteHead #'transparent = ##t
+    g1 |
     g\breve |
   }
 }
 
 altusLyrics = \lyricmode {
-  Ju -- bi -- la -- te | % two bars
+  % two measures
+  Ju -- bi -- la -- te |
   De -- o, om -- |
   nis ter -- ra, |
   "..." |
@@ -151,14 +156,17 @@ tenorNotes = {
     R1 |
     R1 |
     R1 |
-    r2 d'2. d'4 b e' | % two bars
-    \once \override NoteHead #'transparent = ##t e'1 |
+    % two measures
+    r2 d'2. d'4 b e' |
+    \once \override NoteHead #'transparent = ##t
+    e'1 |
     d'\breve |
   }
 }
 
 tenorLyrics = \lyricmode {
-  Ju -- bi -- la -- te | % two bars
+  % two measures
+  Ju -- bi -- la -- te |
   "..." |
   -us. 
 }
@@ -186,7 +194,8 @@ bassusNotes = {
     R1 |
     R1 |
     g2. e4 |
-    \once \override NoteHead #'transparent = ##t e1 |
+    \once \override NoteHead #'transparent = ##t
+    e1 |
     g\breve |
   }
 }
@@ -194,28 +203,28 @@ bassusNotes = {
 bassusLyrics = \lyricmode {
   Ju -- bi- |
   "..." |
-  -us. 
+  -us.
 }
 
 \score {
   <<
     \new StaffGroup = choirStaff <<
       \new Voice = "discantusNotes" <<
-        \global 
+        \global
         \set Staff.instrumentName = "Discantus"
         \incipit \discantusIncipit
         \discantusNotes
       >>
       \new Lyrics = "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics }
       \new Voice = "altusNotes" <<
-        \global 
+        \global
         \set Staff.instrumentName = "Altus"
         \incipit \altusIncipit
         \altusNotes
       >>
       \new Lyrics = "altusLyrics" \lyricsto altusNotes { \altusLyrics }
       \new Voice = "tenorNotes" <<
-        \global 
+        \global
         \set Staff.instrumentName = "Tenor"
         \incipit \tenorIncipit
         \tenorNotes
@@ -227,30 +236,33 @@ bassusLyrics = \lyricmode {
         \bassusNotes
       >>
     >>
-    \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics } 
+    \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics }
     %% Keep the bass lyrics outside of the staff group to avoid bar lines
     %% between the lyrics.
   >>
   \layout {
     \context {
       \Score
-      %% no bars in staves
+      %% no bar lines in staves
       \override BarLine #'transparent = ##t
     }
-    %% the next three instructions keep the lyrics between the barlines
+    %% the next three instructions keep the lyrics between the bar lines
     \context {
-      \Lyrics 
+      \Lyrics
       \consists "Bar_engraver" 
       \override BarLine #'transparent = ##t
     } 
-    \context { \StaffGroup \consists "Separating_line_group_engraver" }
+    \context {
+      \StaffGroup
+      \consists "Separating_line_group_engraver"
+    }
     \context {
       \Voice
       %% no slurs
       \override Slur #'transparent = ##t
       %% Comment in the below "\remove" command to allow line
-      %% breaking also at those barlines where a note overlaps
-      %% into the next bar.  The command is commented out in this
+      %% breaking also at those bar lines where a note overlaps
+      %% into the next measure.  The command is commented out in this
       %% short example score, but especially for large scores, you
       %% will typically yield better line breaking and thus improve
       %% overall spacing if you comment in the following command.
diff --git a/input/new/letter-tablature-formatting.ly b/input/new/letter-tablature-formatting.ly
deleted file mode 100644
index 0fb7fd29bc..0000000000
--- a/input/new/letter-tablature-formatting.ly
+++ /dev/null
@@ -1,12 +0,0 @@
-\version "2.11.35"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-You can format a tablature with letters instead of numbers - so that
-0->a, 1->b, 2->c, etc. 
-
-BROKEN IN 2.11, COMMENTED OUT."
-  doctitle = "Letter tablature formatting"
-}
-{ c'4 }
diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly
index dfef7c8f12..9c50cec1ea 100644
--- a/input/new/line-arrows.ly
+++ b/input/new/line-arrows.ly
@@ -1,8 +1,8 @@
 \version "2.10.0"
-\layout { ragged-right= ##t }
 \header {
   lsrtags = "expressive-marks"
-  texidoc = "Arrows can be applied to text-spanners and line-spanners (such as the Glissando)"
+  texidoc = "Arrows can be applied to text-spanners and line-spanners
+(such as the Glissando)"
   doctitle = "Line arrows"
 }
 
@@ -21,6 +21,6 @@
   \override Glissando #'arrow-length = #0.5
   \override Glissando #'arrow-width = #0.25
   
-  a8\startTextSpan gis8 a4 b4\glissando
-  b,4 | g' c\stopTextSpan c
+  a8\startTextSpan gis a4 b\glissando b,
+  g'4 c\stopTextSpan c2
 }
diff --git a/input/new/makam.ly b/input/new/makam.ly
index b62e93fd64..96447ff589 100644
--- a/input/new/makam.ly
+++ b/input/new/makam.ly
@@ -2,10 +2,10 @@
 \header {
   lsrtags = "pitches"
   texidoc = "Makam is a type of melody from Turkey using 1/9th-tone
-  microtonal alterations.  Consult the initialization file
-  @code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly})
-  for details of pitch names and alterations.
-  "
+microtonal alterations.  Consult the initialization file
+@code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly})
+for details of pitch names and alterations.
+"
   doctitle = "Makam"
 }
 
@@ -13,8 +13,8 @@
 \include "makam-init.ly"
 
 \relative c' {
-  \set Staff.keySignature =  #`((3 . ,BAKIYE) (6 . ,(- KOMA)))  
-  c cc db fk
-  gbm gfc gfb efk
-  fk db cc c
+  \set Staff.keySignature = #`((3 . ,BAKIYE) (6 . ,(- KOMA)))
+  c4 cc db fk
+  gbm4 gfc gfb efk
+  fk4 db cc c
 }
diff --git a/input/new/making-an-object-invisible-with-the-transparent-property.ly b/input/new/making-an-object-invisible-with-the-transparent-property.ly
index 30fe17870f..801955d2db 100644
--- a/input/new/making-an-object-invisible-with-the-transparent-property.ly
+++ b/input/new/making-an-object-invisible-with-the-transparent-property.ly
@@ -1,5 +1,4 @@
 \version "2.11.23"
-\layout { ragged-right = ##t }
 \header {
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
@@ -8,8 +7,7 @@ printed in \"invisible ink\": the object is not printed, but all its
 other behavior is retained.  The object still takes up space, it takes
 part in collisions, and slurs, ties and beams can be attached to it.
 
-
-The snippet demonstrates how to connect different voices using ties. 
+This snippet demonstrates how to connect different voices using ties.
 Normally, ties only connect two notes in the same voice.  By
 introducing a tie in a different voice, and blanking the first up-stem
 in that voice, the tie appears to cross voices.  To prevent the blanked stem's
@@ -26,8 +24,8 @@ flag from interfering with tie positioning, the stem is extended.
     b8 ~ b\noBeam
     \once \override Stem #'transparent = ##t
     \once \override Stem #'length = #8
-    g ~ g\noBeam
+    g8 ~ g\noBeam
   } \\ {
-    b g g e
+    b8 g g e
   } >>
 }
diff --git a/input/new/markup-lines.ly b/input/new/markup-lines.ly
index 0595133a11..26d0261e97 100644
--- a/input/new/markup-lines.ly
+++ b/input/new/markup-lines.ly
@@ -10,10 +10,10 @@
 #(set-default-paper-size "a6")
 
 #(define-markup-list-command (paragraph layout props args) (markup-list?)
-  (interpret-markup-list layout props 
+  (interpret-markup-list layout props
    (make-justified-lines-markup-list (cons (make-hspace-markup 2) args))))
 
-%% Candide, Voltaire
+% Candide, Voltaire
 \markuplines \override-lines #'(baseline-skip . 2.5) {
   \paragraph {
     Il y avait en Westphalie, dans le château de M. le baron de
diff --git a/input/new/outputting-the-version-number.ly b/input/new/outputting-the-version-number.ly
index cfb274d0ec..67c63d2513 100644
--- a/input/new/outputting-the-version-number.ly
+++ b/input/new/outputting-the-version-number.ly
@@ -10,9 +10,11 @@ a score, or in a document generated with @code{lilypond-book}.
   doctitle = "Outputting the version number"
 }
 
-\score { \context Lyrics  {
-    \override Score.RehearsalMark  #'self-alignment-X = #LEFT
-    \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version)))
+\score {
+  \context Lyrics {
+    \override Score.RehearsalMark #'self-alignment-X = #LEFT
+    \mark #(ly:export (string-append "Processed with LilyPond version "
+                       (lilypond-version)))
     s2
   }
 }
diff --git a/input/new/page-label.ly b/input/new/page-label.ly
index 2af1ad1f1b..5c76862641 100644
--- a/input/new/page-label.ly
+++ b/input/new/page-label.ly
@@ -1,9 +1,8 @@
 \version "2.11.26"
-\layout { ragged-right= ##t }
 \header {
   lsrtags = "spacing"
   texidoc = "Page labels may be placed inside music or at top-level,
-and refered to in markups."
+and referred to in markups."
   doctitle = "Page label"
 }
 
@@ -14,13 +13,13 @@ and refered to in markups."
    (markup #:fill-line (text #:page-ref label "8" "?"))))
 
 \book {
-  \markup \huge \fill-line { \null "Title Page" \null }
+  \markup \huge \fill-line { \null Title Page \null }
 
   \pageBreak
 
   \label #'toc
   \markup \column {
-    \large \fill-line { \null "Table of contents" \null }
+    \large \fill-line { \null Table of contents \null }
     \toc-line #'toc "Table of contents"
     \toc-line #'firstScore "First Score"
     \toc-line #'markA "Mark A"
@@ -33,14 +32,15 @@ and refered to in markups."
 
   \label #'firstScore
   \score {
-    { c'2 c'
-      \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) }} \label #'markA 
-      c' c'
+    {
+      c'2 c'
+      \mark \markup { A (page \concat { \page-ref #'markA "0" "?" ) } } \label #'markA
+      c'2 c'
       \pageBreak
       \mark "B" \label #'markB
-      d' d'
-      d' d'
-      \once \override Score . RehearsalMark #'break-visibility = #begin-of-line-invisible
+      d'2 d'
+      d'2 d'
+      \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
       \mark "C" \label #'markC
     }
     \header { piece = "First score" }
diff --git a/input/new/piano-template-with-centered-dynamics.ly b/input/new/piano-template-with-centered-dynamics.ly
index 65c437c0db..063c0b33ca 100644
--- a/input/new/piano-template-with-centered-dynamics.ly
+++ b/input/new/piano-template-with-centered-dynamics.ly
@@ -15,7 +15,7 @@ upper = \relative c'' {
   \key c \major
   \time 4/4
   
-  a b c d
+  a4 b c d
 }
 
 lower = \relative c {
@@ -27,12 +27,11 @@ lower = \relative c {
 }
 
 dynamics = {
-  s2\fff\> s4
-  s\!\pp
+  s2\fff\> s4 s\!\pp
 }
 
 pedal = {
-  s2\sustainDown s2\sustainUp
+  s2\sustainDown s\sustainUp
 }
 
 \score {
@@ -49,7 +48,8 @@ pedal = {
     \context {
       \type "Engraver_group"
       \name Dynamics
-      \alias Voice % So that \cresc works, for example.
+      % So that \cresc works, for example.
+      \alias Voice
       \consists "Output_property_engraver"
       
       \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
@@ -77,19 +77,8 @@ pedal = {
 }
 \score {
   \new PianoStaff <<
-    \new Staff = "upper" << \upper \dynamics >>
-    \new Staff = "lower" << \lower \dynamics >>
-    \new Dynamics = "pedal" \pedal
+    \new Staff = "upper" << \upper \dynamics \pedal >>
+    \new Staff = "lower" << \lower \dynamics \pedal >>
   >>
-  \midi {
-    \context {
-      \type "Performer_group"
-      \name Dynamics
-      \consists "Piano_pedal_performer"
-    }
-    \context {
-      \PianoStaff
-      \accepts Dynamics
-    }
-  }
+  \midi {}
 }
diff --git a/input/new/positioning-multi--measure-rests.ly b/input/new/positioning-multi--measure-rests.ly
index 64d4f07994..8db3d1f66e 100644
--- a/input/new/positioning-multi--measure-rests.ly
+++ b/input/new/positioning-multi--measure-rests.ly
@@ -1,5 +1,4 @@
 \version "2.11.42"
-\layout { ragged-right = ##t }
 \header {
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
diff --git a/input/new/quoting-another-voice-with-transposition.ly b/input/new/quoting-another-voice-with-transposition.ly
index c2ba9850a7..2f67b56eb5 100644
--- a/input/new/quoting-another-voice-with-transposition.ly
+++ b/input/new/quoting-another-voice-with-transposition.ly
@@ -2,10 +2,11 @@
 \header {
   lsrtags = "pitches,staff-notation"
   texidoc = "Quotations take into account the transposition of both
-source and target. In this example, all instruments play sounding
-middle C; the target is an instrument in F. The target part may be
-transposed using @code{\\transpose}. In this case, all the pitches (including the
-quoted ones) are transposed."
+source and target.  In this example, all instruments play sounding
+middle C; the target is an instrument in F.  The target part may be
+transposed using @code{\\transpose}.  In this case, all the pitches
+(including the quoted ones) are transposed.
+"
   doctitle = "Quoting another voice with transposition"
 }
 
@@ -29,7 +30,7 @@ quoteTest = {
 }
 
 {
-  \set Staff.instrumentName = \markup \center-align { "Horn" "in F" }
+  \set Staff.instrumentName = \markup \center-align { Horn \line { in F } }
   \quoteTest
   \transpose c' d' << \quoteTest s4_"up a tone" >>
 }
diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly
index bac9ef3ea9..cfa4726f42 100644
--- a/input/new/quoting-another-voice.ly
+++ b/input/new/quoting-another-voice.ly
@@ -1,37 +1,40 @@
 \version "2.11.10"
-\layout { ragged-right= ##t }
 \header {
   lsrtags = "staff-notation"
   texidoc = "With @code{\\quote}, fragments of previously entered
-music may be quoted. @code{quotedEventTypes} will determines what
-things are quoted.  In this example, a 16th rest is not quoted, since
+music may be quoted.  @code{quotedEventTypes} will determines which
+items are quoted.  In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
   doctitle = "Quoting another voice"
 }
 
 quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
 
-\addQuote quoteMe \quoteMe 
-original = \relative c'' { c8 d s2 es8 gis8 }
+\addQuote quoteMe \quoteMe
+original = \relative c'' {
+  c8 d s2
+  \once \override NoteColumn #'ignore-collision = ##t
+  es8 gis8
+}
 
 <<
-    \new Staff {
-	\set Staff.instrumentName = "quoteMe"
-	\quoteMe
-    }
-    \new Staff {
-	\set Staff.instrumentName = "orig"
-	\original
-    }
-    \new Staff \relative c'' <<
-	\set Staff.instrumentName = "orig+quote"	
-	\set Staff.quotedEventTypes = #'(note-event articulation-event)
-	\original
-	\new Voice {
-	    s4
+  \new Staff {
+    \set Staff.instrumentName = "quoteMe"
+    \quoteMe
+  }
+  \new Staff {
+    \set Staff.instrumentName = "orig"
+    \original
+  }
+  \new Staff \relative c'' <<
+    \set Staff.instrumentName = "orig+quote"
+    \set Staff.quotedEventTypes = #'(note-event articulation-event)
+    \original
+    \new Voice {
+      s4
 	    \set fontSize = #-4
 	    \override Stem #'length-fraction = #(magstep -4)
 	    \quoteDuring #"quoteMe" { \skip 2. }
-	}
-    >>
+    }
+  >>
 >>
diff --git a/input/new/setting-hairpin-behavior-at-bar-lines.ly b/input/new/setting-hairpin-behavior-at-bar-lines.ly
index 864f29184b..6f53465a11 100644
--- a/input/new/setting-hairpin-behavior-at-bar-lines.ly
+++ b/input/new/setting-hairpin-behavior-at-bar-lines.ly
@@ -3,7 +3,7 @@
   lsrtags = "expressive-marks"
   texidoc = "If the note which ends a hairpin falls on a downbeat,
 the hairpin stops at the bar line immediately preceding.  This behavior
-can be controlled by overriding the @code{'to-barline} property.
+can be controlled by overriding the @code{to-barline} property.
 "
   doctitle = "Setting hairpin behavior at bar lines"
 }
diff --git a/input/new/table-of-contents.ly b/input/new/table-of-contents.ly
index 327cd0972d..559ea79052 100644
--- a/input/new/table-of-contents.ly
+++ b/input/new/table-of-contents.ly
@@ -1,9 +1,8 @@
 \version "2.11.26"
-\layout { ragged-right= ##t }
 \header {
   lsrtags = "paper-and-layout"
   texidoc = "A table of contents is included using
-@code{\\markuplines \\table-of-contents}. The TOC items are added with
+@code{\\markuplines \\table-of-contents}.  The TOC items are added with
 the @code{\\tocItem} command."
   doctitle = "Table of contents"
 }
@@ -13,19 +12,18 @@ the @code{\\tocItem} command."
 \book {
   \markuplines \table-of-contents
   \pageBreak
-
-  \tocItem \markup "The first score"
+  \tocItem \markup { The first score }
   \score {
-    { 
+    {
       c'1 \pageBreak
-      \mark "A" \tocItem \markup "Mark A"
-      d'
+      \mark "A" \tocItem \markup { Mark A }
+      d'1
     }
   }
   \pageBreak
-  \tocItem \markup "The second score"
+  \tocItem \markup { The second score }
   \score {
-    { e' }
+    { e'1 }
     \header { piece = "Second score" }
   }
 }
diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index 5414de61f3..dd5c7b5f43 100644
--- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,9 +1,9 @@
 \version "2.11.33"
 \header {
   lsrtags = "pitches"
-  texidoc = "This example uses some Scheme code to enforce enharmonic modifications for
-notes in order to have the minimum number of accidentals. In this
-case, the following rules apply:
+  texidoc = "This example uses some Scheme code to enforce enharmonic
+modifications for notes in order to have the minimum number of
+accidentals.  In this case, the following rules apply:
 
 @itemize
 @item
@@ -30,7 +30,7 @@ In this manner, the most natural enharmonic notes are chosen.
 
 #(define  (naturalize-pitch p)
   (let* ((o (ly:pitch-octave p))
-         (a (* 4 (ly:pitch-alteration p))) 
+         (a (* 4 (ly:pitch-alteration p)))
     ; alteration, a, in quarter tone steps, for historical reasons
          (n (ly:pitch-notename p)))
     (cond
@@ -43,8 +43,8 @@ In this manner, the most natural enharmonic notes are chosen.
     (cond
      ((> a 2) (set! a (- a 4)) (set! n (+ n 1)))
      ((< a -2) (set! a (+ a 4)) (set! n (- n 1))))
-    (if (< n 0) (begin (set!  o (- o 1)) (set! n (+ n 7))))
-    (if (> n 6) (begin (set!  o (+ o 1)) (set! n (- n 7))))
+    (if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7))))
+    (if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7))))
     (ly:make-pitch o n (/ a 4))))
 
 #(define (naturalize music)
@@ -79,5 +79,5 @@ music =  \relative c' { c4 d e g }
     \transpose c deses \music
     \naturalizeMusic \transpose c deses \music
   }
-  \layout { ragged-right = ##t }
+  \layout {}
 }
diff --git a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly
index 6573543ea8..5b5d3650d2 100644
--- a/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly
+++ b/input/new/using-the--tweak-command-to-tweak-individual-grobs.ly
@@ -3,18 +3,19 @@
 \header {
   lsrtags = "tweaks-and-overrides"
   texidoc = "
-With the @code{\tweak} command, you can tune every grob directly. Here
+With the @code{\\tweak} command, every grob can be tuned directly.  Here
 are some examples of available tweaks.
 "
   doctitle = "Using the @code{\tweak} command to tweak individual grobs"
 }
 
-{
+\relative c' {
+  \time 2/4
   \set fingeringOrientations = #'(right)
   <
-    \tweak #'font-size #3  c
+    \tweak #'font-size #3 c
     \tweak #'color #red  d-\tweak #'font-size #8 -4
-    \tweak #'style #'cross  g
-    \tweak #'duration-log #1  a
-  >4
+    \tweak #'style #'cross g
+    \tweak #'duration-log #2 a
+  >2
 }
diff --git a/input/new/utf-8.ly b/input/new/utf-8.ly
index 8425157065..84622caab1 100644
--- a/input/new/utf-8.ly
+++ b/input/new/utf-8.ly
@@ -9,21 +9,21 @@ You may have to install additional fonts.
 Red Hat Fedora
 
     taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \
-	 ttfonts-zh_CN fonts-ja fonts-hebrew 
+   ttfonts-zh_CN fonts-ja fonts-hebrew 
 
 Debian GNU/Linux
 
    apt-get install emacs-intl-fonts xfonts-intl-.* \
-	ttf-kochi-gothic ttf-kochi-mincho \
-	xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi 
+  ttf-kochi-gothic ttf-kochi-mincho \
+  xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi 
 %} 
 
 \header {
   lsrtags = "text"
   texidoc = "Various scripts may be used for texts (like titles and
-lyrics) introduced by entering them in UTF-8 encoding, and using a
-Pango based backend.  Depending on the fonts installed, this fragment
-will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
+lyrics) by entering them in UTF-8 encoding, and using a Pango based
+backend.  Depending on the fonts installed, this fragment will
+render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
 "
   doctitle = "UTF-8"
 }
@@ -35,28 +35,27 @@ bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
 }
 
-hebrew = \lyricmode { 
+hebrew = \lyricmode {
   זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
 }
 
-japanese = \lyricmode {  
+japanese = \lyricmode {
   いろはにほへど ちりぬるを
   わがよたれぞ  つねならむ
   うゐのおくや  まけふこえて
-  あさきゆめみじ ゑひもせず 
+  あさきゆめみじ ゑひもせず
 }
 
 % "a legal song to you"
-portuguese = \lyricmode { 
+portuguese = \lyricmode {
   à vo -- cê uma can -- ção legal
 }
 
-\paper {
-  ragged-right = ##t
-}
-
-\relative  { 
-  c2 d e f g f e
+\relative  {
+  c2 d
+  e2 f
+  g2 f
+  e1
 }
 \addlyrics { \bulgarian }
 \addlyrics { \hebrew }
diff --git a/input/new/volta-multi-staff.ly b/input/new/volta-multi-staff.ly
index 84f93d8dfc..4db5dc42ef 100644
--- a/input/new/volta-multi-staff.ly
+++ b/input/new/volta-multi-staff.ly
@@ -2,25 +2,30 @@
 \layout { ragged-right= ##t }
 \header {
   lsrtags = "repeats,staff-notation"
-  texidoc = "By adding @code{Volta_engraver}, repeat brackets
-can be put over staves other than the topmost one in a score."
+  texidoc = "By adding the @code{Volta_engraver} to the relevant
+staff, volte can be put over staves other than the topmost
+one in a score."
   doctitle = "Volta multi-staff"
 }
 
 % LSR: this is a test which should get automatically
 % LSR: removed from input/lsr/    -gp
-vmus = \relative c'' {
-  \repeat volta 2 c1 \alternative { d e } 
+voltaMusic = \relative c'' {
+  \repeat volta 2
+    c1 
+    \alternative { 
+    d e
+   } 
 } 
 
 <<
   \new StaffGroup <<
-    \context Staff \vmus
-    \new Staff \vmus
+    \context Staff \voltaMusic
+    \new Staff \voltaMusic
   >>
   \new StaffGroup <<
-    \new Staff \with { \consists Volta_engraver }
-      \vmus
-    \new Staff \vmus
+    \new Staff \with { \consists "Volta_engraver" }
+      \voltaMusic
+    \new Staff \voltaMusic
   >>
 >>