Merge branch 'master' into translation

diff --combined Documentation/changes.tely
index db4384a1b0ca270aacc623d38f187aebd846b7af,d66218fd37bd5f7e1946067dd02a3b8712c5b36d..f8dd50a2e429b7129af277ac5f814efcdbe59352
--- 1/Documentation/changes.tely
--- 2/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@@ -61,6 -61,28 +61,28 @@@ which scares away people
  
  @end ignore
  
+ @item
+ Additional bass strings (for lute tablature) are supported.
+ @lilypond[quote,verbatim]
+ m = { f'4 d' a f d a, g, fis, e, d, c,  \bar "|." }
+ 
+ \score {
+   \new TabStaff \m
+   \layout {
+     \context {
+       \Score
+       tablatureFormat = #fret-letter-tablature-format
+     }
+     \context {
+       \TabStaff
+       stringTunings = \stringTuning <a, d f a d' f'>
+       additionalBassStrings = \stringTuning <c, d, e, fis, g,>
+       fretLabels = #'("a" "b" "r" "d" "e" "f" "g" "h" "i" "k")
+     }
+   }
+ }
+ @end lilypond
+ 
  @item
  The markup-list-command @code{\table} is now available.
  Each column may be aligned differently.
@@@ -78,6 -100,24 +100,24 @@@
        }
  }
  @end lilypond
+ 
+ @item
+ A new markup-command, @code{\with-dimensions-from}, makes
+ @code{\with-dimensions} easier to use by taking the new
+ dimensions from a markup object, given as first argument.
+ @lilypond[quote,verbatim]
+ \markup {
+   \pattern #5 #Y #0 "x"
+   \pattern #5 #Y #0 \with-dimensions-from "x" "f"
+   \pattern #5 #Y #0 \with-dimensions-from "x" "g"
+   \override #'(baseline-skip . 2)
+   \column {
+     \pattern #5 #X #0 "n"
+     \pattern #5 #X #0 \with-dimensions-from "n" "m"
+     \pattern #5 #X #0 \with-dimensions-from "n" "!"
+   }
+ }
+ @end lilypond
  
  @item
  A new page breaking function @code{ly:one-line-auto-height-breaking}
@@@ -558,7 -598,7 +598,7 @@@ improved.  Previously, tuplet numbers w
  position of the tuplet bracket, even if it was not printed.  This could
  lead to stranded tuplet numbers.  Now they are now positioned
  closer to the kneed-beam when an appropriate beam segment exists for its
 -placement and when the the bracket is not drawn.
 +placement and when the bracket is not drawn.
  
  Collision detection is also added, offsetting horizontally if too close
  to an adjoining note column but preserving the number's vertical
@@@ -719,7 -759,7 +759,7 @@@ Four new Clef glyphs have been added @e
    \clef "varC" c c c c
    \clef "altovarC" c c c c
    \clef "tenorvarC" c c c c
 -  \clef "baritonevarC" c c c
 +  \clef "baritonevarC" c c c c
    \clef "varpercussion" c c c c
  @end lilypond
  

diff --combined Documentation/notation/input.itely
index 64b21a462df003e102e0cece55fce787a9d538a5,6686f3fcfdf94c9cc3122512c1f310523e27a47c..da9b1347a260688f95f3acbd0001336ba45f12f0
--- 1/Documentation/notation/input.itely
--- 2/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@@ -2631,7 -2631,7 +2631,7 @@@ Installed Files
  
  It is possible to output one or more fragments of a score by defining
  the explicit location of the music to be extracted within the
 -@code{\layout} block of the the input file using the @code{clip-regions}
 +@code{\layout} block of the input file using the @code{clip-regions}
  function, and then running LilyPond with the @option{-dclip-systems}
  option;
  
@@@ -2729,11 -2729,10 +2729,10 @@@ voices and staves, saving even more tim
  @cindex EPS output
  
  The default output formats for the printed score are Portable
- Document Format (PDF) and PostScript (PS).  Scalable Vector
- Graphics (SVG), Encapsulated PostScript (EPS) and Portable
- Network Graphics (PNG) output formats are also available through
- command line options, see
- @rprogram{Basic command line options for LilyPond}.
+ Document Format (PDF) and PostScript (PS).  Portable
+ Network Graphics (PNG), Scalable Vector Graphics (SVG) and Encapsulated
+ PostScript (EPS) output is available through the command line option,
+ see @rprogram{Basic command line options for LilyPond}.
  
  
  @node Replacing the notation font