Merge commit 'origin' into beamlets2

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

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 0e0259f128d699c3635bfb51c6a5418fda07e1b0..212731bd5f759193bbbccd8592e2efa3a72aedcc 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "output-def.hh"
@@ -92,8 +92,6 @@ Output_def::print_smob (SCM s, SCM p, scm_print_state *)
   Output_def * def = unsmob_output_def (s);
   scm_puts ("#< ", p);
   scm_puts (def->class_name (), p);
-  
-  (void)def;
   scm_puts (">", p);
   return 1;
 }
@@ -137,7 +135,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);
 }