From 31101e53e0ae7ce209fc1cfef10b202ed496f4df Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 10 Oct 2004 19:55:37 +0000 Subject: [PATCH] * Documentation/user/invoking.itely (Reporting bugs): rename. * lily/slur-scoring.cc (move_away_from_staffline): new function. (get_base_attachments): move away attachment point for breaks similar to attachment points on slurs (staffline collision, and half a space of padding) --- ChangeLog | 4 ++- Documentation/user/examples.itely | 26 +++++++++---------- .../user/{invoking.itexi => invoking.itely} | 4 +-- Documentation/user/lilypond.tely | 2 +- ly/accordion-defs-init.ly | 2 +- ly/chord-modifiers-init.ly | 2 +- ly/declarations-init.ly | 2 +- ly/deutsch.ly | 2 +- ly/drumpitch-init.ly | 2 +- ly/dynamic-scripts-init.ly | 2 +- ly/english.ly | 2 +- ly/engraver-init.ly | 2 +- ly/espanol.ly | 2 +- ly/generate-documentation.ly | 2 +- ly/generate-interface-doc-init.ly | 2 +- ly/grace-init.ly | 2 +- ly/gregorian-init.ly | 2 +- ly/init.ly | 2 +- ly/italiano.ly | 2 +- ly/midi-init.ly | 2 +- ly/music-functions-init.ly | 2 +- ly/nederlands.ly | 2 +- ly/norsk.ly | 2 +- ly/paper-defaults.ly | 2 +- ly/params-init.ly | 2 +- ly/performer-init.ly | 2 +- ly/portugues.ly | 2 +- ly/property-init.ly | 2 +- ly/scale-definitions-init.ly | 2 +- ly/script-init.ly | 2 +- ly/spanners-init.ly | 2 +- ly/suomi.ly | 2 +- ly/svenska.ly | 2 +- ly/vlaams.ly | 2 +- 34 files changed, 49 insertions(+), 47 deletions(-) rename Documentation/user/{invoking.itexi => invoking.itely} (99%) diff --git a/ChangeLog b/ChangeLog index 08762cc1e5..f8cbc8df83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-10-10 Han-Wen Nienhuys + * Documentation/user/invoking.itely (Reporting bugs): rename. + * lily/lexer.ll (Lily_lexer): bump version req to 2.3.22. * lily/parser.yy (Prefix_composite_music): change no-transposition @@ -7,7 +9,7 @@ * lily/phrasing-slur-engraver.cc (acknowledge_grob): do something with normal slurs too. - + * lily/slur-scoring.cc (move_away_from_staffline): new function. (get_base_attachments): move away attachment point for breaks similar to attachment points on slurs (staffline collision, and diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely index aec99a45df..cb36c0c3cf 100644 --- a/Documentation/user/examples.itely +++ b/Documentation/user/examples.itely @@ -39,7 +39,7 @@ problems: @itemize @bullet @item Include @code{\version} numbers in every file. Note that all -templates contain a @code{\version "2.3.16"} string. We +templates contain a @code{\version "2.3.22"} string. We highly recommend that you always include the @code{\version}, no matter how small your file is. Speaking from personal experience, it's quite frustrating to try to remember which version of LilyPond you were @@ -76,7 +76,7 @@ add notes, and you're finished! @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" melody = \relative c' { \clef treble \key c \major @@ -103,7 +103,7 @@ line. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" melody = \relative c' { \clef treble \key c \major @@ -136,7 +136,7 @@ Want to prepare a lead sheet with a melody and chords? Look no further! @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" melody = \relative c' { \clef treble \key c \major @@ -171,7 +171,7 @@ This template allows you to prepare a song with melody, words, and chords. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" melody = \relative c' { \clef treble \key c \major @@ -214,7 +214,7 @@ Here is a simple piano staff. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" upper = \relative c'' { \clef treble \key c \major @@ -250,7 +250,7 @@ piano accompaniment underneath. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" melody = \relative c'' { \clef treble \key c \major @@ -310,7 +310,7 @@ tweaking yourself. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" upper = \relative c'' { \clef treble \key c \major @@ -403,7 +403,7 @@ section for time and key signatures. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" global = { \time 4/4 \key c \major @@ -456,7 +456,7 @@ always the same for all parts. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" global = { \key c \major \time 4/4 @@ -538,7 +538,7 @@ staves rather than on the staves. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" global = { % incipit @@ -771,7 +771,7 @@ is within a @code{\transpose} section. @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" \header { title = "Song" subtitle = "(tune)" @@ -1038,7 +1038,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print @lilypond[verbatim,raggedright] -\version "2.3.16" +\version "2.3.22" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itely similarity index 99% rename from Documentation/user/invoking.itexi rename to Documentation/user/invoking.itely index 9cb51848b7..1d0f91e29c 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itely @@ -298,14 +298,14 @@ following example, the accidental touches the note head. Using Mac OSX 10.3.5, fink package lilypond-unstable -\version "2.3.16" +\version "2.3.22" \relative c''{ a4 b cis d } @end verbatim @lilypond -\version "2.3.16" +\version "2.3.22" \relative c''{ \override Accidental #'extra-offset = #'(1.0 . 0) a4 b cis d diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 04f8dfe5a0..26c5a43c55 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -189,7 +189,7 @@ this and other documentation. @include introduction.itely @include tutorial.itely @include examples.itely -@include invoking.itexi +@include invoking.itely @include notation.itely @include sound-output.itexi @include changing-defaults.itely diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly index a87e1bdc3b..9884005595 100644 --- a/ly/accordion-defs-init.ly +++ b/ly/accordion-defs-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" % Symbols needed to print accordion music % % 2' = T diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index 131f49715f..b3a69abdb0 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" chordmodifiers = #default-chord-modifier-list diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 37df2db9df..48e0301b68 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" %% < 1.8 compatibility switch #(ly:set-option 'old-relative) diff --git a/ly/deutsch.ly b/ly/deutsch.ly index c8cd4a41fe..82857d5462 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,6 +49,6 @@ pitchnamesDeutsch = #`( pitchnames = \pitchnamesDeutsch -\version "2.3.16" +\version "2.3.22" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly index 47da8922f3..ff8c518756 100644 --- a/ly/drumpitch-init.ly +++ b/ly/drumpitch-init.ly @@ -1,5 +1,5 @@ -\version "2.3.16" +\version "2.3.22" drumPitchNames = #'((acousticbassdrum . acousticbassdrum) diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index 410d34e98d..01e69b4cc0 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" % % declare the standard dynamic identifiers. diff --git a/ly/english.ly b/ly/english.ly index d9a79175ac..373fa0bdf3 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -87,7 +87,7 @@ pitchnamesEnglish = #`( pitchnames = \pitchnamesEnglish -\version "2.3.16" +\version "2.3.22" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 7ba26f4944..9e205f9bd2 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" \context { \name Global diff --git a/ly/espanol.ly b/ly/espanol.ly index f1c6293455..cec7e19af7 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -58,6 +58,6 @@ pitchnamesEspanol = #`( pitchnames = \pitchnamesEspanol -\version "2.3.16" +\version "2.3.22" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index ba124b7971..c71f4a9ae7 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" % % 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 92584dcc5b..18a5ae8652 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" % % Running LilyPond on this file generates the short interface doc diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 776ce21a74..50df361420 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" startGraceMusic = { diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly index be626b2999..c393ddda4f 100644 --- a/ly/gregorian-init.ly +++ b/ly/gregorian-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" %%%%%%%% %%%%%%%% shortcuts common for all styles of gregorian chant notation diff --git a/ly/init.ly b/ly/init.ly index 2e3e849bd9..41a04e6427 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -4,7 +4,7 @@ #(define-public midi-debug #f) -\version "2.3.16" +\version "2.3.22" \include "declarations-init.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index 23a17a0cf5..845d45f69b 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -86,6 +86,6 @@ pitchnamesItaliano = #`( pitchnames = \pitchnamesItaliano -\version "2.3.16" +\version "2.3.22" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/midi-init.ly b/ly/midi-init.ly index be96c71fb1..10dbb5fc2e 100644 --- a/ly/midi-init.ly +++ b/ly/midi-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" \midi { \tempo 4=60 \include "performer-init.ly" diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 07802d74b2..5c745a810a 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" applymusic = #(def-music-function (location func music) (procedure? ly:music?) diff --git a/ly/nederlands.ly b/ly/nederlands.ly index b3684d8719..0392e43d08 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" %{ common dutch names for notes. es means flat, is means sharp diff --git a/ly/norsk.ly b/ly/norsk.ly index b96c0bd8db..3e707dfdc2 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -105,6 +105,6 @@ pitchnamesNorsk = #`( pitchnames =\pitchnamesNorsk -\version "2.3.16" +\version "2.3.22" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly index 2302613c19..d1c57f3d72 100644 --- a/ly/paper-defaults.ly +++ b/ly/paper-defaults.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" \paper { diff --git a/ly/params-init.ly b/ly/params-init.ly index a2c44b7028..99249eb83b 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -1,2 +1,2 @@ -\version "2.3.16" +\version "2.3.22" diff --git a/ly/performer-init.ly b/ly/performer-init.ly index db32ae9287..42fa0780c9 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" % % setup for Request->Element conversion. Guru-only diff --git a/ly/portugues.ly b/ly/portugues.ly index 4031a076ec..06fa38c2c3 100644 --- a/ly/portugues.ly +++ b/ly/portugues.ly @@ -86,6 +86,6 @@ pitchnamesPortuguese = #`( pitchnames = \pitchnamesPortuguese -\version "2.3.16" +\version "2.3.22" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/property-init.ly b/ly/property-init.ly index 0aac4d576c..486c5bc67b 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "2.3.17" +\version "2.3.22" stemUp = \override Stem #'direction = #1 stemDown = \override Stem #'direction = #-1 diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index 8f29fad387..6c99f506a2 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" major = #`( diff --git a/ly/script-init.ly b/ly/script-init.ly index 496dcc0ee2..bbc8e83bc4 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" % code char abbreviations diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index f6149f2a79..1fab8d9763 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.22" startGroup = #(make-span-event 'NoteGroupingEvent START) stopGroup = #(make-span-event 'NoteGroupingEvent STOP) diff --git a/ly/suomi.ly b/ly/suomi.ly index 69ea3a726e..d162479a3d 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -48,6 +48,6 @@ pitchnamesSuomi = #`( pitchnames = \pitchnamesSuomi -\version "2.3.16" +\version "2.3.22" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/svenska.ly b/ly/svenska.ly index dc956ad07b..4a63dfba33 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -42,6 +42,6 @@ pitchnamesSvenska = #`( ) pitchnames = \pitchnamesSvenska -\version "2.3.16" +\version "2.3.22" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/vlaams.ly b/ly/vlaams.ly index 858385d658..5f8dcc25eb 100644 --- a/ly/vlaams.ly +++ b/ly/vlaams.ly @@ -1,4 +1,4 @@ -\version "2.3.16" %hier stond 2.1.36, mocht ik dat wel veranderen? +\version "2.3.22" %hier stond 2.1.36, mocht ik dat wel veranderen? %{ -- 2.39.2