* buildscripts/lilypond-words.py (F):

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

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index d40599a72bf913ed9de19d3020d5decc9908c7e9..ec63fdcce864c5ecd3b420b49277839343ba56f5 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILY_GUILE_HH
@@ -16,7 +16,6 @@
 #include "lily-guile-macros.hh"
 #include "ly-module.hh"
 
-
 /** Conversion functions follow the GUILE naming convention, i.e.
     A ly_B2A (B b);  */
 
@@ -53,49 +52,55 @@ Interval robust_scm2interval (SCM, Drul_array<Real>);
 Offset robust_scm2offset (SCM, Offset);
 
 SCM ly_quote_scm (SCM s);
-bool type_check_assignment (SCM val, SCM sym,  SCM type_symbol) ;
+bool type_check_assignment (SCM val, SCM sym, SCM type_symbol);
 String print_scm_val (SCM val);
 SCM ly_number2string (SCM s);
 
 SCM parse_symbol_list (char const *);
-SCM robust_list_ref(int i, SCM l);
+SCM robust_list_ref (int i, SCM l);
 SCM alist_to_hashq (SCM);
 
+SCM ly_alist_vals (SCM alist);
+SCM ly_hash2alist (SCM tab);
 
 /* inserts at front, removing dublicates */
-inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val)
+inline SCM ly_assoc_front_x (SCM alist, SCM key, SCM val)
 {
-  return scm_acons(key, val, scm_assoc_remove_x (alist, key));
+  return scm_acons (key, val, scm_assoc_remove_x (alist, key));
 }
 inline bool ly_c_list_p (SCM x) { return SCM_NFALSEP (scm_list_p (x)); }
 inline bool ly_c_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); }
-inline bool ly_c_equal_p (SCM x, SCM y) {
+inline bool ly_c_equal_p (SCM x, SCM y)
+{
   return SCM_NFALSEP (scm_equal_p (x, y));
 }
 
-
 inline bool ly_scm2bool (SCM x) { return SCM_NFALSEP (x); }
-inline char ly_scm2char (SCM x) { return SCM_CHAR(x); }
-inline unsigned long ly_length (SCM x) {
+inline char ly_scm2char (SCM x) { return SCM_CHAR (x); }
+inline unsigned long ly_length (SCM x)
+{
   return scm_num2ulong (scm_length (x), 0, "ly_length");
 }
 inline SCM ly_bool2scm (bool x) { return SCM_BOOL (x); }
 
-inline SCM ly_append2 (SCM x1, SCM x2) {
+inline SCM ly_append2 (SCM x1, SCM x2)
+{
   return scm_append (scm_listify (x1, x2, SCM_UNDEFINED));
 }
-inline SCM ly_append3 (SCM x1, SCM x2, SCM x3) {
+inline SCM ly_append3 (SCM x1, SCM x2, SCM x3)
+{
   return scm_append (scm_listify (x1, x2, x3, SCM_UNDEFINED));
 }
-inline SCM ly_append4 (SCM x1, SCM x2, SCM x3, SCM x4) {
+inline SCM ly_append4 (SCM x1, SCM x2, SCM x3, SCM x4)
+{
   return scm_append (scm_listify (x1, x2, x3, x4, SCM_UNDEFINED));
 }
 
 /*
   display and print newline.
- */
+*/
 extern "C" {
-void ly_display_scm (SCM s);
+  void ly_display_scm (SCM s);
 }
 
 void read_lily_scm_file (String);
@@ -124,23 +129,23 @@ SCM ly_split_list (SCM s, SCM lst);
 SCM ly_unique (SCM lst);
 SCM ly_list_qsort_uniq_x (SCM lst);
 
-SCM ly_output_formats();
+SCM ly_output_formats ();
 SCM ly_kpathsea_find_file (SCM);
 
 /*
   snarfing.
- */
+*/
 void add_scm_init_func (void (*) ());
 
 extern "C" {
-typedef SCM (*Scheme_function_unknown) ();
+  typedef SCM (*Scheme_function_unknown) ();
 }
 
 #if __GNUC__ > 2 || __GNUC_MINOR__ >= 96
 typedef SCM (*Scheme_function_0) ();
 typedef SCM (*Scheme_function_1) (SCM);
-typedef SCM (*Scheme_function_2) (SCM,SCM);    
-typedef SCM (*Scheme_function_3) (SCM,SCM, SCM);       
+typedef SCM (*Scheme_function_2) (SCM, SCM);
+typedef SCM (*Scheme_function_3) (SCM, SCM, SCM);
 #else
 typedef SCM (*Scheme_function_0) (...);
 typedef SCM (*Scheme_function_1) (...);