Change "dfault" to "val" in various docstrings

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 8b5766387e0de808afe9c81d567c5cd9dfc16844..09185f5888b2e8597d2373783b4ff1acb0c281b6 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -311,10 +311,10 @@ LY_DEFINE (ly_effective_prefix, "ly:effective-prefix",
 }
 
 LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get",
-          2, 1, 0, (SCM key, SCM achain, SCM dfault),
+          2, 1, 0, (SCM key, SCM achain, SCM val),
           "Return value for @var{key} from a list of alists @var{achain}."
-          "  If no entry is found, return @var{dfault} or @code{#f} if no"
-          " @var{dfault} is specified.")
+          "  If no entry is found, return @var{val} or @code{#f} if"
+          " @var{val} is not specified.")
 {
   if (scm_is_pair (achain))
     {
@@ -322,9 +322,9 @@ LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get",
       if (scm_is_pair (handle))
        return scm_cdr (handle);
       else
-       return ly_chain_assoc_get (key, scm_cdr (achain), dfault);
+       return ly_chain_assoc_get (key, scm_cdr (achain), val);
     }
-  return dfault == SCM_UNDEFINED ? SCM_BOOL_F : dfault;
+  return val == SCM_UNDEFINED ? SCM_BOOL_F : val;
 }
 
 

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 797d22d0a58550a50c86b7274fcccc1914fe4a6a..88c7fe8a1ca9b5db3e90b2025bf89fcf99419319 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -48,7 +48,7 @@ SCM ly_rational2scm (Rational);
 SCM ly_offset2scm (Offset);
 Offset ly_scm2offset (SCM);
 SCM ly_chain_assoc (SCM key, SCM achain);
-SCM ly_chain_assoc_get (SCM key, SCM achain, SCM dfault);
+SCM ly_chain_assoc_get (SCM key, SCM achain, SCM val);
 SCM ly_assoc_cdr (SCM key, SCM alist);
 SCM ly_assoc_get (SCM key, SCM alist, SCM def);
 Interval ly_scm2interval (SCM);

diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 069aa07924ae769af3de55a49e584ee2e490a679..7e39582da64fbc8947ff3c4428f95ed8bc65db16 100644 (file)
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -50,7 +50,7 @@ public:
 DECLARE_UNSMOB(Prob,prob);
 
 SCM ly_prob_set_property_x (SCM system, SCM sym, SCM value);
-SCM ly_prob_property (SCM system, SCM sym, SCM dfault);
+SCM ly_prob_property (SCM prob, SCM sym, SCM val);
 
 SCM ly_prob_type_p (SCM obj, SCM sym);
   

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index c90acd5f17f68c968e204ae5e36876828f409f21..1f9b2c0e29de4b670ba9d3dc533707e34b75c34d 100644 (file)
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -21,13 +21,14 @@ LY_DEFINE (ly_music_length, "ly:music-length",
   return sc->get_length ().smobbed_copy ();
 }
 
-LY_DEFINE (ly_music_property,
-          "ly:music-property", 2, 1, 0, (SCM mus, SCM sym, SCM dfault),
-          "Get the property @var{sym} of music expression @var{mus}."
-          "  If @var{sym} is undefined, return @code{'()}.")
+LY_DEFINE (ly_music_property, "ly:music-property",
+          2, 1, 0, (SCM mus, SCM sym, SCM val),
+          "Return the value for property @var{sym} of music expression"
+          " @var{mus}.  If no value is found, return @var{val} or"
+          " @code{'()} if @var{val} is not specified.")
 {
   LY_ASSERT_TYPE (unsmob_music, mus, 1);
-  return ly_prob_property (mus, sym, dfault);
+  return ly_prob_property (mus, sym, val);
 }
 
 LY_DEFINE (ly_music_set_property_x, "ly:music-set-property!",

diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc
index cc74f8ada128f525e6970b5d347fddaf709a7871..0f8c0f6baeb01ab2076a2bb4a721b4aa2cdb6975 100644 (file)
--- a/lily/prob-scheme.cc
+++ b/lily/prob-scheme.cc
@@ -31,19 +31,21 @@ LY_DEFINE (ly_prob_property_p, "ly:prob-property?",
 }
 
 LY_DEFINE (ly_prob_property, "ly:prob-property",
-          2, 1, 0, (SCM obj, SCM sym, SCM dfault),
-          "Return the value for @var{sym}.")
+          2, 1, 0, (SCM prob, SCM sym, SCM val),
+          "Return the value for property @var{sym} of Prob object"
+          " @var{prob}.  If no value is found, return @var{val} or"
+          " @code{'()} if @var{val} is not specified.")
 {
-  LY_ASSERT_SMOB (Prob, obj, 1);
-  Prob *ps = unsmob_prob (obj);
+  LY_ASSERT_SMOB (Prob, prob, 1);
+  Prob *ps = unsmob_prob (prob);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
-  if (dfault == SCM_UNDEFINED)
-    dfault = SCM_EOL;
+  if (val == SCM_UNDEFINED)
+    val = SCM_EOL;
 
   SCM retval = ps->internal_get_property (sym);
   if (retval == SCM_EOL)
-    return dfault;
+    return val;
   else
     return retval;
 }