X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=5c9d9b6b2116864ee73a51d5da26622b68556d1a;hb=bf79f6426e9c1bed311ab88bec13aee3376f6916;hp=20fff1c73098a4ddf302b4b93ed3e2aef41ba540;hpb=a14b5b5ff23548ad5040245c53896ba6afb1b226;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 20fff1c730..5c9d9b6b21 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -4,8 +4,7 @@ source file of the GNU LilyPond music typesetter (c) 1998--2004 Jan Nieuwenhuizen - - Han-Wen Nienhuys + Han-Wen Nienhuys */ @@ -73,7 +72,7 @@ ly_quote_scm (SCM s) String ly_symbol2string (SCM s) { - assert (is_symbol (s)); + assert (ly_c_symbol_p (s)); return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s)); } @@ -107,7 +106,7 @@ LY_DEFINE (ly_gulp_file, "ly:gulp-file", "Read the file @var{name}, and return its contents in a string. " "The file is looked up using the search path.") { - SCM_ASSERT_TYPE (is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string"); return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ()); } @@ -125,7 +124,7 @@ ly_display_scm (SCM s) String ly_scm2string (SCM s) { - assert (is_string (s)); + assert (ly_c_string_p (s)); char *p = SCM_STRING_CHARS (s); String r (p); @@ -135,24 +134,20 @@ ly_scm2string (SCM s) char * ly_scm2newstr (SCM str, size_t *lenp) { - char *new_str; - size_t len; - - SCM_ASSERT_TYPE (is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); - - len = SCM_STRING_LENGTH (str); - new_str = (char *) malloc ((len + 1) * sizeof (char)); - - if (new_str == NULL) - return NULL; - - memcpy (new_str, SCM_STRING_CHARS (str), len); - new_str[len] = '\0'; + SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); - if (lenp != NULL) - *lenp = len; + size_t len = SCM_STRING_LENGTH (str); + if (char *new_str = (char *) malloc ((len + 1) * sizeof (char))) + { + memcpy (new_str, SCM_STRING_CHARS (str), len); + new_str[len] = '\0'; - return new_str; + if (lenp) + *lenp = len; + + return new_str; + } + return 0; } SCM @@ -173,21 +168,23 @@ index_set_cell (SCM s, Direction d, SCM v) return s; } -LY_DEFINE (ly_warning,"ly:warn", 1, 0, 0, - (SCM str), "Scheme callable function to issue the warning @code{msg}.") +LY_DEFINE (ly_warn, "ly:warn", + 1, 0, 0, (SCM str), + "Scheme callable function to issue the warning @code{msg}.") { - SCM_ASSERT_TYPE (is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); progress_indication ("\n"); warning ("lily-guile: " + ly_scm2string (str)); return SCM_BOOL_T; } -LY_DEFINE (ly_dir_p, "ly:dir?", 1,0, 0, (SCM s), +LY_DEFINE (ly_dir_p, "ly:dir?", + 1, 0, 0, (SCM s), "type predicate. A direction is @code{-1}, @code{0} or " "@code{1}, where @code{-1} represents " "left or down and @code{1} represents right or up.") { - if (is_number (s)) + if (ly_c_number_p (s)) { int i = ly_scm2int (s); return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F; @@ -198,7 +195,8 @@ LY_DEFINE (ly_dir_p, "ly:dir?", 1,0, 0, (SCM s), bool is_number_pair (SCM p) { - return is_pair (p) && is_number (ly_car (p)) && is_number (ly_cdr (p)); + return ly_c_pair_p (p) + && ly_c_number_p (ly_car (p)) && ly_c_number_p (ly_cdr (p)); } typedef void (*Void_fptr) (); @@ -212,7 +210,6 @@ void add_scm_init_func (void (*f) ()) scm_init_funcs_->push (f); } - void ly_init_ly_module (void *) { @@ -234,17 +231,16 @@ ly_c_init_guile () scm_c_use_module ("lily"); } -unsigned int ly_scm_hash (SCM s) +unsigned int +ly_scm_hash (SCM s) { return scm_ihashv (s, ~1u); } - - bool is_direction (SCM s) { - if (is_number (s)) + if (ly_c_number_p (s)) { int i = ly_scm2int (s); return i>= -1 && i <= 1; @@ -252,11 +248,10 @@ is_direction (SCM s) return false; } - bool is_axis (SCM s) { - if (is_number (s)) + if (ly_c_number_p (s)) { int i = ly_scm2int (s); return i== 0 || i == 1; @@ -292,7 +287,7 @@ ly_interval2scm (Drul_array i) bool to_boolean (SCM s) { - return is_boolean (s) && ly_scm2bool (s); + return ly_c_boolean_p (s) && ly_scm2bool (s); } /* Appendable list L: the cdr contains the list, the car the last cons @@ -315,7 +310,6 @@ appendable_list_append (SCM l, SCM elt) scm_set_car_x (l, newcons); } - SCM ly_offset2scm (Offset o) { @@ -329,12 +323,11 @@ ly_scm2offset (SCM s) ly_scm2double (ly_cdr (s))); } - LY_DEFINE (ly_number2string, "ly:number->string", 1, 0, 0, (SCM s), "Convert @var{num} to a string without generating many decimals.") { - SCM_ASSERT_TYPE (is_number (s), s, SCM_ARG1, __FUNCTION__, "number"); + SCM_ASSERT_TYPE (ly_c_number_p (s), s, SCM_ARG1, __FUNCTION__, "number"); char str[400]; // ugh. @@ -384,9 +377,9 @@ LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d), SCM ly_deep_copy (SCM src) { - if (is_pair (src)) + if (ly_c_pair_p (src)) return scm_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src))); - else if (is_vector (src)) + else if (ly_c_vector_p (src)) { int len = SCM_VECTOR_LENGTH (src); SCM nv = scm_c_make_vector (len, SCM_UNDEFINED); @@ -405,10 +398,10 @@ ly_deep_copy (SCM src) SCM ly_assoc_chain (SCM key, SCM achain) { - if (is_pair (achain)) + if (ly_c_pair_p (achain)) { SCM handle = scm_assoc (key, ly_car (achain)); - if (is_pair (handle)) + if (ly_c_pair_p (handle)) return handle; else return ly_assoc_chain (key, ly_cdr (achain)); @@ -439,10 +432,10 @@ corresponds to call SCM ly_assoc_cdr (SCM key, SCM alist) { - if (is_pair (alist)) + if (ly_c_pair_p (alist)) { SCM trykey = ly_caar (alist); - if (is_pair (trykey) && to_boolean (scm_equal_p (key, ly_cdr (trykey)))) + if (ly_c_pair_p (trykey) && to_boolean (scm_equal_p (key, ly_cdr (trykey)))) return ly_car (alist); else return ly_assoc_cdr (key, ly_cdr (alist)); @@ -493,10 +486,10 @@ ly_truncate_list (int k, SCM lst) { SCM s = lst; k--; - for (; is_pair (s) && k--; s = ly_cdr (s)) + for (; ly_c_pair_p (s) && k--; s = ly_cdr (s)) ; - if (is_pair (s)) + if (ly_c_pair_p (s)) scm_set_cdr_x (s, SCM_EOL); } return lst; @@ -527,7 +520,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) if (val == SCM_EOL || val == SCM_BOOL_F) return ok; - if (!is_symbol (sym)) + if (!ly_c_symbol_p (sym)) #if 0 return false; #else @@ -544,7 +537,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) SCM type = scm_object_property (sym, type_symbol); - if (type != SCM_EOL && !is_procedure (type)) + if (type != SCM_EOL && !ly_c_procedure_p (type)) { warning (_f ("Can't find property type-check for `%s' (%s).", ly_symbol2string (sym).to_str0 (), @@ -560,7 +553,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) else { if (val != SCM_EOL - && is_procedure (type) + && ly_c_procedure_p (type) && scm_call_1 (type, val) == SCM_BOOL_F) { SCM errport = scm_current_error_port (); @@ -592,10 +585,10 @@ SCM ly_unique (SCM list) { SCM unique = SCM_EOL; - for (SCM i = list; is_pair (i); i = ly_cdr (i)) + for (SCM i = list; ly_c_pair_p (i); i = ly_cdr (i)) { - if (!is_pair (ly_cdr (i)) - || !is_equal (ly_car (i), ly_cadr (i))) + if (!ly_c_pair_p (ly_cdr (i)) + || !ly_c_equal_p (ly_car (i), ly_cadr (i))) unique = scm_cons (ly_car (i), unique); } return scm_reverse_x (unique, SCM_EOL); @@ -654,11 +647,11 @@ ly_split_list (SCM s, SCM list) { SCM before = SCM_EOL; SCM after = list; - for (; is_pair (after);) + for (; ly_c_pair_p (after);) { SCM i = ly_car (after); after = ly_cdr (after); - if (is_equal (i, s)) + if (ly_c_equal_p (i, s)) break; before = scm_cons (i, before); } @@ -684,7 +677,7 @@ display_list (SCM s) SCM p = scm_current_output_port (); scm_puts ("(", p); - for (; is_pair (s); s =ly_cdr (s)) + for (; ly_c_pair_p (s); s =ly_cdr (s)) { scm_display (ly_car (s), p); scm_puts (" ", p); @@ -698,8 +691,8 @@ int_list_to_slice (SCM l) { Slice s; s.set_empty (); - for (; is_pair (l); l = ly_cdr (l)) - if (is_number (ly_car (l))) + for (; ly_c_pair_p (l); l = ly_cdr (l)) + if (ly_c_number_p (ly_car (l))) s.add_point (ly_scm2int (ly_car (l))); return s; } @@ -711,7 +704,7 @@ int_list_to_slice (SCM l) SCM robust_list_ref (int i, SCM l) { - while (i-- > 0 && is_pair (ly_cdr (l))) + while (i-- > 0 && ly_c_pair_p (ly_cdr (l))) l = ly_cdr (l); return ly_car (l); } @@ -719,7 +712,7 @@ robust_list_ref (int i, SCM l) Real robust_scm2double (SCM k, double x) { - if (is_number (k)) + if (ly_c_number_p (k)) x = ly_scm2double (k); return x; } @@ -767,7 +760,7 @@ alist_to_hashq (SCM alist) return scm_make_vector (scm_int2num (0), SCM_EOL); SCM tab = scm_make_vector (scm_int2num (i), SCM_EOL); - for (SCM s = alist; is_pair (s); s = ly_cdr (s)) + for (SCM s = alist; ly_c_pair_p (s); s = ly_cdr (s)) { SCM pt = ly_cdar (s); scm_hashq_set_x (tab, ly_caar (s), pt); @@ -779,9 +772,26 @@ alist_to_hashq (SCM alist) /* Debugging mem leaks: */ -LY_DEFINE (ly_protects, "ly:protects", 0, 0, 0, (), +LY_DEFINE (ly_protects, "ly:protects", + 0, 0, 0, (), "Return hash of protected objects.") { return scm_protects; } #endif + + +#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC + +#include "pangofc-afm-decoder.hh" + +LY_DEFINE (ly_pango_add_afm_decoder, "ly:pango-add-afm-decoder", + 1, 0, 0, (SCM font_family), + "Add pango afm decoder for FONT-FAMILY.") +{ + SCM_ASSERT_TYPE (ly_c_string_p (font_family), font_family, SCM_ARG1, __FUNCTION__, "font_family"); + pango_fc_afm_add_decoder (ly_scm2newstr (font_family, 0)); + return SCM_UNSPECIFIED; +} + +#endif