Change short-indent behaviour.

Harmonize with indent so that short instrument names are not indented in the margin.

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);
 }
 

diff --git a/scm/paper.scm b/scm/paper.scm
index 951addf12d621e8e00ca81f5cbc54e0c26756819..d587f5e9c04465699358b2a7cb986cc665a90876 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -207,7 +207,7 @@ size. SZ is in points"
                                     (ly:modules-lookup (list m) 'right-margin (* 10 mm))))
 
     (module-define! m 'indent (/ w 14))
-    (module-define! m 'short-indent (* 5 mm))
+    (module-define! m 'short-indent 0)
 
     ;; page layout - what to do with (printer specific!) margin settings?