/*
- output-def-scheme.cc -- implement Output_def bindings
+ output-def-scheme.cc -- implement Output_def bindings
source file of the GNU LilyPond music typesetter
#include "context-def.hh"
LY_DEFINE (ly_layout_lookup, "ly:output-def-lookup",
- 2, 0, 0, (SCM pap, SCM sym),
+ 2, 1, 0, (SCM pap, SCM sym, SCM def),
"Lookup @var{sym} in @var{pap}. "
- "Return the value or @code{'()} if undefined.")
+ "Return the value or @var{def} (which defaults to @code{'()}) if undefined.")
{
Output_def *op = unsmob_output_def (pap);
SCM_ASSERT_TYPE (op, pap, SCM_ARG1, __FUNCTION__, "Output_def");
SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+
+ SCM answer = op->lookup_variable (sym);
+ if (answer == SCM_UNDEFINED)
+ {
+ if (def == SCM_UNDEFINED)
+ def = SCM_EOL;
+
+ answer = def;
+ }
- return op->lookup_variable (sym);
+ return answer;
}
LY_DEFINE (ly_output_def_scope, "ly:output-def-scope",
{
Output_def *op = unsmob_output_def (def);
SCM_ASSERT_TYPE (op, def, SCM_ARG1, __FUNCTION__, "Output definition");
- SCM s = op->clone ()->self_scm ();
- scm_gc_unprotect_object (s);
- return s;
+
+ Output_def *clone = op->clone ();
+ return clone->unprotect ();
}
LY_DEFINE (ly_output_description, "ly:output-description",
"Make a output def.")
{
Output_def *bp = new Output_def ;
- return scm_gc_unprotect_object (bp->self_scm ());
+ return bp->unprotect ();
}
LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0,
{
Output_def *b = unsmob_output_def (bp);
- SCM font_table = b->lookup_variable (ly_symbol2scm ("scaled-fonts"));
SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");
- SCM ell = SCM_EOL;
- if (scm_hash_table_p (font_table) == SCM_BOOL_T)
+ SCM tab1 = b->lookup_variable (ly_symbol2scm ("scaled-fonts"));
+ SCM tab2 = b->lookup_variable (ly_symbol2scm ("pango-fonts"));
+
+ SCM alist1 = SCM_EOL;
+ if (scm_hash_table_p (tab1) == SCM_BOOL_T)
+ {
+ alist1 = scm_append (ly_alist_vals (ly_hash2alist (tab1)));
+
+ alist1 = ly_alist_vals (alist1);
+ }
+
+ SCM alist2 = SCM_EOL;
+ if (scm_hash_table_p (tab2) == SCM_BOOL_T)
+ {
+ // strip original-fonts/pango-font-descriptions
+ alist2 = scm_append (ly_alist_vals (ly_hash2alist (tab2)));
+
+ // strip size factors
+ alist2 = ly_alist_vals (alist2);
+ }
+
+ SCM alist = scm_append (scm_list_2 (alist1, alist2));
+ SCM font_list = SCM_EOL;
+ for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
{
- SCM func = ly_lily_module_constant ("hash-table->alist");
-
- for (SCM s = scm_call_1 (func, font_table); scm_is_pair (s);
- s = scm_cdr (s))
- {
- SCM entry = scm_car (s);
- for (SCM t = scm_cdr (entry); scm_is_pair (t); t = scm_cdr (t))
- {
- Font_metric *fm = unsmob_metrics (scm_cdar (t));
-
- if (dynamic_cast<Modified_font_metric*> (fm)
- || dynamic_cast<Pango_font*> (fm))
- ell = scm_cons (fm->self_scm (), ell);
- }
- }
+ SCM entry = scm_car (s);
+
+ Font_metric *fm = unsmob_metrics (entry);
+
+ if (dynamic_cast<Modified_font_metric*> (fm)
+ || dynamic_cast<Pango_font*> (fm))
+ font_list = scm_cons (fm->self_scm (), font_list);
}
- return ell;
+
+ return font_list;
}