X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=4d59d1f763b464eafebef2dd5640672f36409d3c;hb=11b3094461e045deafd0e2b1cef8c60f79e259a1;hp=2fedfe4b32ca35c1e63618b7eaea966d371fb9a2;hpb=48f2b9351f93d0161c675cfb60e95bf919041df2;p=lilypond.git

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 2fedfe4b32..4d59d1f763 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,229 +3,160 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+
 #include <math.h>
+
+#include "virtual-font-metric.hh"
 #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 "warn.hh"
+#include "scaled-font-metric.hh"
 #include "main.hh"
-#include "scope.hh"
-#include "dictionary-iter.hh"
-#include "file-results.hh" // urg? header_global_p
+#include "scm-hash.hh"
+#include "input-file-results.hh" // urg? header_global
 #include "paper-outputter.hh"
-#include "paper-stream.hh"
-
+#include "ly-modules.hh"
 
+/*
+  This is an almost empty thing. The only substantial thing this class
+  handles, is scaling up and down to real-world dimensions (internally
+  dimensions are against global staff-space.)
+  
+ */
 Paper_def::Paper_def ()
 {
-  lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
-  lookup_p_tab_p_->hash_func_ = int_hash;
 }
 
-
 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++)
-    {
-      Lookup * l = new Lookup (*ai.val ());
-      set_lookup (ai.key(), l);
-    }
 }
 
 
-Real
-Paper_def::get_var (String s) const
-{
-  return get_realvar (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"));
-      return 0.0;
-    }
-
-  return *p;
+  SCM val = lookup_variable (s);
+  SCM scale = lookup_variable (ly_symbol2scm ("outputscale"));
+  
+  Real sc = gh_scm2double (scale);
+  return gh_scm2double (val) / sc;
 }
 
-
+/*
+  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
 {
-  SCM s = default_properties_ [ly_symbol2scm ("margin-shape")];
-  if (!gh_pair_p (s))
-    {
-      Real lw =  get_var ("linewidth");
-      Real ind = n? 0.0:get_var ("indent");
-
-      return Interval (ind, lw);
-    }
-
- 
-  SCM last = SCM_EOL;
-  while (gh_pair_p (s) && n --)
-    {
-      last = s;
-      s = gh_cdr (s);
-    }
-
-  if (s == SCM_EOL)
-    {
-      s = last;
-    }
+  Real lw =  get_realvar (ly_symbol2scm ("linewidth"));
+  Real ind = n? 0.0:get_realvar (ly_symbol2scm ("indent"));
 
-  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
-{
-  return arithmetic_spacing (d,k);
+  return Interval (ind, lw);
 }
 
 
-/**
-  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);
-}
+int Paper_def::score_count_ = 0;
 
-Real
-Paper_def::arithmetic_spacing (Moment d ,Real k) const
+int
+Paper_def::get_next_score_count () const
 {
-  return (log_2 (d) + k)* get_var ("arithmetic_multiplier");
+  return score_count_ ++;
 }
 
 void
-Paper_def::set_lookup (int i, Lookup*l)
+Paper_def::reset_score_count ()
 {
-  if (lookup_p_tab_p_->elem_b (i))
-    {
-      delete lookup_p_tab_p_->elem (i);
-    }
-  (*lookup_p_tab_p_)[i] = l;
+  score_count_ = 0;
 }
 
 
-Real
-Paper_def::interbeam_f (int multiplicity_i) const
+Paper_outputter*
+Paper_def::get_paper_outputter () 
 {
-  if (multiplicity_i <= 3)
-    return get_var ("interbeam");
-  else
-    return get_var ("interbeam4");
+  String outname = outname_string (); 
+  progress_indication (_f ("paper output to `%s'...",
+			   outname == "-" ? String ("<stdout>") : outname));
+
+  global_input_file->target_strings_.push (outname);
+  Paper_outputter * po = new Paper_outputter (outname);
+  Path p = split_path (outname);
+  p.ext = "";
+  po->basename_ = p.to_string ();
+  return po;
 }
 
 
-void
-Paper_def::print () const
+/*
+  todo: use symbols and hashtable idx?
+*/
+Font_metric *
+Paper_def::find_font (SCM fn, Real m)
 {
-#ifndef NPRINT
-  Music_output_def::print ();
-  DEBUG_OUT << "Paper {";
+  SCM key = gh_cons (fn, gh_double2scm (m));
+  SCM met = scm_assoc (key, scaled_fonts_);
+
+  if (gh_pair_p (met))
+    return unsmob_metrics (ly_cdr (met));
 
-  for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
+  /*
+    Hmm. We're chaining font - metrics. Should consider wether to merge
+    virtual-font and scaled_font.
+   */
+  Font_metric*  f=0;
+  if (gh_list_p (fn))
     {
-      DEBUG_OUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n';
+      f = new Virtual_font_metric (fn, m, this);
     }
+  else
+    {
+      SCM scale_var = ly_module_lookup (scope_, ly_symbol2scm ("outputscale"));
 
-  DEBUG_OUT << "}\n";
-#endif
-}
-
-Lookup const *
-Paper_def::lookup_l (int i) const
-{
-  return (*lookup_p_tab_p_)[i];
-}
-
-
-
-int Paper_def::default_count_i_ = 0;
+      m /= gh_scm2double (scm_variable_ref (scale_var));
 
-int
-Paper_def::get_next_default_count () const
-{
-  return default_count_i_ ++;
-}
+      f = all_fonts_global->find_font (ly_scm2string (fn));
+      SCM val = Scaled_font_metric::make_scaled_font_metric (f, m);
+      scaled_fonts_ = scm_acons (key, val, scaled_fonts_);
+      f = unsmob_metrics (val);
+      scm_gc_unprotect_object (val);
+    }
 
-void
-Paper_def::reset_default_count()
-{
-  default_count_i_ = 0;
+  return f;
 }
 
 
-Paper_stream*
-Paper_def::paper_stream_p () const
+/*
+  Return alist to translate internally used fonts back to real-world
+  coordinates.  */
+SCM
+Paper_def::font_descriptions ()const
 {
-  String outname = base_output_str ();
-
-  if (outname != "-")
-    outname += String (".") + output_global_ch;
-  progress_indication (_f ("paper output to %s...",
-			   outname == "-" ? String ("<stdout>") : outname));
-		       
+  SCM l = SCM_EOL;
+  for (SCM s = scaled_fonts_; gh_pair_p (s); s = ly_cdr (s))
+    {
+      SCM desc = ly_caar (s);
+      SCM mdesc = unsmob_metrics (ly_cdar (s))->description_;
 
-  target_str_global_array.push (outname);
-  return new Paper_stream (outname);
+      l = gh_cons (gh_cons (mdesc, desc), l);
+    }
+  return l;
 }
 
-
-String
-Paper_def::base_output_str () const
+Paper_def* 
+unsmob_paper (SCM x)
 {
-  String str = get_default_output ();
-
-  if (str.empty_b ())
-    {
-      str = default_outname_base_global;
-      int def = get_next_default_count ();
-      if (def)
-	str += "-" + to_str (def);
-    }
-  return str;
+  return dynamic_cast<Paper_def*> (unsmob_music_output_def (x));
 }
 
-
+