release: 1.2.8

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 8f6cefcc497d13a2c7da6f35674f77fcbd8c0cf3..b3ca52a21a2d03d8a1809ced59b86cac2532671e 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <math.h>
@@ -13,7 +13,7 @@
 #include "debug.hh"
 #include "lookup.hh"
 #include "score-engraver.hh"
-#include "p-score.hh"
+#include "paper-score.hh"
 #include "identifier.hh"
 #include "main.hh"
 #include "scope.hh"
@@ -23,12 +23,6 @@
 #include "paper-stream.hh"
 
 
-#define SCMVAR(s)  { static SCM sym; \
-       if (!sym)\
-               sym = scm_protect_object (ly_symbol (#s));\
-       return get_realvar (sym); }
-
-
 Paper_def::Paper_def ()
 {
   lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
@@ -49,17 +43,45 @@ Paper_def::~Paper_def ()
 Paper_def::Paper_def (Paper_def const&s)
   : Music_output_def (s)
 {
+  shape_int_a_ = s.shape_int_a_;
   lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
   lookup_p_tab_p_->hash_func_ = int_hash;
   
   for (Hash_table_iter<int, Lookup*> ai(*s.lookup_p_tab_p_); ai.ok (); ai++)
     {
       Lookup * l = new Lookup (*ai.val ());
-      l->paper_l_ = this;
       set_lookup (ai.key(), l);
     }
 }
 
+SCM
+Paper_def::get_scm_var (SCM s) const
+{
+  if (!scope_p_->elem_b (s))
+    return SCM_BOOL_F;
+
+  Identifier * id = scope_p_->elem (s);
+  
+  SCM z;
+  SCM_NEWCELL (z);
+  SCM_SETCAR(z, s);
+
+  SCM val;
+  
+  if (dynamic_cast<Real_identifier*> (id))
+    {
+      Real r = *id->access_content_Real (false);
+      val = gh_double2scm (r);
+    }
+  else
+    {
+      return SCM_BOOL_F;
+    }
+  
+  SCM_SETCDR(z,val);
+  return z;
+}
+
 Real
 Paper_def::get_var (String s) const
 {
@@ -85,11 +107,13 @@ Interval
 Paper_def::line_dimensions_int (int n) const
 {
   if (!shape_int_a_.size ())
-    if (n)
-      return Interval (0, linewidth_f ());
-    else
-      return Interval (get_var ("indent"), linewidth_f ());
-
+    {
+      if (n)
+       return Interval (0, linewidth_f ());
+      else
+       return Interval (get_var ("indent"), linewidth_f ());
+    }
+  
   if (n >= shape_int_a_.size ())
     n = shape_int_a_.size () -1;
 
@@ -99,13 +123,13 @@ Paper_def::line_dimensions_int (int n) const
 Real
 Paper_def::beam_thickness_f () const
 {
-SCMVAR(beam_thickness);
+  return get_realvar (beam_thickness_scm_sym);
 }
 
 Real
 Paper_def::linewidth_f () const
 {
-SCMVAR(linewidth);
+  return get_realvar (linewidth_scm_sym);
 }
 
 Real
@@ -143,54 +167,41 @@ Paper_def::set_lookup (int i, Lookup*l)
     {
       delete lookup_p_tab_p_->elem (i);
     }
-  l ->paper_l_ = this;
   (*lookup_p_tab_p_)[i] = l;
 }
 
 
-Real
-Paper_def::interline_f () const
-{
-  SCMVAR(interline)
-}
-
 Real
 Paper_def::rule_thickness () const
 {
-  SCMVAR(rulethickness);
+  return get_realvar (rulethickness_scm_sym);
 }
 
 Real
 Paper_def::staffline_f () const
 {
-  SCMVAR(rulethickness)
-}
+  return get_realvar (rulethickness_scm_sym);
+    }
 
 Real
 Paper_def::staffheight_f () const
 {
-  SCMVAR(staffheight)
-}
+  return get_realvar (staffheight_scm_sym);
+    }
 
 Real
 Paper_def::interbeam_f (int multiplicity_i) const
 {
   if (multiplicity_i <= 3)
-    SCMVAR(interbeam)
+    return get_realvar (interbeam_scm_sym);
   else
-    SCMVAR(interbeam4)
-}
-
-Real
-Paper_def::internote_f () const
-{
-  return interline_f () /2.0 ;
+    return get_realvar (interbeam4_scm_sym);
 }
 
 Real
 Paper_def::note_width () const
 {
-SCMVAR(notewidth)
+  return get_realvar (notewidth_scm_sym);
 }
 
 void
@@ -248,11 +259,8 @@ Paper_def::paper_outputter_p (Paper_stream* os_p, Header* header_l, String origi
   if (scope_p_)
     p->output_scope (scope_p_, "mudelapaper");
   
-  if (output_global_ch == String("tex"))
-    {
-      *p->outstream_l_ << *scope_p_->elem ("texsetting")->access_content_String (false);
-    }
-  
+
+  //  *p->outstream_l_  << *scope_p_->elem (String (output_global_ch) + "setting")->access_content_String (false);
 
   SCM scm = gh_list (ly_symbol ("experimental-on"), SCM_UNDEFINED);
   p->output_scheme (scm);