X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def.cc;h=9c93dc68810907af158dc120a448637afa0c4f4c;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=212731bd5f759193bbbccd8592e2efa3a72aedcc;hpb=d664f5a7153ec2b1a1c4c9fba2d2174bf3140695;p=lilypond.git diff --git a/lily/output-def.cc b/lily/output-def.cc index 212731bd5f..9c93dc6881 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -1,9 +1,20 @@ /* - music-output-def.cc -- implement Output_def + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2014 Han-Wen Nienhuys - (c) 1997--2008 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "output-def.hh" @@ -11,6 +22,7 @@ #include "context-def.hh" #include "file-path.hh" #include "global-context.hh" +#include "international.hh" #include "interval.hh" #include "main.hh" #include "output-def.hh" @@ -29,8 +41,8 @@ Output_def::Output_def () parent_ = 0; smobify_self (); - - scope_ = ly_make_anonymous_module (false); + + scope_ = ly_make_module (false); } Output_def::Output_def (Output_def const &s) @@ -40,7 +52,7 @@ Output_def::Output_def (Output_def const &s) smobify_self (); input_origin_ = s.input_origin_; - scope_ = ly_make_anonymous_module (false); + scope_ = ly_make_module (false); if (ly_is_module (s.scope_)) ly_module_copy (scope_, s.scope_); } @@ -68,28 +80,28 @@ Output_def::mark_smob (SCM m) void assign_context_def (Output_def * m, SCM transdef) { - Context_def *tp = unsmob_context_def (transdef); + Context_def *tp = Context_def::unsmob (transdef); assert (tp); if (tp) { SCM sym = tp->get_context_name (); m->set_variable (sym, 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)); + Context_def *cd = Context_def::unsmob (m->lookup_variable (name)); return cd ? cd->self_scm () : SCM_EOL; } int Output_def::print_smob (SCM s, SCM p, scm_print_state *) { - Output_def * def = unsmob_output_def (s); + Output_def * def = Output_def::unsmob (s); scm_puts ("#< ", p); scm_puts (def->class_name (), p); scm_puts (">", p); @@ -109,15 +121,15 @@ Output_def::lookup_variable (SCM sym) const SCM var = ly_module_lookup (scope_, sym); if (SCM_VARIABLEP (var) && SCM_VARIABLE_REF (var) != SCM_UNDEFINED) return SCM_VARIABLE_REF (var); - + if (parent_) return parent_->lookup_variable (sym); - + return SCM_UNDEFINED; } SCM -Output_def::c_variable (string s) const +Output_def::c_variable (const string &s) const { return lookup_variable (ly_symbol2scm (s.c_str ())); } @@ -128,7 +140,114 @@ Output_def::set_variable (SCM sym, SCM val) scm_module_define (scope_, sym, val); } - +void +Output_def::normalize () +{ + Real paper_width; + SCM scm_paper_width = c_variable ("paper-width"); + + bool twosided = to_boolean (c_variable ("two-sided")); + // We don't distinguish between outer-margin / left-margin and so on + // until page-stencil positioning in page.scm + Real left_margin, left_margin_default; + SCM scm_left_margin_default = (twosided + ? c_variable ("outer-margin-default-scaled") + : c_variable ("left-margin-default-scaled")); + SCM scm_left_margin = (twosided + ? c_variable ("outer-margin") + : c_variable ("left-margin")); + + Real right_margin, right_margin_default; + SCM scm_right_margin_default = (twosided + ? c_variable ("inner-margin-default-scaled") + : c_variable ("right-margin-default-scaled")); + SCM scm_right_margin = (twosided + ? c_variable ("inner-margin") + : c_variable ("right-margin")); + + if (scm_paper_width == SCM_UNDEFINED + || scm_left_margin_default == SCM_UNDEFINED + || scm_right_margin_default == SCM_UNDEFINED) + { + programming_error ("called normalize () on paper with missing settings"); + return; + } + else + { + paper_width = scm_to_double (scm_paper_width); + left_margin_default = scm_to_double (scm_left_margin_default); + right_margin_default = scm_to_double (scm_right_margin_default); + } + + Real line_width; + Real line_width_default + = paper_width - left_margin_default - right_margin_default; + SCM scm_line_width = c_variable ("line-width"); + + Real binding_offset = 0; + if (twosided) + binding_offset = robust_scm2double (c_variable ("binding-offset"), 0); + + if (scm_line_width == SCM_UNDEFINED) + { + left_margin = ((scm_left_margin == SCM_UNDEFINED) + ? left_margin_default + : scm_to_double (scm_left_margin)); + right_margin = ((scm_right_margin == SCM_UNDEFINED) + ? right_margin_default + : scm_to_double (scm_right_margin)) + binding_offset; + line_width = paper_width - left_margin - right_margin; + } + else + { + line_width = scm_to_double (scm_line_width); + if (scm_left_margin == SCM_UNDEFINED) + { + // Vertically center systems if only line-width is given + if (scm_right_margin == SCM_UNDEFINED) + { + left_margin = (paper_width - line_width) / 2; + right_margin = left_margin; + } + else + { + right_margin = scm_to_double (scm_right_margin) + binding_offset; + left_margin = paper_width - line_width - right_margin; + } + } + else + { + left_margin = scm_to_double (scm_left_margin); + right_margin = ((scm_right_margin == SCM_UNDEFINED) + ? (paper_width - line_width - left_margin) + : scm_to_double (scm_right_margin)) + binding_offset; + } + } + + if (to_boolean (c_variable ("check-consistency"))) + { + // Consistency checks. If values don't match, set defaults. + if (abs (paper_width - line_width - left_margin - right_margin) > 1e-6) + { + line_width = line_width_default; + left_margin = left_margin_default; + right_margin = right_margin_default; + warning (_ ("margins do not fit with line-width, setting default values")); + } + else if ((left_margin < 0) || (right_margin < 0)) + { + line_width = line_width_default; + left_margin = left_margin_default; + right_margin = right_margin_default; + warning (_ ("systems run off the page due to improper paper settings, setting default values")); + } + } + + set_variable (ly_symbol2scm ("left-margin"), scm_from_double (left_margin)); + set_variable (ly_symbol2scm ("right-margin"), scm_from_double (right_margin)); + set_variable (ly_symbol2scm ("line-width"), scm_from_double (line_width)); +} + /* FIXME. This is broken until we have a generic way of putting lists inside the \layout block. */ Interval