* lily/all-font-metrics.cc (find_font): Add "lm" to try-AFM-first

[lilypond.git] / lily / include / guile-compatibility.hh

diff --git a/lily/include/guile-compatibility.hh b/lily/include/guile-compatibility.hh
index 6dd1bea91962ffcc9946c713b7279aa8387ee651..8f5bfb65955c0e5b4cbb0cf8314825ee1f2aedd2 100644 (file)
--- a/lily/include/guile-compatibility.hh
+++ b/lily/include/guile-compatibility.hh
@@ -10,21 +10,19 @@
 #ifndef GUILE_COMPATIBILITY_HH
 #define GUILE_COMPATIBILITY_HH
 
-
-
 #if SCM_MINOR_VERSION < 7
 /* guile-1.6.x compatibility */
 
 inline SCM scm_cdr (SCM x)
 {
-  if (SCM_NCONSP(x))
-    abort();
+  if (SCM_NCONSP (x))
+    abort ();
   return SCM_CDR (x);
 }
 inline SCM scm_car (SCM x)
 {
-  if (SCM_NCONSP(x))
-    abort();    
+  if (SCM_NCONSP (x))
+    abort ();    
   return SCM_CAR (x);
 }
 inline SCM scm_caar (SCM x) { return SCM_CAAR (x); }
@@ -37,33 +35,32 @@ inline SCM scm_caadr (SCM x) { return SCM_CAADR (x); }
 inline SCM scm_cadar (SCM x) { return SCM_CADAR (x); }
 #define scm_gc_unregister_collectable_memory(a, b, c) scm_done_free (b)
 #define scm_gc_register_collectable_memory(a, b, c) scm_done_malloc (b)
-#define SCM_VECTOR_REF(v,i) (SCM_VELTS ((v))[(i)])
+#define SCM_VECTOR_REF(v, i) (SCM_VELTS ((v))[(i)])
 #define scm_from_int(x) SCM_MAKINUM (x)
 #define scm_is_integer(x) SCM_INUMP (x)
-#define scm_is_string(x) SCM_STRINGP(x)
+#define scm_is_string(x) SCM_STRINGP (x)
 #define scm_hash_table_p scm_vector_p
-#define scm_i_string_chars(x) SCM_STRING_CHARS(x)
-#define scm_i_string_length(x) SCM_STRING_LENGTH(x)
+#define scm_i_string_chars(x) SCM_STRING_CHARS (x)
+#define scm_i_string_length(x) SCM_STRING_LENGTH (x)
 inline bool ly_c_number_p (SCM x) { return SCM_NUMBERP (x); }
-#define scm_is_number(x) (scm_number_p(x)==SCM_BOOL_T)
+#define scm_is_number(x) (scm_number_p (x) == SCM_BOOL_T)
 inline int ly_scm2int (SCM x) { return scm_num2int (x, 0, "ly_scm2int"); }
-#define scm_to_int(x) (ly_scm2int(x))
+#define scm_to_int(x) (ly_scm2int (x))
 inline bool ly_c_symbol_p (SCM x) { return SCM_SYMBOLP (x); }
-#define scm_is_symbol(x) ly_c_symbol_p(x)
+#define scm_is_symbol(x) ly_c_symbol_p (x)
 inline bool ly_c_boolean_p (SCM x) { return SCM_BOOLP (x); }
 #define scm_is_bool(x) ly_c_boolean_p(x)
 inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
-#define scm_is_eq(x,y)  (SCM_EQ_P((x), (y)))
+#define scm_is_eq(x,y) (SCM_EQ_P ((x), (y)))
 
-#define scm_c_string_length(x) SCM_STRING_LENGTH(x)
-#define scm_is_pair(x) (SCM_CONSP(x))
+#define scm_c_string_length(x) SCM_STRING_LENGTH (x)
+#define scm_is_pair(x) (SCM_CONSP (x))
 
 
 inline double ly_scm2double (SCM x) { return scm_num2dbl (x, "ly_scm2double"); }
-#define scm_to_double(x) (ly_scm2double(x))
-#define scm_from_double(x) (scm_make_real(x))
-
-
+#define scm_to_double(x) (ly_scm2double (x))
+#define scm_from_double(x) (scm_make_real (x))
 
 #endif /* SCM_MINOR_VERSION < 7 */
+
 #endif /* GUILE_COMPATIBILITY_HH */