X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=ef6ab87107799b7cf3f0f90359c2b257154cb821;hb=98ca84585c45f75503adff82fc0a8cec2a105769;hp=df98d77ceeb2de419e98debbb58c58a17caa5069;hpb=853303f6ec72641e842d58e68bc304c5afffcd13;p=lilypond.git

diff --git a/lily/font-select.cc b/lily/font-select.cc
index df98d77cee..ef6ab87107 100644
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -9,9 +9,9 @@
 
 #include <math.h>
 
-#include "book-paper-def.hh"
+
 #include "all-font-metrics.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 #include "warn.hh"
 
@@ -22,7 +22,7 @@ LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0,
 	   "in the alist chain @var{chain}.\n"
 	   "(An alist chain is a list of alists, containing grob properties).\n")
 {
-  Paper_def *pap = unsmob_paper (paper);
+  Output_def *pap = unsmob_output_def (paper);
   SCM_ASSERT_TYPE (pap, paper, SCM_ARG1, __FUNCTION__, "paper definition");
   
   Font_metric *fm = select_font (pap, chain);
@@ -33,7 +33,7 @@ LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0,
 	   (SCM paper, SCM name),
 	   "Return the paper variable @var{name}.")
 {
-  Paper_def *pap = unsmob_paper (paper);
+  Output_def *pap = unsmob_output_def (paper);
   SCM_ASSERT_TYPE (pap, paper, SCM_ARG1, __FUNCTION__, "paper definition");
   return scm_make_real (pap->get_dimension (name));
 }
@@ -51,7 +51,7 @@ wild_compare (SCM field_val, SCM val)
   design size is specced in advance.
  */
 Font_metric*
-get_font_by_design_size (Paper_def* paper, Real requested,
+get_font_by_design_size (Output_def* paper, Real requested,
 			 SCM font_vector, SCM input_encoding_name)
 {
   int n = SCM_VECTOR_LENGTH (font_vector);
@@ -84,13 +84,14 @@ get_font_by_design_size (Paper_def* paper, Real requested,
     }
 
   Font_metric *fm = unsmob_metrics (scm_force (SCM_VECTOR_REF (font_vector, i)));
-  return paper->bookpaper_->find_scaled_font (fm, requested / size, input_encoding_name);
+  return
+    find_scaled_font (paper, fm, requested / size, input_encoding_name);
 
 }
 
 
 Font_metric*
-get_font_by_mag_step (Paper_def* paper, Real requested_step,
+get_font_by_mag_step (Output_def* paper, Real requested_step,
 		      SCM font_vector, Real default_size, SCM input_encoding_name)
 {
   return get_font_by_design_size (paper,
@@ -108,7 +109,7 @@ properties_to_font_size_family (SCM fonts, SCM alist_chain)
 
 
 Font_metric *
-select_encoded_font (Paper_def *paper, SCM chain, SCM encoding_name)
+select_encoded_font (Output_def *paper, SCM chain, SCM encoding_name)
 {
   SCM name = ly_assoc_chain (ly_symbol2scm  ("font-name"), chain);
   
@@ -129,7 +130,7 @@ select_encoded_font (Paper_def *paper, SCM chain, SCM encoding_name)
       Font_metric * fm = all_fonts_global->find_font (ly_scm2string (name));
       
       
-      return paper->bookpaper_->find_scaled_font (fm, rmag, encoding_name);
+      return find_scaled_font (paper, fm, rmag, encoding_name);
     }
   else if (scm_instance_p (name))
     {
@@ -151,7 +152,7 @@ select_encoded_font (Paper_def *paper, SCM chain, SCM encoding_name)
 }
 
 Font_metric *
-select_font (Paper_def *paper, SCM chain)
+select_font (Output_def *paper, SCM chain)
 {
   return select_encoded_font (paper, chain, SCM_EOL);
 }