#include "virtual-font-metric.hh"
#include "all-font-metrics.hh"
#include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
/*
SCM name_list = SCM_EOL;
SCM *name_tail = &name_list;
- for (SCM s = font_list; ly_pair_p (s); s = ly_cdr (s))
+ for (SCM s = font_list; ly_c_pair_p (s); s = ly_cdr (s))
{
if (Font_metric *fm = unsmob_metrics (ly_car (s)))
{
*tail = scm_cons (ly_car (s),SCM_EOL);
tail = SCM_CDRLOC (*tail);
- if (!ly_number_p (mag))
+ if (!scm_is_number (mag))
/* Ugh. */
mag = ly_cdr (fm->description_);
Virtual_font_metric::count () const
{
int k = 0;
- for (SCM s = font_list_; ly_pair_p (s); s = ly_cdr (s))
+ for (SCM s = font_list_; ly_c_pair_p (s); s = ly_cdr (s))
k += unsmob_metrics (ly_car (s))->count ();
return k;
}
Virtual_font_metric::find_by_name (String glyph) const
{
Stencil m;
- for (SCM s = font_list_; m.is_empty () && ly_pair_p (s); s = ly_cdr (s))
+ for (SCM s = font_list_; m.is_empty () && ly_c_pair_p (s); s = ly_cdr (s))
{
m = unsmob_metrics (ly_car (s))->find_by_name (glyph);
}
Virtual_font_metric::get_indexed_wxwy (int code) const
{
int total = 0;
- for (SCM s = font_list_; ly_pair_p (s); s = ly_cdr (s))
+ for (SCM s = font_list_; ly_c_pair_p (s); s = ly_cdr (s))
{
Font_metric *fm = unsmob_metrics (ly_car (s));
if (code < total + fm->count ())
Virtual_font_metric::get_indexed_char (int code) const
{
int total = 0;
- for (SCM s = font_list_; ly_pair_p (s); s = ly_cdr (s))
+ for (SCM s = font_list_; ly_c_pair_p (s); s = ly_cdr (s))
{
Font_metric *fm = unsmob_metrics (ly_car (s));
if (code < total + fm->count ())
{
Stencil m;
int total = 0;
- for (SCM s = font_list_; m.is_empty () && ly_pair_p (s); s = ly_cdr (s))
+ for (SCM s = font_list_; m.is_empty () && ly_c_pair_p (s); s = ly_cdr (s))
{
Font_metric *m =unsmob_metrics (ly_car (s));
int k = m->name_to_index (glyph);
Stencil m ;
int total = 0;
- for (SCM s = font_list_; ly_pair_p (s); s = ly_cdr (s))
+ for (SCM s = font_list_; ly_c_pair_p (s); s = ly_cdr (s))
{
Font_metric *fm = unsmob_metrics (ly_car (s));
if (code < total + fm->count ())
LY_DEFINE (ly_make_virtual_font, "ly:make-virtual-font", 0, 0, 1,
(SCM args),
- "Make a virtual font metric from @var{args}, a list of font objects.")
+ "Make a virtual font metric from @var{args}, "
+ "a list of font objects.")
{
- Virtual_font_metric *fm = new Virtual_font_metric (args);
-
+ Virtual_font_metric *fm = new Virtual_font_metric (args);
return scm_gc_unprotect_object (fm->self_scm ());
}