X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def.cc;h=b6a83212c162baef798e76f89bbd1c1868642045;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=8a1c87707c7b4a0dd4561ff7c215b79544deb645;hpb=34881554afeaf03a55a3a983caf9cfeaaf3ea060;p=lilypond.git diff --git a/lily/output-def.cc b/lily/output-def.cc index 8a1c87707c..b6a83212c1 100644 --- a/lily/output-def.cc +++ b/lily/output-def.cc @@ -1,94 +1,104 @@ /* - 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--2004 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" + #include "context-def.hh" #include "file-path.hh" #include "global-context.hh" +#include "international.hh" #include "interval.hh" -#include "lily-guile.hh" -#include "ly-module.hh" #include "main.hh" #include "output-def.hh" -#include "output-def.hh" #include "scm-hash.hh" #include "warn.hh" + +#include "program-option.hh" + +#include "string-convert.hh" + Output_def::Output_def () { scope_ = SCM_EOL; parent_ = 0; + 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); - if (ly_c_module_p (s.scope_)) - ly_import_module (scope_, s.scope_); + scope_ = ly_make_module (false); + if (ly_is_module (s.scope_)) + ly_module_copy (scope_, s.scope_); } Output_def::~Output_def () { } -#include "ly-smobs.icc" -IMPLEMENT_SMOBS (Output_def); -IMPLEMENT_DEFAULT_EQUAL_P (Output_def); SCM -Output_def::mark_smob (SCM m) +Output_def::mark_smob () { - 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 = 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::print_smob (SCM p, scm_print_state *) { - Output_def * def = unsmob_output_def (s); scm_puts ("#< ", p); - scm_puts (classname (def), p); - - (void)def; + scm_puts (class_name (), p); scm_puts (">", p); return 1; } @@ -104,19 +114,19 @@ 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_) return parent_->lookup_variable (sym); - - return SCM_EOL; + + 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.to_str0 ())); + return lookup_variable (ly_symbol2scm (s.c_str ())); } void @@ -125,98 +135,122 @@ Output_def::set_variable (SCM sym, SCM val) scm_module_define (scope_, sym, val); } -LY_DEFINE (ly_layout_lookup, "ly:output-def-lookup", - 2, 0, 0, (SCM pap, SCM sym), - "Lookup @var{sym} in @var{pap}. " - "Return the value or @code{'()} if undefined.") -{ - Output_def *op = unsmob_output_def (pap); - SCM_ASSERT_TYPE (op, pap, SCM_ARG1, __FUNCTION__, "Output_def"); - SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); - - return op->lookup_variable (sym); -} - -LY_DEFINE (ly_output_def_scope, "ly:output-def-scope", - 1, 0, 0, (SCM def), - "Get the variable scope inside @var{def}.") +void +Output_def::normalize () { - Output_def *op = unsmob_output_def (def); - SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition"); - return op->scope_; -} + 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); + } -LY_DEFINE (ly_output_def_parent, "ly:output-def-parent", - 1, 0, 0, (SCM def), - "Get the parent output-def of @var{def}.") -{ - Output_def *op = unsmob_output_def (def); - SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition"); - return op->parent_ ? op->parent_->self_scm () : SCM_EOL; -} + Real line_width; + Real line_width_default + = paper_width - left_margin_default - right_margin_default; + SCM scm_line_width = c_variable ("line-width"); -LY_DEFINE (ly_output_def_clone, "ly:output-def-clone", - 1, 0, 0, (SCM def), - "Clone @var{def}.") -{ - Output_def *op = unsmob_output_def (def); - SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition"); - SCM s = op->clone ()->self_scm (); - scm_gc_unprotect_object (s); - return s; -} + Real binding_offset = 0; + if (twosided) + binding_offset = robust_scm2double (c_variable ("binding-offset"), 0); -LY_DEFINE (ly_output_description, "ly:output-description", - 1, 0, 0, (SCM output_def), - "Return the description of translators in @var{output-def}.") -{ - Output_def *id = unsmob_output_def (output_def); - - SCM al = ly_module2alist (id->scope_); + 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; + } + } - SCM ell = SCM_EOL; - for (SCM s = al; scm_is_pair (s); s = scm_cdr (s)) + if (to_boolean (c_variable ("check-consistency"))) { - Context_def * td = unsmob_context_def (scm_cdar (s)); - SCM key = scm_caar (s); - if (td && key == td->get_context_name ()) - ell = scm_cons (scm_cons (key, td->to_alist ()), ell); + // 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")); + } } - return ell; + + 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 line_dimensions_int (Output_def *def, int n) { - Real lw = def->get_dimension (ly_symbol2scm ("linewidth")); - Real ind = n ? 0.0 : def->get_dimension (ly_symbol2scm ("indent")); + Real lw = def->get_dimension (ly_symbol2scm ("line-width")); + Real ind = n + ? def->get_dimension (ly_symbol2scm ("short-indent")) + : def->get_dimension (ly_symbol2scm ("indent")); return Interval (ind, lw); } - -LY_DEFINE (ly_layout_def_p, "ly:layout-def?", - 1, 0, 0, (SCM def), - "Is @var{def} a layout definition?") -{ - return ly_bool2scm (unsmob_output_def (def)); -} - -LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale", - 1, 0, 0, (SCM bp), - "Get outputscale for BP.") -{ - Output_def *b = unsmob_output_def (bp); - SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper"); - return scm_make_real (output_scale (b)); -} - -LY_DEFINE (ly_make_output_def, "ly:make-output-def", - 0, 0, 0, (), - "Make a output def.") -{ - Output_def *bp = new Output_def ; - return scm_gc_unprotect_object (bp->self_scm ()); -} - -