Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 86dd7e4dff6da657222ccca8cd9dca3516b8d53c..e0003fc452866dbd7a4c957083ff0cdf0448d11c 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -585,11 +585,8 @@ g4( e c2)
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {using-double-slurs-for-legato-chords.ly}
 
-@c TODO remove ignores after LSR update
-@ignore
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{positioning-text-markups-inside-slurs}
-@end ignore
+{positioning-text-markups-inside-slurs.ly}
 
 @seealso
 Music Glossary:

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 13a8612b0270d2a44c8cfe1a869faad2423b41f1..a9facc6bb831b014552767752e80359024da87e4 100644 (file)
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -856,7 +856,7 @@ must all be relative to the directory containing the main file,
 not the directory containing the included file. However,
 this behavior can be changed by passing the option
 @code{-drelative-includes} option at the command line
-(or by adding using @code{#(ly:set-option 'relative-includes #t)}
+(or by adding @code{#(ly:set-option 'relative-includes #t)}
 at the top of the main input file). With @code{relative-includes}
 set, the path for each @code{\include} command will be taken
 relative to the file containing that command. This behavior is
@@ -884,19 +884,21 @@ and in main.ly write
 
 Files which are to be included in many scores may be placed in
 the LilyPond directory @file{../ly}.  (The location of this
-directory is installation-dependent - see @rlearning{Other sources
-of information}).  These files can then be included simply by
-naming them on an @code{\include} statement.  This is how the
-language-dependent files like @file{english.ly} are included.
+directory is installation-dependent - see
+@rlearning{Other sources of information}).  These files can then
+be included simply by naming them on an @code{\include} statement.
+This is how the language-dependent files like @file{english.ly} are
+included.
 
 LilyPond includes a number of files by default when you start
 the program.  These includes are not apparent to the user, but the
 files may be identified by running @code{lilypond --verbose} from
 the command line.  This will display a list of paths and files that
 LilyPond uses, along with much other information.  Alternatively,
-the more important of these files are discussed in @rlearning{Other
-sources of information}.  These files may be edited, but changes to
-them will be lost on installing a new version of LilyPond.
+the more important of these files are discussed in
+@rlearning{Other sources of information}.  These files may be
+edited, but changes to them will be lost on installing a new
+version of LilyPond.
 
 Some simple examples of using @code{\include} are shown in
 @rlearning{Scores and parts}.

diff --git a/input/new/creating-a-delayed-turn.ly b/input/new/creating-a-delayed-turn.ly
index 38fec619332dba9b16ad1df47b982261ce8a6b7d..fe417be0f263ca6d26ab953892d3cc0af8fa4e08 100644 (file)
--- a/input/new/creating-a-delayed-turn.ly
+++ b/input/new/creating-a-delayed-turn.ly
@@ -1,12 +1,16 @@
 \version "2.12.0"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
-  texidoc = "Creating a delayed turn, where the lower note of the
-  turn uses the accidental, requires several overrides.  The
-  @code{outside-staff-priority} property must be set to #f, as otherwise
-  this would take precedence over the @code{avoid-slur property}.  The
-  value of @code{halign} is used to position the turn horizontally."
+  lsrtags = "expressive-marks, editorial-annotations, 
+tweaks-and-overrides"
+
+  texidoc = "
+Creating a delayed turn, where the lower note of the
+turn uses the accidental, requires several overrides.  The
+@code{outside-staff-priority} property must be set to @code{#f},
+as otherwise this would take precedence over the
+@code{avoid-slur property}.  The value of @code{halign} is used
+to position the turn horizontally."
 
   doctitle = "Creating a delayed turn"
 }

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 0c5b7e6db5830e226615b86dcaab1e7e0c2e3997..1b4537290ed59f180086bc4472df0f4064427f86 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -793,7 +793,7 @@ of Editio Vaticana."
   \Voice
   \name "GregorianTranscriptionVoice"
   \alias "Voice"
-  
+
   %% Removing ligature bracket engraver without replacing it by some
   %% other ligature engraver would cause a "Junking event: `LigatureEvent'"
   %% warning for every "\[" and "\]".  Therefore, we make the grob
@@ -847,7 +847,8 @@ accommodated for typesetting a piece in mensural style."
   \consists "Mensural_ligature_engraver"
 
   %% Set default head for notes outside of \[ \].
-  \override NoteHead #'style = #'petrucci
+  \override NoteHead #'style = #'mensural
+  \override Rest #'style = #'mensural
 
   %% There are no beams in mensural notation.
   autoBeaming = ##f
@@ -875,8 +876,8 @@ accommodated for typesetting a piece in mensural style."
   %% FIXME: unit on StaffSymbol's width should be \linewidth.
   %% \override StaffSymbol #'width = #60.0
 
-  %% Choose petrucci g clef on 2nd line as default.
-  clefGlyph = #"clefs.petrucci.g"
+  %% Choose mensural g clef on 2nd line as default.
+  clefGlyph = #"clefs.mensural.g"
   middleCClefPosition = #-6
   middleCPosition = #-6
   clefPosition = #-2
@@ -894,7 +895,7 @@ accommodated for typesetting a piece in mensural style."
   %% #(set-accidental-style 'forget))
   extraNatural = ##f
   autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave -1))
-  autoCautionaries = #'()  
+  autoCautionaries = #'()
   printKeyCancellation = ##f
 }