* 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 fb01b677857a6be81ceb0b2cef4c4c8407990197..388235ab7d9f858042832daa4d0319ffd2aa6572 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -3,158 +3,87 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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"
 #include "misc.hh"
 #include "paper-def.hh"
-#include "debug.hh"
-#include "lookup.hh"
+#include "warn.hh"
+#include "scaled-font-metric.hh"
 #include "main.hh"
-#include "scope.hh"
-#include "file-results.hh" // urg? header_global_p
-#include "paper-stream.hh"
-
-Paper_def::Paper_def ()
-{
-  lookup_alist_ = SCM_EOL;
-}
+#include "scm-hash.hh"
+#include "paper-outputter.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
+  dimensions are against global staff-space.)
+ */
 
-Paper_def::~Paper_def ()
+Paper_def::Paper_def ()
 {
+  bookpaper_ = 0;
 }
 
 Paper_def::Paper_def (Paper_def const&src)
   : Music_output_def (src)
 {
-  SCM n  = SCM_EOL;
-  for (SCM s = src.lookup_alist_; gh_pair_p(s); s = gh_cdr (s))
-    {
-      n = scm_acons (gh_caar(s), gh_cdar (s), n);
-    }
-
-  lookup_alist_  = n;
-}
-
-
-Real
-Paper_def::get_var (String s) const
-{
-  return get_realvar (ly_symbol2scm (s.ch_C()));
+  /* Do not remove this statement, scm_make_hash_table may trigger GC.  */
+  bookpaper_ = 0;
 }
 
-SCM
-Paper_def::get_scmvar (String s) const
+Paper_def::~Paper_def ()
 {
-  return  scope_p_->scm_elem (ly_symbol2scm (s.ch_C()));
 }
 
 Real
-Paper_def::get_realvar (SCM s) const
+Paper_def::get_dimension (SCM s) const
 {
-  if (!scope_p_->elem_b (s))
-    {
-      programming_error ("unknown paper variable: " +  ly_symbol2string (s));
-      return 0.0;
-    }
-  SCM val = scope_p_->scm_elem (s);
-  if (gh_number_p (val))
-    {
-      return gh_scm2double (val);
-    }
-  else
-    {
-      programming_error ("not a real variable");
-      return 0.0;
-    }
+  SCM val = lookup_variable (s);
+  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);
 }
 
-void
-Paper_def::set_lookup (int i, SCM l)
+Paper_outputter*
+Paper_def::get_paper_outputter (String outname) const
 {
-  assert (unsmob_lookup (l));
-  lookup_alist_ = scm_assq_set_x(lookup_alist_, gh_int2scm (i), l);
-}
-
-
+  progress_indication (_f ("paper output to `%s'...",
+                          outname == "-" ? String ("<stdout>") : outname));
+  return new Paper_outputter (outname);
 
-void
-Paper_def::print () const
-{
-#ifndef NPRINT
-  Music_output_def::print ();
-  if (flower_dstream)
-    gh_display (lookup_alist_);
-#endif
 }
 
-Lookup const *
-Paper_def::lookup_l (int i) const
+Paper_def* 
+unsmob_paper (SCM x)
 {
-  SCM l = scm_assq (gh_int2scm(i), lookup_alist_);
-  return l == SCM_BOOL_F ? 0 :  unsmob_lookup (gh_cdr (l));
+  return dynamic_cast<Paper_def*> (unsmob_music_output_def (x));
 }
+  
 
-int Paper_def::default_count_i_ = 0;
-
-int
-Paper_def::get_next_default_count () const
+LY_DEFINE (ly_paper_def_p, "ly:paper-def?",
+          1, 0, 0, (SCM def),
+          "Is @var{def} a paper definition?")
 {
-  return default_count_i_ ++;
-}
+  Paper_def *op = dynamic_cast<Paper_def*> (unsmob_music_output_def (def));
 
-void
-Paper_def::reset_default_count()
-{
-  default_count_i_ = 0;
+  bool pap = op;
+  return ly_bool2scm (pap);
 }
-
-
-Paper_stream*
-Paper_def::paper_stream_p () const
-{
-  String outname = base_output_str ();
-
-  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);
-}
-
-
-String
-Paper_def::base_output_str () const
-{
-  String str = get_default_output ();
-
-  if (str.empty_b ())
-    {
-      str = default_outname_base_global;
-      int def = get_next_default_count ();
-      if (def)
-       str += "-" + to_str (def);
-    }
-  return str;
-}
-
-