From: hanwen Date: Thu, 16 Mar 2006 13:28:24 +0000 (+0000) Subject: (generate_configuration): X-Git-Tag: release/2.8.2~81 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8383010e9a6d9de17fea3e7f01b1583cfeb4364f;p=lilypond.git (generate_configuration): multiply y-shift for dot with direction. --- diff --git a/ChangeLog b/ChangeLog index 32a8240eff..59e034af07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-03-16 Han-Wen Nienhuys + * lily/tie-formatting-problem.cc (generate_configuration): + multiply y-shift for dot with direction. + * scm/define-markup-commands.scm (note-by-number): put (magstep size) in y-attach too. diff --git a/VERSION b/VERSION index 35aa415477..6d0a9aef61 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=7 -PATCH_LEVEL=38 +PATCH_LEVEL=39 MY_PATCH_LEVEL= diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index 125fd3c252..1d6ea31c30 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -340,7 +340,7 @@ Tie_formatting_problem::generate_configuration (int pos, Direction dir) const bool y_tune = true; if (dot_positions_.find (pos) != dot_positions_.end ()) { - conf->delta_y_ += 0.25 * details_.staff_space_; + conf->delta_y_ += dir * 0.25 * details_.staff_space_; y_tune = false; } diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly index cbf08fc1ec..21f7475c01 100644 --- a/ly/Welcome_to_LilyPond.ly +++ b/ly/Welcome_to_LilyPond.ly @@ -31,4 +31,4 @@ That's it. For more information, visit http://lilypond.org . } -\version "2.7.32" % necessary for upgrading to future LilyPond versions. +\version "2.7.36" % necessary for upgrading to future LilyPond versions. diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly index 15e73bd9a3..3167a35faa 100644 --- a/ly/accordion-defs-init.ly +++ b/ly/accordion-defs-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" % Symbols needed to print accordion music % % 2' = T diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly index 1c8ccbe485..d3794ba34e 100755 --- a/ly/bagpipe.ly +++ b/ly/bagpipe.ly @@ -6,10 +6,10 @@ Sven Axelsson, the Murray Pipes & Drums of Gothenburg (http://www.murrays.nu) - $Id: bagpipe.ly,v 1.10 2006/02/06 01:13:58 hanwen Exp $ + $Id: bagpipe.ly,v 1.11 2006/03/16 13:28:24 hanwen Exp $ %} -\version "2.7.32" +\version "2.7.36" % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde. % Flat notes used mainly in some modern music. diff --git a/ly/catalan.ly b/ly/catalan.ly index 945a718fef..3eb707988d 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -74,6 +74,6 @@ pitchnamesCatalan = #`( pitchnames = \pitchnamesCatalan -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index 24c113ecd2..eaa843f7f4 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" chordmodifiers = #default-chord-modifier-list diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 393bed2d07..629b86169a 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" %% < 1.8 compatibility switch #(ly:set-option 'old-relative) diff --git a/ly/deutsch.ly b/ly/deutsch.ly index 0af40d7261..13c45c00c1 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -63,6 +63,6 @@ pitchnamesDeutsch = #`( pitchnames = \pitchnamesDeutsch -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly index 074980ba21..43ebbebe70 100644 --- a/ly/drumpitch-init.ly +++ b/ly/drumpitch-init.ly @@ -1,5 +1,5 @@ -\version "2.7.32" +\version "2.7.36" drumPitchNames = #'((acousticbassdrum . acousticbassdrum) diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index 17b75898b0..c04e909ac6 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" % % declare the standard dynamic identifiers. diff --git a/ly/english.ly b/ly/english.ly index b5423dcd93..759771d59b 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -87,7 +87,7 @@ pitchnamesEnglish = #`( pitchnames = \pitchnamesEnglish -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index e968d5fac4..0d213efe7f 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" \context { \name "Global" diff --git a/ly/espanol.ly b/ly/espanol.ly index 7265b68834..8b15b99f5a 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -58,6 +58,6 @@ pitchnamesEspanol = #`( pitchnames = \pitchnamesEspanol -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index 2458c5c1f2..0d21d84236 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" % % Running LilyPond on this file generates the documentation diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly index bcef8602c2..73c8c9d935 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" % % Running LilyPond on this file generates the short interface doc diff --git a/ly/grace-init.ly b/ly/grace-init.ly index c5d1263bcd..dec071f215 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" startGraceMusic = { diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly index d8e7dcfc23..fccaa43b45 100644 --- a/ly/gregorian-init.ly +++ b/ly/gregorian-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" %%%%%%%% %%%%%%%% shortcuts common for all styles of gregorian chant notation diff --git a/ly/init.ly b/ly/init.ly index fba222de43..24e53f8baa 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -7,7 +7,7 @@ #(define-public midi-debug #f) -\version "2.7.32" +\version "2.7.36" \include "declarations-init.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index 51083a5f78..ae7e6e8815 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -86,6 +86,6 @@ pitchnamesItaliano = #`( pitchnames = \pitchnamesItaliano -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/midi-init.ly b/ly/midi-init.ly index 875ed950e9..1c55a3eeb2 100644 --- a/ly/midi-init.ly +++ b/ly/midi-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" \midi { \tempo 4=60 \include "performer-init.ly" diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 3255290a57..d096f1094a 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -1,6 +1,6 @@ % -*-Scheme-*- -\version "2.7.32" +\version "2.7.36" %% need SRFI-1 filter diff --git a/ly/nederlands.ly b/ly/nederlands.ly index 57eac1dac9..1871daed02 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" %{ common dutch names for notes. es means flat, is means sharp diff --git a/ly/norsk.ly b/ly/norsk.ly index fa3dc0b54f..cb96886152 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -105,6 +105,6 @@ pitchnamesNorsk = #`( pitchnames =\pitchnamesNorsk -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly index 31248eaa1a..94f5ea6a6d 100644 --- a/ly/paper-defaults.ly +++ b/ly/paper-defaults.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" \paper { diff --git a/ly/params-init.ly b/ly/params-init.ly index d477cfd53e..90d21ecce2 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -1,2 +1,2 @@ -\version "2.7.32" +\version "2.7.36" diff --git a/ly/performer-init.ly b/ly/performer-init.ly index cc98b254be..538a8ea294 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" %% %% setup for Request->Element conversion. diff --git a/ly/portugues.ly b/ly/portugues.ly index f865fac8bd..f4477b1db1 100644 --- a/ly/portugues.ly +++ b/ly/portugues.ly @@ -86,6 +86,6 @@ pitchnamesPortuguese = #`( pitchnames = \pitchnamesPortuguese -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/property-init.ly b/ly/property-init.ly index 2b956cc397..c672a75e1d 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "2.7.32" +\version "2.7.36" stemUp = \override Stem #'direction = #UP stemDown = \override Stem #'direction = #DOWN diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index 650388798e..3bbcb2cfcf 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" major = #`( diff --git a/ly/script-init.ly b/ly/script-init.ly index bd875f15d6..38ae4547f5 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" % code char abbreviations diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index e7bf8b66eb..ab810296a2 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" startGroup = #(make-span-event 'NoteGroupingEvent START) stopGroup = #(make-span-event 'NoteGroupingEvent STOP) diff --git a/ly/suomi.ly b/ly/suomi.ly index ff283ddc0f..74af495aed 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -48,6 +48,6 @@ pitchnamesSuomi = #`( pitchnames = \pitchnamesSuomi -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/svenska.ly b/ly/svenska.ly index 7db961ab28..e2a2c478a5 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -42,6 +42,6 @@ pitchnamesSvenska = #`( ) pitchnames = \pitchnamesSvenska -\version "2.7.32" +\version "2.7.36" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/titling-init.ly b/ly/titling-init.ly index aabbcf9da0..fff5022141 100644 --- a/ly/titling-init.ly +++ b/ly/titling-init.ly @@ -1,4 +1,4 @@ -\version "2.7.32" +\version "2.7.36" slashSeparator = \markup { \hcenter diff --git a/ly/vlaams.ly b/ly/vlaams.ly index b2f5518f95..7020954b55 100644 --- a/ly/vlaams.ly +++ b/ly/vlaams.ly @@ -1,4 +1,4 @@ -\version "2.7.32" %hier stond 2.1.36, mocht ik dat wel veranderen? +\version "2.7.36" %hier stond 2.1.36, mocht ik dat wel veranderen? %{