X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-def.cc;h=aa3a296c1f4bca5f179af85b459ed41f70b825c0;hb=c20ff11378676b24f01be82f5cfbb022a0bfaab1;hp=8bf32b14905f0ac92654bb5dcaf9bdf54c0c89a9;hpb=2862b1027f316a2f0444fa92e441ee28acf7a463;p=lilypond.git

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 8bf32b1490..aa3a296c1f 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -1,188 +1,123 @@
 /*
-  paper-def.cc -- implement Paper_def
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-#include <math.h>
-#include "string.hh"
-#include "assoc.hh"
-#include "misc.hh"
-#include "paper-def.hh"
-#include "debug.hh"
-#include "lookup.hh"
-#include "dimen.hh"
-#include "input-translator.hh"
-#include "assoc-iter.hh"
-#include "score-grav.hh"
-#include "p-score.hh"
-#include "main.hh"
-
-void
-Paper_def::set_var (String s, Real r)
-{
-  real_vars_p_->elem (s) = r;
-}
- 
-Real
-Paper_def::get_var (String s) const
-{
-  if (! real_vars_p_->elt_b (s))
-    error ("unknown paper variable `"  + s+"'");
-  return real_vars_p_->elem (s);
-}
-
-Real
-Paper_def::linewidth_f() const
-{
-  return get_var ("linewidth");
-}
-
-Real
-Paper_def::duration_to_dist (Moment d,Real k) const
-{
-  if (get_var("geometric"))
-    return geometric_spacing(d);
-  return arithmetic_spacing(d,k);
-}
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-/**
-  Get the measure wide constant for arithmetic.
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-  @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.
+#include "dimensions.hh"
+#include "output-def.hh"
+#include "modified-font-metric.hh"
+#include "pango-font.hh"
+#include "all-font-metrics.hh"
 
-  */
 Real
-Paper_def::arithmetic_constant(Moment d) const
+output_scale (Output_def *od)
 {
-  return get_var("arithmetic_basicspace") - log_2(Moment(1,8) <? d);
+  return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale")));
 }
 
-Real
-Paper_def::arithmetic_spacing(Moment d ,Real k) const
+SCM
+get_font_table (Output_def *def)
 {
-  return (log_2(d) + k)* get_var("arithmetic_multiplier");
+  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;
 }
 
-Real
-Paper_def::geometric_spacing(Moment d) const
+SCM
+get_pango_font_table (Output_def *def)
 {
-  Real dur_f = (d) ?pow (get_var ("geometric"), log_2(d)) : 0;
-  return get_var ("basicspace") + get_var ("unitspace")  * dur_f;
+  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()
+/* TODO: should add nesting for Output_def here too. */
+Font_metric *
+find_scaled_font (Output_def *mod, Font_metric *f, Real m)
 {
-  itrans_p_ = 0;
-  lookup_p_ = 0;
-  real_vars_p_ = new Assoc<String,Real>;
-}
+  if (mod->parent_)
+    return find_scaled_font (mod->parent_, f, m);
 
-Paper_def::~Paper_def()
-{
-  delete itrans_p_;
-  delete real_vars_p_;
-  delete lookup_p_;
-}
+  Real lookup_mag = m / output_scale (mod);
 
-Paper_def::Paper_def (Paper_def const&s)
-{
-  itrans_p_ = s.itrans_p_ ? new Input_translator (*s.itrans_p_):0;
-  lookup_p_ = s.lookup_p_? new Lookup (*s.lookup_p_) : 0;
-  lookup_p_->paper_l_ = this;
-  real_vars_p_ = new Assoc<String,Real> (*s.real_vars_p_);
-  outfile_str_ = s.outfile_str_;
-}
+  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));
 
-void
-Paper_def::set (Input_translator * itrans_p)
-{
-  delete itrans_p_;
-  itrans_p_  = itrans_p;
-}
+  SCM val = Modified_font_metric::make_scaled_font_metric (f, lookup_mag);
 
-void
-Paper_def::set (Lookup*l)
-{
-  assert (l != lookup_p_);
-  delete lookup_p_;
-  lookup_p_ = l;
-  lookup_p_->paper_l_ = this;
+  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);
 }
 
-Real
-Paper_def::interline_f() const
+Font_metric *
+find_pango_font (Output_def *layout, SCM descr, Real factor)
 {
-  return get_var ("interline");
-}
+  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));
 
-Real
-Paper_def::rule_thickness() const
-{
-  return get_var ("rule_thickness");
-}
+  PangoFontDescription *description
+    = pango_font_description_from_string (scm_i_string_chars (descr));
 
-Real
-Paper_def::interbeam_f() const
-{
-  return get_var ("interbeam");
-}
-Real
-Paper_def::internote_f() const
-{
-  return interline_f() / 2; 
-}
+  pango_font_description_set_size (description,
+                                   gint (factor *
+                                         pango_font_description_get_size (description)));
 
-Real
-Paper_def::note_width() const
-{
-  return get_var ("notewidth");
-}
+  Font_metric *fm = all_fonts_global->find_pango_font (description,
+                                                       output_scale (layout));
 
-void
-Paper_def::print() const
-{
-#ifndef NPRINT
-  DOUT << "Paper {";
-  DOUT << "out: " <<outfile_str_;
-  lookup_p_->print();
-  itrans_p_->print();
-  for (Assoc_iter<String,Real> i (*real_vars_p_); i.ok(); i++) 
-    {
-      DOUT << i.key() << "= " << i.val () << "\n";
-    }
-  DOUT << "}\n";
-#endif
-}
+  pango_font_description_free (description);
 
-Lookup const *
-Paper_def::lookup_l()
-{
-  assert (lookup_p_);
-  return lookup_p_;
+  sizes = scm_acons (size_key, fm->self_scm (), sizes);
+  scm_hash_set_x (table, descr, sizes);
+
+  return fm;
 }
 
-Global_translator*
-Paper_def::get_global_translator_p() 
+/* 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)
 {
-  if (only_midi) 
-    {
-      return 0;
-    }
+  SCM proc = ly_lily_module_constant ("scale-layout");
+  SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_from_double (amount));
 
-  Global_translator* g =  itrans_p_->get_group_engraver_p()->global_l ();
-  assert (g->is_type_b (Score_engraver::static_name()));
-  Score_engraver*grav = (Score_engraver*) g;
-  grav->pscore_p_ = new Paper_score;
-  grav->pscore_p_->paper_l_ = this;
-  return g;	  
+  o = unsmob_output_def (new_pap);
+  o->protect ();
+  return o;
 }
 
-IMPLEMENT_IS_TYPE_B1(Paper_def, Music_output_def);