release: 1.3.0

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index aaaa2e610bc3be03867457ab0aee498619197bf7..c5a9146f811d1240a9c1d6ed563334f7a499804d 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -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
 {
@@ -70,7 +92,7 @@ Real
 Paper_def::get_realvar (SCM s) const
 {
   if (!scope_p_->elem_b (s))
-    error (_f ("unknown paper variable: `%s\'", symbol_to_string (s)));
+    error (_f ("unknown paper variable: `%s'", symbol_to_string (s)));
   Real * p = scope_p_->elem (s)->access_content_Real (false);
   if (!p)
     {
@@ -85,28 +107,19 @@ 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 ());
+    {
+      Real lw =  get_realvar (linewidth_scm_sym);
+      Real ind = n? 0.0:get_var ("indent");
 
+      return Interval (ind, lw);
+    }
+  
   if (n >= shape_int_a_.size ())
     n = shape_int_a_.size () -1;
 
   return shape_int_a_[n];
 }
 
-Real
-Paper_def::beam_thickness_f () const
-{
-SCMVAR(beam_thickness);
-}
-
-Real
-Paper_def::linewidth_f () const
-{
-SCMVAR(linewidth);
-}
 
 Real
 Paper_def::length_mom_to_dist (Moment d,Real k) const
@@ -143,69 +156,33 @@ 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);
-}
-
-Real
-Paper_def::staffline_f () const
-{
-  SCMVAR(rulethickness)
-}
-
-Real
-Paper_def::staffheight_f () const
-{
-  SCMVAR(staffheight)
-}
-
 Real
 Paper_def::interbeam_f (int multiplicity_i) const
 {
   if (multiplicity_i <= 3)
-    SCMVAR(interbeam)
+    return get_realvar (interbeam_scm_sym);
   else
-    SCMVAR(interbeam4)
+    return get_realvar (interbeam4_scm_sym);
 }
 
-Real
-Paper_def::internote_f () const
-{
-  return interline_f () /2.0 ;
-}
-
-Real
-Paper_def::note_width () const
-{
-SCMVAR(notewidth)
-}
 
 void
 Paper_def::print () const
 {
 #ifndef NPRINT
   Music_output_def::print ();
-  DOUT << "Paper {";
+  DEBUG_OUT << "Paper {";
 
   for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
     {
-      DOUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n';
+      DEBUG_OUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n';
     }
 
-  DOUT << "}\n";
+  DEBUG_OUT << "}\n";
 #endif
 }
 
@@ -232,12 +209,12 @@ Paper_def::reset_default_count()
 }
 
 Paper_outputter*
-Paper_def::paper_outputter_p (Paper_stream* os_p, Header* header_l, String origin_str) const
+Paper_def::paper_outputter_p (Paper_stream* os_p, Scope* header_l, String origin_str) const
 {
   Paper_outputter* p = new Paper_outputter (os_p);
 
   // for now; breaks -fscm output
-  p->output_comment (_ ("outputting Score, defined at: "));
+  p->output_comment (_ ("Outputting Score, defined at: "));
   p->output_comment (origin_str);
 
   p->output_version();
@@ -248,11 +225,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);
@@ -269,7 +243,7 @@ Paper_def::paper_stream_p () const
 
   if (outname != "-")
     outname += String (".") + output_global_ch;
-  *mlog << _f ("Paper output to %s...", 
+  *mlog << _f ("paper output to %s...", 
               outname == "-" ? String ("<stdout>") : outname) << endl;
 
   target_str_global_array.push (outname);