Merge branch 'master' into nested-bookparts

[lilypond.git] / lily / output-def.cc

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 0e0259f128d699c3635bfb51c6a5418fda07e1b0..a849afe69bf80bff698e4d09c91bb7ba6fa3ee24 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -137,7 +137,9 @@ Interval
 line_dimensions_int (Output_def *def, int n)
 {
   Real lw = def->get_dimension (ly_symbol2scm ("line-width"));
-  Real ind = n ? 0.0 : def->get_dimension (ly_symbol2scm ("indent"));
+  Real ind = n
+    ? def->get_dimension (ly_symbol2scm ("short-indent"))
+    : def->get_dimension (ly_symbol2scm ("indent"));
   return Interval (ind, lw);
 }