X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def.cc;h=e277a00534513f8cddb7460da4b6afc86bd954bc;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=4a1ce211ba741336a20d11d77a01c66e5a7ff62a;hpb=aa8523e4fa16352a1708065e447aac65426d82a4;p=lilypond.git diff --git a/lily/output-def.cc b/lily/output-def.cc index 4a1ce211ba..e277a00534 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -1,24 +1,33 @@ /* - 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--2015 Han-Wen Nienhuys - (c) 1997--2009 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. -#include "output-def.hh" + 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 "context-def.hh" #include "file-path.hh" #include "global-context.hh" #include "international.hh" #include "interval.hh" +#include "ly-module.hh" #include "main.hh" #include "output-def.hh" #include "scm-hash.hh" #include "warn.hh" -#include "ly-smobs.icc" #include "program-option.hh" @@ -31,17 +40,18 @@ Output_def::Output_def () smobify_self (); - scope_ = ly_make_anonymous_module (false); + scope_ = ly_make_module (false); } Output_def::Output_def (Output_def const &s) + : Smob () { scope_ = SCM_EOL; parent_ = 0; 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_); } @@ -50,26 +60,22 @@ Output_def::~Output_def () { } -IMPLEMENT_SMOBS (Output_def); -IMPLEMENT_DEFAULT_EQUAL_P (Output_def); SCM -Output_def::mark_smob (SCM m) +Output_def::mark_smob () const { - Output_def *mo = (Output_def*) SCM_CELL_WORD_1 (m); - /* FIXME: why is this necessary? all paper_ should be protected by themselves. */ - if (mo->parent_) - scm_gc_mark (mo->parent_->self_scm ()); + if (parent_) + scm_gc_mark (parent_->self_scm ()); - return mo->scope_; + return scope_; } void assign_context_def (Output_def * m, SCM transdef) { - Context_def *tp = unsmob_context_def (transdef); + Context_def *tp = unsmob (transdef); assert (tp); if (tp) @@ -83,16 +89,15 @@ assign_context_def (Output_def * m, SCM transdef) SCM find_context_def (Output_def const *m, SCM name) { - Context_def *cd = unsmob_context_def (m->lookup_variable (name)); + Context_def *cd = 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::print_smob (SCM p, scm_print_state *) const { - Output_def * def = unsmob_output_def (s); scm_puts ("#< ", p); - scm_puts (def->class_name (), p); + scm_puts (class_name (), p); scm_puts (">", p); return 1; } @@ -108,7 +113,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_UNBNDP (SCM_VARIABLE_REF (var))) return SCM_VARIABLE_REF (var); if (parent_) @@ -118,7 +123,7 @@ Output_def::lookup_variable (SCM sym) const } SCM -Output_def::c_variable (string s) const +Output_def::c_variable (const string &s) const { return lookup_variable (ly_symbol2scm (s.c_str ())); } @@ -135,17 +140,28 @@ 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 = c_variable ("left-margin-default"); - SCM scm_left_margin = c_variable ("left-margin"); + 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 = c_variable ("right-margin-default"); - SCM scm_right_margin = c_variable ("right-margin"); - - if (scm_paper_width == SCM_UNDEFINED - || scm_left_margin_default == SCM_UNDEFINED - || scm_right_margin_default == SCM_UNDEFINED) + 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_UNBNDP (scm_paper_width) + || SCM_UNBNDP (scm_left_margin_default) + || SCM_UNBNDP (scm_right_margin_default)) { programming_error ("called normalize () on paper with missing settings"); return; @@ -162,39 +178,43 @@ Output_def::normalize () = paper_width - left_margin_default - right_margin_default; SCM scm_line_width = c_variable ("line-width"); - if (scm_line_width == SCM_UNDEFINED) + Real binding_offset = 0; + if (twosided) + binding_offset = robust_scm2double (c_variable ("binding-offset"), 0); + + if (SCM_UNBNDP (scm_line_width)) { - 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)); + left_margin = (SCM_UNBNDP (scm_left_margin) + ? left_margin_default + : scm_to_double (scm_left_margin)); + right_margin = (SCM_UNBNDP (scm_right_margin) + ? 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) + if (SCM_UNBNDP (scm_left_margin)) { - // Vertically center systems if only line-width is given - if (scm_right_margin == SCM_UNDEFINED) + // Vertically center systems if only line-width is given + if (SCM_UNBNDP (scm_right_margin)) { left_margin = (paper_width - line_width) / 2; right_margin = left_margin; } else { - right_margin = scm_to_double (scm_right_margin); + 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) + right_margin = (SCM_UNBNDP (scm_right_margin) ? (paper_width - line_width - left_margin) - : scm_to_double (scm_right_margin)); + : scm_to_double (scm_right_margin)) + binding_offset; } } @@ -233,5 +253,3 @@ line_dimensions_int (Output_def *def, int n) : def->get_dimension (ly_symbol2scm ("indent")); return Interval (ind, lw); } - -