release: 1.3.93

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 08adf11220692ddf50464357e0f0f74244354ffb..7300edd6a60553c66ffca95412ec0df76634e7e0 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -8,52 +8,36 @@
 
 #include <math.h>
 
-#include "all-font-metrics.hh"
 #include "string.hh"
 #include "misc.hh"
 #include "paper-def.hh"
 #include "debug.hh"
 #include "lookup.hh"
-#include "score-engraver.hh"
-#include "paper-score.hh"
-#include "identifier.hh"
 #include "main.hh"
 #include "scope.hh"
-#include "dictionary-iter.hh"
 #include "file-results.hh" // urg? header_global_p
-#include "paper-outputter.hh"
 #include "paper-stream.hh"
 
-
 Paper_def::Paper_def ()
 {
-  lookup_p_tab_p_ = new map<int, Lookup*>;
+  lookup_alist_ = SCM_EOL;
 }
 
 
 Paper_def::~Paper_def ()
 {
-  for (map<int,Lookup*>::const_iterator ai = lookup_p_tab_p_->begin();
-       ai != lookup_p_tab_p_->end (); ai++)
-    {
-      delete (*ai).second;
-    }
-  
-  delete lookup_p_tab_p_;
 }
 
-Paper_def::Paper_def (Paper_def const&s)
-  : Music_output_def (s)
+Paper_def::Paper_def (Paper_def const&src)
+  : Music_output_def (src)
 {
-  shape_int_a_ = s.shape_int_a_;
-  lookup_p_tab_p_ = new map<int, Lookup*>;
-  
-  for (map<int,Lookup*>::const_iterator ai = s.lookup_p_tab_p_->begin();
-       ai != s.lookup_p_tab_p_->end (); ai++)
+  SCM n  = SCM_EOL;
+  for (SCM s = src.lookup_alist_; gh_pair_p(s); s = gh_cdr (s))
     {
-      Lookup * l = new Lookup (* (*ai).second);
-      set_lookup ((*ai).first, l);      
+      n = scm_acons (gh_caar(s), gh_cdar (s), n);
     }
+
+  lookup_alist_  = n;
 }
 
 
@@ -63,19 +47,31 @@ Paper_def::get_var (String s) const
   return get_realvar (ly_symbol2scm (s.ch_C()));
 }
 
+SCM
+Paper_def::get_scmvar (String s) const
+{
+  return  scope_p_->scm_elem (ly_symbol2scm (s.ch_C()));
+}
+
 Real
 Paper_def::get_realvar (SCM s) const
 {
-  if (!scope_p_->elem_b (s))
-    error (_f ("unknown paper variable: `%s'", ly_symbol2string (s)));
-  Real * p = scope_p_->elem (s)->access_content_Real (false);
-  if (!p)
+  SCM val ;
+  if (!scope_p_->try_retrieve (s, &val))
     {
-      error (_("not a real variable"));
+      programming_error ("unknown paper variable: " +  ly_symbol2string (s));
       return 0.0;
     }
 
-  return *p;
+  if (gh_number_p (val))
+    {
+      return gh_scm2double (val);
+    }
+  else
+    {
+      programming_error ("not a real variable");
+      return 0.0;
+    }
 }
 
 /*
@@ -92,54 +88,19 @@ Paper_def::line_dimensions_int (int n) const
 }
 
 void
-Paper_def::set_lookup (int i, Lookup*l)
-{
-  map<int,Lookup*> :: const_iterator it (lookup_p_tab_p_->find (i));
-  if (it != lookup_p_tab_p_->end ())
-    {
-      delete (*it).second;
-    }
-  (*lookup_p_tab_p_)[i] = l;
-}
-
-
-/*
-  junkme.
- */
-Real
-Paper_def::interbeam_f (int multiplicity_i) const
-{
-  if (multiplicity_i <= 3)
-    return get_var ("interbeam");
-  else
-    return get_var ("interbeam4");
-}
-
-
-void
-Paper_def::print () const
+Paper_def::set_lookup (int i, SCM l)
 {
-#ifndef NPRINT
-  Music_output_def::print ();
-  DEBUG_OUT << "Paper {";
-  for (map<int,Lookup*>::const_iterator ai = lookup_p_tab_p_->begin();
-       ai != lookup_p_tab_p_->end (); ai++)
-    {
-      DEBUG_OUT << "Lookup: " << (*ai).first
-               << " = " << (*ai).second->font_name_ << '\n';
-    }
-  DEBUG_OUT << "}\n";
-#endif
+  assert (unsmob_lookup (l));
+  lookup_alist_ = scm_assq_set_x(lookup_alist_, gh_int2scm (i), l);
 }
 
 Lookup const *
 Paper_def::lookup_l (int i) const
 {
-  return (*lookup_p_tab_p_)[i];
+  SCM l = scm_assq (gh_int2scm(i), lookup_alist_);
+  return l == SCM_BOOL_F ? 0 :  unsmob_lookup (gh_cdr (l));
 }
 
-
-
 int Paper_def::default_count_i_ = 0;
 
 int
@@ -164,7 +125,6 @@ Paper_def::paper_stream_p () const
     outname += String (".") + output_global_ch;
   progress_indication (_f ("paper output to %s...",
                           outname == "-" ? String ("<stdout>") : outname));
-                      
 
   target_str_global_array.push (outname);
   return new Paper_stream (outname);