* lily/music-output-def.cc (Music_output_def): remove separate

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

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 82a4ade8a7667538a4cac8d87ff955b790c0e60f..388235ab7d9f858042832daa4d0319ffd2aa6572 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include <math.h>
 
+#include "book-paper-def.hh"
 #include "virtual-font-metric.hh"
 #include "all-font-metrics.hh"
 #include "string.hh"
@@ -18,145 +19,71 @@
 #include "scaled-font-metric.hh"
 #include "main.hh"
 #include "scm-hash.hh"
-#include "input-file-results.hh" // urg? header_global
 #include "paper-outputter.hh"
-#include "ly-modules.hh"
-
+#include "ly-module.hh"
 
 /*
   This is an almost empty thing. The only substantial thing this class
-  handles, is scaling up and down to real-world dimensions (internally
+  handles is scaling up and down to real-world dimensions (internally
   dimensions are against global staff-space.)
-  
  */
-Paper_def::Paper_def ()
-{
-}
 
-Paper_def::~Paper_def ()
+Paper_def::Paper_def ()
 {
+  bookpaper_ = 0;
 }
 
 Paper_def::Paper_def (Paper_def const&src)
   : Music_output_def (src)
 {
+  /* Do not remove this statement, scm_make_hash_table may trigger GC.  */
+  bookpaper_ = 0;
 }
 
-
-Real
-Paper_def::get_var (String s) const
+Paper_def::~Paper_def ()
 {
-  return get_realvar (ly_symbol2scm (s.to_str0 ()));
 }
 
 Real
-Paper_def::get_realvar (SCM s) const
+Paper_def::get_dimension (SCM s) const
 {
   SCM val = lookup_variable (s);
-  SCM scale = lookup_variable (ly_symbol2scm ("outputscale"));
-  
-  Real sc = gh_scm2double (scale);
-  return gh_scm2double (val) / sc;
+  return ly_scm2double (val);
 }
 
-/*
-  FIXME. This is broken until we have a generic way of
-  putting lists inside the \paper block.
- */
+/* FIXME.  This is broken until we have a generic way of
+   putting lists inside the \paper block.  */
 Interval
 Paper_def::line_dimensions_int (int n) const
 {
-  Real lw =  get_var ("linewidth");
-  Real ind = n? 0.0:get_var ("indent");
+  Real lw =  get_dimension (ly_symbol2scm ("linewidth"));
+  Real ind = n? 0.0:get_dimension (ly_symbol2scm ("indent"));
 
   return Interval (ind, lw);
 }
 
-
-
-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));
+  return new Paper_outputter (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.string ();
-  return po;
 }
 
-
-/*
-  todo: use symbols and hashtable idx?
-
-
-*/
-Font_metric *
-Paper_def::find_font (SCM fn, Real m)
+Paper_def* 
+unsmob_paper (SCM x)
 {
-  SCM key = gh_cons (fn, gh_double2scm (m));
-  SCM met = scm_assoc (key, scaled_fonts_);
-
-  if (gh_pair_p (met))
-    return unsmob_metrics (ly_cdr (met));
-
-  /*
-    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))
-    {
-      f = new Virtual_font_metric (fn, m, this);
-    }
-  else
-    {
-      SCM var =   ly_module_lookup (scope_, ly_symbol2scm ("outputscale"));
-      m /= gh_scm2double (scm_variable_ref (var));
-
-      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);
-    }
-
-  return f;
+  return dynamic_cast<Paper_def*> (unsmob_music_output_def (x));
 }
+  
 
-
-/*
-  Return alist to translate internally used fonts back to real-world
-  coordinates.  */
-SCM
-Paper_def::font_descriptions ()const
+LY_DEFINE (ly_paper_def_p, "ly:paper-def?",
+          1, 0, 0, (SCM def),
+          "Is @var{def} a paper definition?")
 {
-  SCM l = SCM_EOL;
-  for (SCM s = scaled_fonts_; gh_pair_p (s); s = ly_cdr (s))
-    {
-      SCM desc = ly_caar (s);
-      SCM mdesc = unsmob_metrics (ly_cdar (s))->description_;
-
-      l = gh_cons (gh_cons (mdesc, desc), l);
-    }
-  return l;
+  Paper_def *op = dynamic_cast<Paper_def*> (unsmob_music_output_def (def));
+
+  bool pap = op;
+  return ly_bool2scm (pap);
 }