X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def.cc;h=e277a00534513f8cddb7460da4b6afc86bd954bc;hb=06dfb050e6536ceeff882b4ee872e9d59bbae110;hp=b6a83212c162baef798e76f89bbd1c1868642045;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git
diff --git a/lily/output-def.cc b/lily/output-def.cc
index b6a83212c1..e277a00534 100644
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -17,13 +17,12 @@
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 "ly-module.hh"
#include "main.hh"
#include "output-def.hh"
#include "scm-hash.hh"
@@ -63,7 +62,7 @@ Output_def::~Output_def ()
SCM
-Output_def::mark_smob ()
+Output_def::mark_smob () const
{
/* FIXME: why is this necessary?
all paper_ should be protected by themselves. */
@@ -76,7 +75,7 @@ Output_def::mark_smob ()
void
assign_context_def (Output_def * m, SCM transdef)
{
- Context_def *tp = Context_def::unsmob (transdef);
+ Context_def *tp = unsmob (transdef);
assert (tp);
if (tp)
@@ -90,12 +89,12 @@ assign_context_def (Output_def * m, SCM transdef)
SCM
find_context_def (Output_def const *m, SCM name)
{
- Context_def *cd = Context_def::unsmob (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 p, scm_print_state *)
+Output_def::print_smob (SCM p, scm_print_state *) const
{
scm_puts ("#< ", p);
scm_puts (class_name (), p);
@@ -114,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_)
@@ -160,9 +159,9 @@ Output_def::normalize ()
? 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)
+ 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;
@@ -183,12 +182,12 @@ Output_def::normalize ()
if (twosided)
binding_offset = robust_scm2double (c_variable ("binding-offset"), 0);
- if (scm_line_width == SCM_UNDEFINED)
+ if (SCM_UNBNDP (scm_line_width))
{
- left_margin = ((scm_left_margin == SCM_UNDEFINED)
+ left_margin = (SCM_UNBNDP (scm_left_margin)
? left_margin_default
: scm_to_double (scm_left_margin));
- right_margin = ((scm_right_margin == SCM_UNDEFINED)
+ 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;
@@ -196,10 +195,10 @@ Output_def::normalize ()
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)
+ if (SCM_UNBNDP (scm_right_margin))
{
left_margin = (paper_width - line_width) / 2;
right_margin = left_margin;
@@ -213,7 +212,7 @@ Output_def::normalize ()
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)) + binding_offset;
}