*/
#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;
}
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_.get (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 --)
+ else
{
- last = s;
- s = gh_cdr (s);
+ programming_error ("not a real variable");
+ return 0.0;
}
+}
- if (s == SCM_EOL)
- {
- s = last;
- }
+/*
+ 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
+{
+ Real lw = get_var ("linewidth");
+ Real ind = n? 0.0:get_var ("indent");
- SCM pair = gh_car (s);
-
- return Interval (gh_scm2double (gh_car (pair)),
- gh_scm2double (gh_cdr (pair)));
+ 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);
}
{
#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
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);