X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def.cc;h=f9fbda9fb6d3335dd90ad623ce917f5d06510f74;hb=0dc4160c750485dfab04c3289ccf13e3fe0e7526;hp=853704c5c98d478442499b28f2ea3ad22f367192;hpb=cbb205d40a19c0d2d9801031a63607e108a18038;p=lilypond.git diff --git a/lily/output-def.cc b/lily/output-def.cc index 853704c5c9..f9fbda9fb6 100644 --- 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 + (c) 1997--2009 Han-Wen Nienhuys */ #include "output-def.hh" @@ -81,7 +81,7 @@ assign_context_def (Output_def * m, SCM transdef) /* find the translator for NAME. NAME must be a symbol. */ SCM find_context_def (Output_def const *m, SCM name) -{ +{ Context_def *cd = unsmob_context_def (m->lookup_variable (name)); return cd ? cd->self_scm () : SCM_EOL; } @@ -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); }