#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"
"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);
(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));
}
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);
}
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,
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);
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))
{
}
Font_metric *
-select_font (Paper_def *paper, SCM chain)
+select_font (Output_def *paper, SCM chain)
{
return select_encoded_font (paper, chain, SCM_EOL);
}