X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def.cc;h=e277a00534513f8cddb7460da4b6afc86bd954bc;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=898d1b102e770fca72e6e5ca9034520b078d8d60;hpb=40aac0ae57ee113faa860ba221d83d9e6312173e;p=lilypond.git

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 898d1b102e..e277a00534 100644
--- 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
@@ -17,19 +17,17 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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"
 #include "warn.hh"
 
-#include "ly-smobs.icc"
 
 #include "program-option.hh"
 
@@ -46,6 +44,7 @@ Output_def::Output_def ()
 }
 
 Output_def::Output_def (Output_def const &s)
+  : Smob<Output_def> ()
 {
   scope_ = SCM_EOL;
   parent_ = 0;
@@ -61,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<Context_def> (transdef);
   assert (tp);
 
   if (tp)
@@ -94,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<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;
 }
@@ -119,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_)
@@ -165,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;
@@ -188,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;
@@ -201,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;
@@ -218,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;
         }
@@ -259,5 +253,3 @@ line_dimensions_int (Output_def *def, int n)
     : def->get_dimension (ly_symbol2scm ("indent"));
   return Interval (ind, lw);
 }
-
-