From: Han-Wen Nienhuys Date: Thu, 18 Sep 2003 09:11:47 +0000 (+0000) Subject: release commit X-Git-Tag: release/1.9.7 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a01e7c6f21271301aae98fb40ebeb77a85c8a7d2;p=lilypond.git release commit --- diff --git a/ChangeLog b/ChangeLog index 6f86bc754d..cc4a250761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2003-09-18 Han-Wen Nienhuys + * 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 + * 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 de7758a847..956048b805 100644 --- 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 7495d5e3b2..56a239ef3e 100644 --- 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 ba7894f78f..e7b18c19f0 100644 --- 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 cf65d91887..df191b9b69 100644 --- 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 15eb4f702d..25a1d97c57 100644 --- 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 5b549e36d9..f910d38df0 100644 --- 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 2211b25055..50bfefca46 100644 --- 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