-#include <math.h>
-#include "string.hh"
-#include "misc.hh"
-#include "paper-def.hh"
-#include "debug.hh"
-#include "lookup.hh"
-#include "score-engraver.hh"
-#include "p-score.hh"
-#include "identifier.hh"
-#include "main.hh"
-#include "scope.hh"
-#include "dictionary-iter.hh"
-#include "file-results.hh" // urg? header_global_p
-#include "paper-outputter.hh"
-#include "paper-stream.hh"
-
-
-#define SCMVAR(s) { static SCM sym; \
- if (!sym)\
- sym = scm_protect_object (ly_symbol (#s));\
- return get_realvar (sym); }
-
-
-Paper_def::Paper_def ()
-{
- lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
- lookup_p_tab_p_->hash_func_ = int_hash;
-}
-
-
-Paper_def::~Paper_def ()
-{
- for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
- {
- delete ai.val ();
- }
-
- delete lookup_p_tab_p_;
-}
-
-Paper_def::Paper_def (Paper_def const&s)
- : Music_output_def (s)
-{
- lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
- lookup_p_tab_p_->hash_func_ = int_hash;
-
- for (Hash_table_iter<int, Lookup*> ai(*s.lookup_p_tab_p_); ai.ok (); ai++)
- {
- Lookup * l = new Lookup (*ai.val ());
- l->paper_l_ = this;
- set_lookup (ai.key(), l);
- }
-}
+#include "dimensions.hh"
+#include "output-def.hh"
+#include "modified-font-metric.hh"
+#include "pango-font.hh"
+#include "all-font-metrics.hh"