X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def.cc;h=a849afe69bf80bff698e4d09c91bb7ba6fa3ee24;hb=38925347b5370c7eb06f7baaeac8a461a0a12ac4;hp=81e7f7a67158af44cc0de465d807c3fd31bebbcc;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git diff --git a/lily/output-def.cc b/lily/output-def.cc index 81e7f7a671..a849afe69b 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -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; } @@ -109,7 +109,7 @@ SCM Output_def::lookup_variable (SCM sym) const { SCM var = ly_module_lookup (scope_, sym); - if (SCM_VARIABLEP (var) && SCM_VARIABLE_REF(var) != SCM_UNDEFINED) + if (SCM_VARIABLEP (var) && SCM_VARIABLE_REF (var) != SCM_UNDEFINED) return SCM_VARIABLE_REF (var); if (parent_) @@ -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); }