2003 -> 2004

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 217e33752441eb1f075f3347719d3bb4cf8928b4..27de71fa443b8f811d97553beebfe015692a1dad 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -67,25 +67,11 @@ Paper_def::line_dimensions_int (int n) const
 }
 
 
-int Paper_def::score_count_ = 0;
-
-int
-Paper_def::get_next_score_count () const
-{
-  return score_count_ ++;
-}
-
-void
-Paper_def::reset_score_count ()
-{
-  score_count_ = 0;
-}
 
 
 Paper_outputter*
-Paper_def::get_paper_outputter () 
+Paper_def::get_paper_outputter (String outname)  const
 {
-  String outname = outname_string (); 
   progress_indication (_f ("paper output to `%s'...",
                           outname == "-" ? String ("<stdout>") : outname));
 
@@ -99,7 +85,7 @@ Paper_def::get_paper_outputter ()
 
 
 /*
-  todo: use symbols and hashtable idx?
+  Todo: use symbols and hashtable idx?
 */
 Font_metric *
 Paper_def::find_font (SCM fn, Real m)
@@ -117,7 +103,10 @@ Paper_def::find_font (SCM fn, Real m)
   Font_metric*  f=0;
   if (gh_list_p (fn))
     {
-      f = new Virtual_font_metric (fn, m, this);
+      f = new Virtual_font_metric (fn, m, this); // TODO: GC protection.
+      
+      scaled_fonts_ = scm_acons (key, f->self_scm (), scaled_fonts_);
+      scm_gc_unprotect_object (f->self_scm ());
     }
   else
     {
@@ -146,6 +135,9 @@ Paper_def::font_descriptions ()const
   for (SCM s = scaled_fonts_; gh_pair_p (s); s = ly_cdr (s))
     {
       SCM desc = ly_caar (s);
+      if (!gh_string_p (gh_car (desc)))
+       continue ;
+
       SCM mdesc = unsmob_metrics (ly_cdar (s))->description_;
 
       l = gh_cons (gh_cons (mdesc, desc), l);
@@ -153,34 +145,6 @@ Paper_def::font_descriptions ()const
   return l;
 }
 
-/*
-  Font_interface should be reorganised?
-*/
-#include "font-interface.hh"
-
-
-LY_DEFINE(ly_paper_get_font,"ly:paper-get-font", 2, 0, 0,
-         (SCM paper, SCM chain),
-         "Return a font metric satisfying the font-qualifiers in the alist chain @var{chain}.\n"
-"\n"
-"The font object represents the metric information of a font. Every font\n"
-"that is loaded into LilyPond can be accessed via Scheme. \n"
-"\n"
-"LilyPond only needs to know the dimension of glyph to be able to process\n"
-"them. This information is stored in font metric files. LilyPond can read\n"
-"two types of font-metrics: @TeX{} Font Metric files (TFM files) and\n"
-"Adobe Font Metric files (AFM files).  LilyPond will always try to load\n"
-"AFM files first since they are more versatile.\n"
-"\n"
-"An alist chain is a list of alists, containing grob properties.\n")
-{
-  Paper_def *pap = unsmob_paper (paper);
-  SCM_ASSERT_TYPE(pap, paper, SCM_ARG1, __FUNCTION__, "paper definition");
-  
-  Font_metric*fm = Font_interface::get_font (pap, chain);
-  return fm->self_scm();
-}
-
 Paper_def* 
 unsmob_paper (SCM x)
 {