X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpaper-def.cc;h=f6bf6ec19bd404f485e5b6200aed8ed5981942b8;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=84bb78ff44cbe60bbdcda2b80dde26b1d00fabf1;hpb=f68bbd7a1ed1b0e7146bbbffcbcbb7f9c9bda3cc;p=lilypond.git

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 84bb78ff44..f6bf6ec19b 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,22 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 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 "warn.hh"
 #include "scaled-font-metric.hh"
 #include "main.hh"
-#include "scope.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"
 
+/*
+  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 ()
 {
 }
@@ -36,20 +44,27 @@ Paper_def::Paper_def (Paper_def const&src)
 Real
 Paper_def::get_var (String s) const
 {
-  return get_realvar (ly_symbol2scm (s.ch_C ()));
+  return get_realvar (ly_symbol2scm (s.to_str0 ()));
 }
 
 SCM
 Paper_def::get_scmvar (String s) const
 {
-  return  scope_p_->scm_elem (ly_symbol2scm (s.ch_C ()));
+  return variable_tab_->get (ly_symbol2scm (s.to_str0 ()));
+}
+
+
+SCM
+Paper_def::get_scmvar_scm (SCM sym) const
+{
+  return  gh_double2scm (get_realvar (sym));
 }
 
 Real
 Paper_def::get_realvar (SCM s) const
 {
   SCM val ;
-  if (!scope_p_->try_retrieve (s, &val))
+  if (!variable_tab_->try_retrieve (s, &val))
     {
       programming_error ("unknown paper variable: " +  ly_symbol2string (s));
       return 0.0;
@@ -57,7 +72,7 @@ Paper_def::get_realvar (SCM s) const
 
   Real sc = 1.0;
   SCM ssc;
-  if (scope_p_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc))
+  if (variable_tab_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc))
     {
       sc = gh_scm2double (ssc);
     }
@@ -87,39 +102,41 @@ Paper_def::line_dimensions_int (int n) const
 
 
 
-int Paper_def::score_count_i_ = 0;
+int Paper_def::score_count_ = 0;
 
 int
 Paper_def::get_next_score_count () const
 {
-  return score_count_i_ ++;
+  return score_count_ ++;
 }
 
 void
 Paper_def::reset_score_count ()
 {
-  score_count_i_ = 0;
+  score_count_ = 0;
 }
 
 
 Paper_outputter*
-Paper_def::paper_outputter_p () 
+Paper_def::get_paper_outputter () 
 {
-  String outname = outname_str (); 
+  String outname = outname_string (); 
   progress_indication (_f ("paper output to `%s'...",
 			   outname == "-" ? String ("<stdout>") : outname));
 
-  target_str_global_array.push (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.str ();
+  po->basename_ = p.string ();
   return po;
 }
 
 
 /*
   todo: use symbols and hashtable idx?
+
+
 */
 Font_metric *
 Paper_def::find_font (SCM fn, Real m)
@@ -130,19 +147,31 @@ Paper_def::find_font (SCM fn, Real m)
   if (gh_pair_p (met))
     return unsmob_metrics (ly_cdr (met));
 
-  SCM ssc;
-  if (scope_p_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc))
+  /*
+    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))
     {
-      m /= gh_scm2double (ssc);
+      f = new Virtual_font_metric (fn, m, this);
+    }
+  else
+    {
+      SCM ssc;
+      if (variable_tab_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc))
+	{
+	  m /= gh_scm2double (ssc);
+	}
+
+      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);
     }
-  
-  Font_metric*  f = all_fonts_global_p->find_font (ly_scm2string (fn));
-  SCM val = Scaled_font_metric::make_scaled_font_metric (f, m);
-  scaled_fonts_ = scm_acons (key, val, scaled_fonts_);
-
-  scm_gc_unprotect_object (val);
 
-  return dynamic_cast<Scaled_font_metric*> (unsmob_metrics (val));
+  return f;
 }
 
 
@@ -152,13 +181,11 @@ Paper_def::find_font (SCM fn, Real m)
 SCM
 Paper_def::font_descriptions ()const
 {
-
-  
   SCM l = SCM_EOL;
   for (SCM s = scaled_fonts_; gh_pair_p (s); s = ly_cdr (s))
     {
-      SCM desc = gh_caar (s);
-      SCM mdesc = unsmob_metrics (gh_cdar (s))->description_;
+      SCM desc = ly_caar (s);
+      SCM mdesc = unsmob_metrics (ly_cdar (s))->description_;
 
       l = gh_cons (gh_cons (mdesc, desc), l);
     }