release: 1.3.118

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index bae8a1b395b9491922ca4f7bdc825696baf25484..12f787a63315b434cac42859e77e4edd3699def4 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -8,44 +8,28 @@
 
 #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 "scaled-font-metric.hh"
 #include "main.hh"
 #include "scope.hh"
 #include "file-results.hh" // urg? header_global_p
-#include "paper-stream.hh"
+#include "paper-outputter.hh"
 
 Paper_def::Paper_def ()
 {
-  lookup_p_tab_p_ = new map<int, Lookup*>;
 }
 
-
 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)
 {
-  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++)
-    {
-      Lookup * l = new Lookup (* (*ai).second);
-      set_lookup ((*ai).first, l);      
-    }
 }
 
 
@@ -64,19 +48,26 @@ Paper_def::get_scmvar (String s) const
 Real
 Paper_def::get_realvar (SCM s) const
 {
-  if (!scope_p_->elem_b (s))
+  SCM val ;
+  if (!scope_p_->try_retrieve (s, &val))
     {
       programming_error ("unknown paper variable: " +  ly_symbol2string (s));
       return 0.0;
     }
-  SCM val = scope_p_->scm_elem (s);
+
+  Real sc = 1.0;
+  SCM ssc;
+  if (scope_p_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc))
+    {
+      sc = gh_scm2double (ssc);
+    }
   if (gh_number_p (val))
     {
-      return gh_scm2double (val);
+      return gh_scm2double (val) / sc;
     }
   else
     {
-      non_fatal_error (_("not a real variable"));
+      programming_error ("not a real variable");
       return 0.0;
     }
 }
@@ -94,53 +85,6 @@ Paper_def::line_dimensions_int (int n) const
   return Interval (ind, lw);
 }
 
-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
-{
-#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
-}
-
-Lookup const *
-Paper_def::lookup_l (int i) const
-{
-  return (*lookup_p_tab_p_)[i];
-}
-
 
 
 int Paper_def::default_count_i_ = 0;
@@ -158,35 +102,66 @@ Paper_def::reset_default_count()
 }
 
 
-Paper_stream*
-Paper_def::paper_stream_p () const
+Paper_outputter*
+Paper_def::paper_outputter_p () 
 {
-  String outname = base_output_str ();
-
+  String basename = base_output_str (); 
+  String outname = basename;
   if (outname != "-")
     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);
+  Paper_outputter * po = new Paper_outputter (outname);
+  po->basename_ = basename;
+  return po;
 }
 
 
-String
-Paper_def::base_output_str () const
+/*
+  todo: use symbols and hashtable idx?
+*/
+Font_metric *
+Paper_def::find_font (SCM fn, Real m)
 {
-  String str = get_default_output ();
+  SCM key = gh_cons (fn, gh_double2scm (m));
+  SCM met = scm_assoc (key, scaled_fonts_);
+
+  if (gh_pair_p (met))
+    return unsmob_metrics (gh_cdr (met));
 
-  if (str.empty_b ())
+  SCM ssc;
+  if (scope_p_->try_retrieve (ly_symbol2scm ("outputscale"), &ssc))
     {
-      str = default_outname_base_global;
-      int def = get_next_default_count ();
-      if (def)
-       str += "-" + to_str (def);
+      m /= gh_scm2double (ssc);
     }
-  return str;
+  
+  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_unprotect_object (val);
+
+  return dynamic_cast<Scaled_font_metric*> (unsmob_metrics (val));
 }
 
 
+/*
+  Return alist to translate internally used fonts back to real-world
+  coordinates.  */
+SCM
+Paper_def::font_descriptions ()const
+{
+
+  
+  SCM l = SCM_EOL;
+  for (SCM s = scaled_fonts_; gh_pair_p (s); s = gh_cdr(s))
+    {
+      SCM desc = gh_caar (s);
+      SCM mdesc = unsmob_metrics (gh_cdar (s))->description_;
+
+      l = gh_cons (gh_cons (mdesc, desc), l);
+    }
+  return l;
+}