X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=e9a56ae0e190f269ce0c0ed690c933e0c46defd8;hb=e3bd073b603167e110d3ecac4bfa3e1ca75e0106;hp=1b3a74b2a5f581636d1e6eca6a2841ae41b97ea5;hpb=01ddcb81463d7a68530971100469d3e2baf8c94b;p=lilypond.git

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 1b3a74b2a5..e9a56ae0e1 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -1,96 +1,113 @@
-#include <math.h>
-#include "misc.hh"
-#include "paper-def.hh"
-#include "debug.hh"
-#include "lookup.hh"
-#include "dimen.hh"
+/*
+  paper-def.cc -- implement Paper_def
 
+  source file of the GNU LilyPond music typesetter
 
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-// golden ratio
-const Real PHI = (1+sqrt(5))/2;
+#include "dimensions.hh"
+#include "output-def.hh"
+#include "modified-font-metric.hh"
+#include "pango-font.hh"
+#include "all-font-metrics.hh"
 
-// see  Roelofs, p. 57
 Real
-Paper_def::duration_to_dist(Moment d)
+output_scale (Output_def *od)
 {
-    if (!d)
-	return 0;
-    
-    return whole_width * pow(geometric_, log_2(d));
+  return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale")));
 }
 
-Real
-Paper_def::rule_thickness()const
+SCM
+get_font_table (Output_def *def)
 {
-    return 0.4 PT;
+  SCM font_table = def->lookup_variable (ly_symbol2scm ("scaled-fonts"));
+  if (scm_hash_table_p (font_table) != SCM_BOOL_T)
+    {
+      font_table = scm_c_make_hash_table (11);
+      def->set_variable (ly_symbol2scm ("scaled-fonts"), font_table);
+    }
+  return font_table;
 }
 
-Paper_def::Paper_def(Lookup *l)
+SCM
+get_pango_font_table (Output_def *def)
 {
-    lookup_p_ = l;
-    linewidth = 15 *CM_TO_PT;		// in cm for now
-    whole_width = 8 * note_width();
-    geometric_ = sqrt(2);
-    outfile = "lelie.out";
+  SCM font_table = def->lookup_variable (ly_symbol2scm ("pango-fonts"));
+  if (scm_hash_table_p (font_table) != SCM_BOOL_T)
+    {
+      font_table = scm_c_make_hash_table (11);
+      def->set_variable (ly_symbol2scm ("pango-fonts"), font_table);
+    }
+  return font_table;
 }
 
-Paper_def::~Paper_def()
-{
-    delete lookup_p_;
-}
-Paper_def::Paper_def(Paper_def const&s)
+/* TODO: should add nesting for Output_def here too. */
+Font_metric *
+find_scaled_font (Output_def *mod, Font_metric *f, Real m)
 {
-    lookup_p_ = new Lookup(*s.lookup_p_);
-    geometric_ = s.geometric_;
-    whole_width = s.whole_width;
-    outfile = s.outfile;
-    linewidth = s.linewidth;
-}
+  if (mod->parent_)
+    return find_scaled_font (mod->parent_, f, m);
 
-void
-Paper_def::set(Lookup*l)
-{
-    assert(l != lookup_p_);
-    delete lookup_p_;
-    lookup_p_ = l;
-}
+  Real lookup_mag = m / output_scale (mod);
 
-Real
-Paper_def::interline() const
-{
-    return lookup_p_->ball(4).dim.y.length();
-}
+  SCM font_table = get_font_table (mod);
+  SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_EOL);
+  SCM handle = scm_assoc (scm_from_double (lookup_mag), sizes);
+  if (scm_is_pair (handle))
+    return unsmob_metrics (scm_cdr (handle));
 
-Real
-Paper_def::internote() const
-{
-    return lookup_p_->internote();
-}
-Real
-Paper_def::note_width()const
-{
-    return lookup_p_->ball(4).dim.x.length( );
-}
-Real
-Paper_def::standard_height() const
-{
-    return 20 PT;
+  SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag);
+
+  sizes = scm_acons (scm_from_double (lookup_mag), val, sizes);
+  unsmob_metrics (val)->unprotect ();
+  scm_hashq_set_x (font_table, f->self_scm (), sizes);
+  return unsmob_metrics (val);
 }
 
-void
-Paper_def::print() const
+Font_metric *
+find_pango_font (Output_def *layout, SCM descr, Real factor)
 {
-#ifndef NPRINT
-    mtor << "Paper {width: " << print_dimen(linewidth);
-    mtor << "whole: " << print_dimen(whole_width);
-    mtor << "out: " <<outfile;
-    lookup_p_->print();
-    mtor << "}\n";
-#endif
+  if (layout->parent_)
+    return find_pango_font (layout->parent_, descr, factor);
+
+  SCM table = get_pango_font_table (layout);
+  SCM sizes = scm_hash_ref (table, descr, SCM_EOL);
+  SCM size_key = scm_from_double (factor);
+  SCM handle = scm_assoc (size_key, sizes);
+  if (scm_is_pair (handle))
+    return unsmob_metrics (scm_cdr (handle));
+
+  PangoFontDescription *description
+    = pango_font_description_from_string (scm_i_string_chars (descr));
+
+  pango_font_description_set_size (description,
+				   gint (factor *
+					 pango_font_description_get_size (description)));
+
+  
+  Font_metric *fm = all_fonts_global->find_pango_font (description,
+						       output_scale (layout));
+
+  pango_font_description_free (description);
+ 
+  sizes = scm_acons (size_key, fm->self_scm (), sizes);
+  scm_hash_set_x (table, descr, sizes);
+
+  return fm;
 }
-Lookup const *
-Paper_def::lookup_l()
+
+/* TODO: this is a nasty interface. During formatting,
+   the Output_def should be scaled to the output_scale_
+   specified in the toplevel Output_def.  */
+Output_def *
+scale_output_def (Output_def *o, Real amount)
 {
-    return lookup_p_;
+  SCM proc = ly_lily_module_constant ("scale-layout");
+  SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount));
+
+  o = unsmob_output_def (new_pap);
+  o->protect ();
+  return o;
 }
+