From: Jean-Charles Malahieude <lilyfan@orange.fr>
Date: Sat, 6 Feb 2016 10:17:18 +0000 (+0100)
Subject: Merge branch 'master' into translation
X-Git-Tag: release/2.19.37-1~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8211950f0931c4d8a0e18ee9e436e489bd583dbd;hp=-c;p=lilypond.git

Merge branch 'master' into translation
---

8211950f0931c4d8a0e18ee9e436e489bd583dbd
diff --combined Documentation/notation/input.itely
index 2ac6fc8a22,ccfad7c9a7..c109df7b28
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@@ -277,7 -277,7 +277,7 @@@ Lilypond provides facilities to allow y
  are used by the various back-ends when producing output files.
  
  In the previous section, we saw how Lilypond prevents name-clashes when
 -producing several ouputs from a single source file.  You also have the
 +producing several outputs from a single source file.  You also have the
  ability to specify your own suffixes for each @code{\book} block, so
  for example you can produce files called
  @file{eightminiatures-Romanze.pdf}, @file{eightminiatures-Menuetto.pdf}
@@@ -1765,7 -1765,7 +1765,7 @@@ inside a music expression
  @end verbatim
  
  Markups used for formatting the table of contents are defined in the
 -@code{\paper} block.  There two @q{pre-defined} markups already
 +@code{\paper} block.  There are two @q{pre-defined} markups already
  available;
  
  @itemize
@@@ -1846,7 -1846,7 +1846,7 @@@ is defined for entering act names in a 
  
  @noindent
  A new markup variable (called @code{tocActMarkup}) is defined in the
 -@code{\paper} block ;
 +@code{\paper} block;
  
  @verbatim
  \paper {
@@@ -2126,7 -2126,7 +2126,7 @@@ sopranoMusic = \relative { a'4 b c b8( 
  altoMusic = \relative { e'4 e e f }
  tenorMusic = \relative { c'4 b e d8( c) }
  bassMusic = \relative { a4 gis a d, }
- allLyrics = \lyricmode {King of glo -- ry }
+ allLyrics = \lyricmode { King of glo -- ry }
  <<
    \new Staff = "Soprano" \sopranoMusic
    \new Lyrics \allLyrics
@@@ -2144,17 -2144,11 +2144,11 @@@
    \new Lyrics \allLyrics
    \new PianoStaff <<
      \new Staff = "RH" {
-       \set Staff.printPartCombineTexts = ##f
-       \partcombine
-       \sopranoMusic
-       \altoMusic
+       \partcombine \sopranoMusic \altoMusic
      }
      \new Staff = "LH" {
-       \set Staff.printPartCombineTexts = ##f
        \clef "bass"
-       \partcombine
-       \tenorMusic
-       \bassMusic
+       \partcombine \tenorMusic \bassMusic
      }
    >>
  >>
@@@ -2665,7 -2659,7 +2659,7 @@@ By default, each music fragment will b
  file, but other formats such as @code{PDF} or @code{PNG} can also be
  created if required.  The extracted music is output as if had been
  literally @q{cut} from the original printed score so if a fragment runs
 -over one or more lines, a separate ouput file for each line will be
 +over one or more lines, a separate output file for each line will be
  generated.
  
  @seealso
@@@ -3542,7 -3536,7 +3536,7 @@@ Notes that do not have any articulation
  shortened; so to compensate for this, restrict the use of the
  @code{\articulate} function to shorter segments of music or modify the
  values of the variables defined in the @file{articulate} script to
 -compenstate for the note-shortening behavior.}
 +compentate for the note-shortening behavior.}