patch::: 1.3.78.jcn1

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index eb209453def09d5b610567b7ace6f1c8b21e13a5..698daf4585f39c01089ca15f10203fe7492463ba 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,56 +3,41 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #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 Hash_table<int, Lookup*>;
-  lookup_p_tab_p_->hash_func_ = int_hash;
+  lookup_alist_ = SCM_EOL;
 }
 
 
 Paper_def::~Paper_def ()
 {
-  for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
-    {
-      delete ai.val ();
-    }
-  
-  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 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++)
+  SCM n  = SCM_EOL;
+  for (SCM s = src.lookup_alist_; gh_pair_p(s); s = gh_cdr (s))
     {
-      Lookup * l = new Lookup (*ai.val ());
-      set_lookup (ai.key(), l);
+      n = scm_acons (gh_caar(s), gh_cdar (s), n);
     }
+
+  lookup_alist_  = n;
 }
 
 
@@ -62,92 +47,56 @@ 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)
     {
-      error (_("not a real variable"));
+      programming_error ("unknown paper variable: " +  ly_symbol2string (s));
       return 0.0;
     }
-
-  return *p;
-}
-
-
-Interval
-Paper_def::line_dimensions_int (int n) const
-{
-  SCM s = default_properties_ [ly_symbol2scm ("margin-shape")];
-  if (!gh_pair_p (s))
+  SCM val = scope_p_->scm_elem (s);
+  if (gh_number_p (val))
     {
-      Real lw =  get_var ("linewidth");
-      Real ind = n? 0.0:get_var ("indent");
-
-      return Interval (ind, lw);
+      return gh_scm2double (val);
     }
-
- 
-  SCM last = SCM_EOL;
-  while (gh_pair_p (s) && n --)
-    {
-      last = s;
-      s = gh_cdr (s);
-    }
-
-  if (s == SCM_EOL)
+  else
     {
-      s = last;
+      programming_error ("not a real variable");
+      return 0.0;
     }
-
-  SCM pair = gh_car (s);
-  
-  return Interval (gh_scm2double (gh_car (pair)),
-                  gh_scm2double (gh_cdr (pair)));
 }
 
-Real
-Paper_def::length_mom_to_dist (Moment d,Real k) const
+/*
+  FIXME. This is broken until we have a generic way of
+  putting lists inside the \paper block.
+ */
+Interval
+Paper_def::line_dimensions_int (int n) const
 {
-  return arithmetic_spacing (d,k);
-}
-
+  Real lw =  get_var ("linewidth");
+  Real ind = n? 0.0:get_var ("indent");
 
-/**
-  Get the measure wide constant for arithmetic spacing.
-
-  @see
-  John S. Gourlay. ``Spacing a Line of Music,'' Technical Report
-  OSU-CISRC-10/87-TR35, Department of Computer and Information Science,
-  The Ohio State University, 1987.
-
-  */
-Real
-Paper_def::arithmetic_constant (Moment d) const
-{
-  return get_var ("arithmetic_basicspace") - log_2 (Moment (1,8) <? d);
-}
-
-Real
-Paper_def::arithmetic_spacing (Moment d ,Real k) const
-{
-  return (log_2 (d) + k)* get_var ("arithmetic_multiplier");
+  return Interval (ind, lw);
 }
 
 void
-Paper_def::set_lookup (int i, Lookup*l)
+Paper_def::set_lookup (int i, SCM l)
 {
-  if (lookup_p_tab_p_->elem_b (i))
-    {
-      delete lookup_p_tab_p_->elem (i);
-    }
-  (*lookup_p_tab_p_)[i] = l;
+  assert (unsmob_lookup (l));
+  lookup_alist_ = scm_assq_set_x(lookup_alist_, gh_int2scm (i), l);
 }
 
 
+/*
+  junkme.
+ */
 Real
 Paper_def::interbeam_f (int multiplicity_i) const
 {
@@ -163,25 +112,18 @@ Paper_def::print () const
 {
 #ifndef NPRINT
   Music_output_def::print ();
-  DEBUG_OUT << "Paper {";
-
-  for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
-    {
-      DEBUG_OUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n';
-    }
-
-  DEBUG_OUT << "}\n";
+  if (flower_dstream)
+    gh_display (lookup_alist_);
 #endif
 }
 
 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
@@ -204,8 +146,8 @@ Paper_def::paper_stream_p () const
 
   if (outname != "-")
     outname += String (".") + output_global_ch;
-  *mlog << _f ("paper output to %s...", 
-              outname == "-" ? String ("<stdout>") : outname) << endl;
+  progress_indication (_f ("paper output to %s...",
+                          outname == "-" ? String ("<stdout>") : outname));
 
   target_str_global_array.push (outname);
   return new Paper_stream (outname);