Issue 3687 (part 0): run convert-ly

[lilypond.git] / lily / output-def.cc

diff --git a/lily/output-def.cc b/lily/output-def.cc
index efbe2b937a90cda559d8c5ea904b41923e8f5f47..af407fb70ac08465f87757fde59b59b2936db0de 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -45,6 +45,7 @@ Output_def::Output_def ()
 }
 
 Output_def::Output_def (Output_def const &s)
+  : Smob<Output_def> ()
 {
   scope_ = SCM_EOL;
   parent_ = 0;
@@ -113,7 +114,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_)
@@ -159,9 +160,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;
@@ -182,12 +183,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;
@@ -195,10 +196,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;
@@ -212,7 +213,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;
         }