Further minor changes from Han-Wen's comments.

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index f93fcca4657773273bbf2867a2ca34cc3dbf5415..d57124981d2941c61a868930382d2ca42d64fe3b 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -258,13 +258,13 @@ check_pitch_against_signature (SCM key_signature, Pitch const &pitch,
 // we can delete this function).
 LY_DEFINE (ly_find_accidentals_simple, "ly:find-accidentals-simple", 5, 0, 0,
           (SCM keysig, SCM pitch_scm, SCM barnum, SCM laziness, SCM octaveness ),
-          "Checks the need for an accidental and a 'restore' accidental against a"
-          " key signature.  The laziness is the number of bars for which reminder"
-          " accidentals are used (ie. if laziness is zero, we only cancel accidentals"
-          " in the same bar; if laziness is three, we cancel accidentals up to three"
-          " bars after they first appear.  Octaveness is either 'same-octave or"
-          " 'any-octave and it specifies whether accidentals should be canceled in"
-          " different octaves.")
+          "Checks the need for an accidental and a @q{restore} accidental against a"
+          " key signature.  The @var{laziness} is the number of bars for which reminder"
+          " accidentals are used (ie. if @var{laziness} is zero, we only cancel accidentals"
+          " in the same bar; if @var{laziness} is three, we cancel accidentals up to three"
+          " bars after they first appear.  @var{octaveness} is either "
+          " @code{'same-octave} or @code{'any-octave} and it specifies whether "
+          " accidentals should be canceled in different octaves.")
 {
   LY_ASSERT_TYPE (unsmob_pitch, pitch_scm, 2);
   LY_ASSERT_TYPE (scm_is_integer, barnum, 3);

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 9e100235c612b0dca446292eadadb5c097a99d0f..0ec10069e05bbedd5e2aa503ac74ee93564f2929 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -919,23 +919,17 @@ if appropriate.
 (define (key-entry-octave entry)
   "Return the octave of an entry in localKeySignature (or #f if the entry does not have
   an octave)."
-  (if (number? (car entry))
-      #f
-      (caar entry)))
+  (and (pair? (car entry)) (caar entry)))
 
 (define (key-entry-bar-number entry)
   "Return the bar number of an entry in localKeySignature (or #f if the entry does not
   have a bar number)."
-  (if (number? (car entry))
-      #f
-      (caddr entry)))
+  (and (pair? (car entry)) (caddr entry)))
 
 (define (key-entry-measure-position entry)
   "Return the measure position of an entry in localKeySignature (or #f if the entry does
   not have a measure position)."
-  (if (number? (car entry))
-      #f
-      (cdddr entry)))
+  (and (pair? (car entry)) (cdddr entry)))
 
 (define (key-entry-alteration entry)
   "Return the alteration of an entry in localKeySignature."