release commit

diff --git a/ChangeLog b/ChangeLog
index 6f86bc754d4f84ddcebf9e7e9203247aae9b41bd..cc4a2507617278dffa990d2bfd4dacf5019dc51f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-09-18  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * VERSION (PACKAGE_NAME): release 1.9.7
+
        * Documentation/topdocs/NEWS.texi (Top): add quarter tones.
 
        * Documentation/user/refman.itely (Pitches): doc quarter tones.
@@ -7,7 +9,8 @@
        * lily/pitch.cc (LY_DEFINE): ly:pitch-quartertones: new function
        (quartertone_pitch): new function
 
-       * mf/feta-toevallig.mf: add 3/4 sharp, 1/4 sharp, 1/4 flat.
+       * mf/feta-toevallig.mf: add 3/4 sharp, 1/4 sharp, 1/4 flat, 3/4
+       flat. WARNING: FONT CHANGED.
 
        * ly/nederlands.ly: add -eh and -ih for quarter tones.
 
@@ -23,7 +26,7 @@
 
        * lily/lily-guile.cc: remove ly:verbose?
 
-       * lily/scm-option.cc (LY_DEFINE): add verbose to  get-option.
+       * lily/scm-option.cc (LY_DEFINE): add verbose to get-option.
 
        * lily/parser.yy (TODO): only do gh_call() for apply with
        procedure argument.
@@ -59,6 +62,8 @@
 
 2003-09-16  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * VERSION: release 1.9.6
+       
        * lilypond-mode.el (LilyPond-command-alist): invoke lilypond
        iso. ly2dvi.
 
@@ -97,7 +102,7 @@
        it would be too small.
 
        * lily/font-metric.cc: return #f for non-existent glyph.
-
+       
        * VERSION (MY_PATCH_LEVEL): read VERSION; version number is now
        exported through config.make.
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index de7758a847a4a843633bd9779a6f2314ea502c60..956048b805a9e2fe7070b22caf3c498cf2b62f91 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -109,6 +109,9 @@ names are the Dutch note names.  In Dutch, @code{aes} is contracted to
 Half-flats and half-sharps are formed by adding @code{-eh} and
 @code{-ih}; the following is a series of Cs with increasing pitches:
 
+@cindex quarter tones
+@cindex semi-flats, semi-sharps
+
 @lilypond[verbatim,relative 2]
   ceses4
   ceseh
@@ -813,7 +816,7 @@ using @code{\override} or @code{\set}.  At the moment that
 @code{\property Staff} is interpreted, a @internalsref{Staff} context
 is made, and the @internalsref{StaffSymbol} is created before any
 @code{\override} is effective. Properties can be changed in a
-@code{\translator} definition, or by using @code{\outputproperty}.
+@code{\translator} definition, or by using @code{\applyoutput}.
 
 @refbugs
 
@@ -3708,7 +3711,7 @@ chord.
 You can change the number of strings, by setting the number of lines
 in the @internalsref{TabStaff} (the @code{line-count} property of
 @internalsref{TabStaff} can only be changed using
-@code{\outputproperty}, for more information, see @ref{Tuning
+@code{\applyoutput}, for more information, see @ref{Tuning
 objects}).
 
 You can change the tuning of the strings. A string tuning is given as
@@ -3722,8 +3725,8 @@ g:
 @lilypond[fragment,verbatim]
   \context TabStaff <<
 
-    \outputproperty #(make-type-checker 'staff-symbol-interface)
-                    #'line-count = #4
+    \applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface)
+                    'line-count 4)
     \property TabStaff.stringTunings =  #'(-5 -10 -15 -20)
     
     \notes {
@@ -4887,7 +4890,7 @@ Editio Vaticana style do clef @tab
 @code{vaticana_do1}, @code{vaticana_do2}, @code{vaticana_do3} @tab
 @lilypond[relative 0, notime]
 \context Staff
-\outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #4
+\applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 4)
 \property Staff.TimeSignature \set #'transparent = ##t
 \clef "vaticana_do2" c
 @end lilypond
@@ -4898,7 +4901,7 @@ Editio Vaticana style fa clef @tab
 @code{vaticana_fa1}, @code{vaticana_fa2} @tab
 @lilypond[relative 0, notime]
 \context Staff
-\outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #4
+\applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 4)
 \property Staff.TimeSignature \set #'transparent = ##t
 \clef "vaticana_fa2" c
 @end lilypond
@@ -4909,7 +4912,7 @@ Editio Medicaea style do clef @tab
 @code{medicaea_do1}, @code{medicaea_do2}, @code{medicaea_do3} @tab
 @lilypond[relative 0, notime]
 \context Staff
-\outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #4
+\applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 4)
 \property Staff.TimeSignature \set #'transparent = ##t
 \clef "medicaea_do2" c
 @end lilypond
@@ -4920,7 +4923,7 @@ Editio Medicaea style fa clef @tab
 @code{medicaea_fa1}, @code{medicaea_fa2} @tab
 @lilypond[relative 0, notime]
 \context Staff
-\outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #4
+\applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 4)
 \property Staff.TimeSignature \set #'transparent = ##t
 \clef "medicaea_fa2" c
 @end lilypond
@@ -4931,7 +4934,7 @@ historic style hufnagel do clef @tab
 @code{hufnagel_do1}, @code{hufnagel_do2}, @code{hufnagel_do3} @tab
 @lilypond[relative 0, notime]
 \context Staff
-\outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #4
+\applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 4)
 \property Staff.TimeSignature \set #'transparent = ##t
 \clef "hufnagel_do2" c
 @end lilypond
@@ -4942,7 +4945,7 @@ historic style hufnagel fa clef @tab
 @code{hufnagel_fa1}, @code{hufnagel_fa2} @tab
 @lilypond[relative 0, notime]
 \context Staff
-\outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #4
+\applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface) 'line-count 4)
 \property Staff.TimeSignature \set #'transparent = ##t
 \clef "hufnagel_fa2" c
 @end lilypond

diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly
index 7495d5e3b252a1e53cc3f118116e58fc1a65f255..56a239ef3e700b65920a18a03c89be3b84fae026 100644 (file)
--- a/input/test/move-specific-text.ly
+++ b/input/test/move-specific-text.ly
@@ -11,7 +11,7 @@ move text around. " }
 \score {
   \notes\relative c''' {
     \property Voice.Stem \set #'direction = #1
-    \applyoutput #(outputproperty (make-text-checker (make-simple-markup "m.d."))
+    \applyoutput #(outputproperty-compatibility (make-text-checker (make-simple-markup "m.d."))
       'extra-offset '(-3.5 . -4.5))
     a^2^"m.d."
   }

diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly
index ba7894f78f831c4425e854559383b610b0aa6159..e7b18c19f09bc4f0d998287ac7c777af960aa1f3 100644 (file)
--- a/input/test/staff-lines.ly
+++ b/input/test/staff-lines.ly
@@ -23,8 +23,9 @@ lower = \notes\relative c {
     \new Staff <<
       \clef bass
       \lower
-      \applyoutput #(outputproperty-compatibility (make-type-checker 'staff-symbol-interface)
-        'line-count = 4)
+      \applyoutput #(outputproperty-compatibility
+                    (make-type-checker 'staff-symbol-interface)
+                    'line-count  4)
     >>  
   >>
   \paper { raggedright=##t}  

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index cf65d91887485858b7117e641b7a43c9014c0aff..df191b9b69ca3d4dbb3cffc4841c7d73a1f064c4 100644 (file)
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -75,7 +75,7 @@ enum {
   SEMI_SHARP,
   SHARP ,
   THREE_Q_SHARP,
-  DOUBLE_SHARP  ,
+  DOUBLE_SHARP,
 };
 
 SCM ly_pitch_transpose (SCM p, SCM delta);

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 15eb4f702dbfbeb77d21f34a501a884a65e6fc41..25a1d97c57a970f7809a85ffca118571278f2fe4 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -165,7 +165,7 @@ interval (Pitch const & from , Pitch const & to )
 /* FIXME
    Merge with *pitch->text* funcs in chord-name.scm
  */
-char const *accname[] = {"eses", "eseh", "es", "eh" "",
+char const *accname[] = {"eses", "eseh", "es", "eh", "",
                         "ih", "is" , "isih",  "isis"};
 
 String

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 5b549e36d9ca6c797f10ede2e860396ad629a764..f910d38df022c3898698d25aee1186ac9a8f350f 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -67,12 +67,12 @@
   (let* ((name (ly:pitch-notename pitch))
         (alt (ly:pitch-alteration pitch))
         (n-a (if (member (cons name alt) `((6 . ,FLAT) (6 . ,DOUBLE-FLAT)))
-                 (cons 7 (+ 2 alt))
+                 (cons 7 (+ SEMI-TONE alt))
                  (cons name alt))))
     (make-line-markup
      (list
       (string-append
-       (list-ref '("c" "d" "e" "f" "g" "a" "h" "b") (/ (car n-a) 2))
+       (list-ref '("c" "d" "e" "f" "g" "a" "h" "b")  (car n-a) )
        (if (or (equal? (car n-a) 2) (equal? (car n-a) 5))
           (list-ref '( "ses"  "s" "" "is" "isis") (+ 2 (/ (cdr n-a) 2) ))
           (list-ref '("eses" "es" "" "is" "isis") (+ 2 (/ (cdr n-a) 2) ))

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 2211b25055bb557a2885a6f9fa79b7b51a77fdea..50bfefca46c0fba02a3f998b9cd887874091a6a6 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1558,7 +1558,7 @@ Please hand-edit, using
 as a substitution text.""" % (m.group (1), m.group (2)) )
                raise FatalConversionError ()
 
-       if re.search ("ly:(make-pitch|ly:pitch-alteration)", str):
+       if re.search ("ly:(make-pitch|pitch-alteration)", str):
                sys.stderr.write (
 """The alteration field of Scheme pitches was multiplied by 2
 to support quarter tone accidentals. Please edit ly:make-pitch and