/*
- 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 <hanwen@xs4all.nl>
- (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
+ 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 <http://www.gnu.org/licenses/>.
+*/
#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"
smobify_self ();
- scope_ = ly_make_anonymous_module (false);
+ scope_ = ly_make_module (false);
}
Output_def::Output_def (Output_def const &s)
+ : Smob<Output_def> ()
{
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_);
}
{
}
-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<Context_def> (transdef);
assert (tp);
if (tp)
SCM
find_context_def (Output_def const *m, SCM name)
{
- Context_def *cd = unsmob_context_def (m->lookup_variable (name));
+ Context_def *cd = unsmob<Context_def> (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;
}
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_)
}
SCM
-Output_def::c_variable (string s) const
+Output_def::c_variable (const string &s) const
{
return lookup_variable (ly_symbol2scm (s.c_str ()));
}
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");
+ programming_error ("called normalize () on paper with missing settings");
return;
}
else
}
Real line_width;
- Real line_width_default = paper_width - left_margin_default - right_margin_default;
+ Real line_width_default
+ = 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))
{
- if (scm_right_margin == SCM_UNDEFINED) // Vertically center systems if only line-width is given
+ // 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;
}
}
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)
+ if (abs (paper_width - line_width - left_margin - right_margin) > 1e-6)
{
line_width = line_width_default;
left_margin = left_margin_default;
: def->get_dimension (ly_symbol2scm ("indent"));
return Interval (ind, lw);
}
-
-
projects / lilypond.git / blobdiff