X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Foutput-def.hh;h=5de672e67addf202f1609017da8d0d838272bb81;hb=48c0f8c8843785c20f84bd113c6dea1a0c95a70c;hp=968779d2025d026e5f3c6e6edcbe9fb0766e4f4a;hpb=daf323ec5bc8a09f80ea54c63f1cfedb310d2aaa;p=lilypond.git

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index 968779d202..5de672e67a 100644
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 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
@@ -46,14 +46,15 @@
   one coming from score at markup level)
   
  */
-class Output_def   
+class Output_def : public Smob<Output_def>
 {
-
 public:
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  static const char type_p_name_[];
+  virtual ~Output_def ();
   VIRTUAL_COPY_CONSTRUCTOR (Output_def, Output_def);
-  DECLARE_SMOBS (Output_def);
 
-public:
   SCM scope_;
   Output_def *parent_;
   
@@ -65,7 +66,7 @@ public:
   /*
     variables.
    */
-  SCM c_variable (string id) const;
+  SCM c_variable (const string &id) const;
   SCM lookup_variable (SCM sym) const;
   void set_variable (SCM sym, SCM val);
   void normalize ();
@@ -81,7 +82,6 @@ Interval line_dimensions_int (Output_def *def, int);
 Font_metric *select_encoded_font (Output_def *layout, SCM chain);
 Font_metric *select_font (Output_def *layout, SCM chain);
 
-DECLARE_UNSMOB (Output_def, output_def);
 
 
 Font_metric* find_pango_font (Output_def *layout,  SCM descr, Real factor);