From: Han-Wen Nienhuys Date: Tue, 3 Aug 2004 16:47:00 +0000 (+0000) Subject: release commit X-Git-Tag: release/2.3.11~1 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=aaaff9b890e41906622e14d571ad8fd555cab64e;p=lilypond.git release commit --- diff --git a/ChangeLog b/ChangeLog index 4f411f2c96..1bcec1982b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,15 @@ +2004-08-03 Han-Wen Nienhuys + + * scripts/lilypond-book.py (Lilypond_file_snippet.ly): reinstate + renameinput. + 2004-08-02 Han-Wen Nienhuys * lily/lookup.cc (round_filled_box): remove warnings about blot diameter. - * scm/paper.scm (paper-set-staff-size): tune up linethickness by - 10% for 20pt staffs. Leave 16.5 untouched. + * scm/paper.scm (paper-set-staff-size): make linethickness more + easily tunable. * lily/parser.yy (new_lyrics): \addlyrics -> \oldaddlyrics, \newlyrics -> \addlyrics diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 6e98cbe70f..79bf98b1ba 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -208,7 +208,7 @@ accidental. @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Staff \relative c'' { gis1 s s gisis s s ges s s geses s s g! } @@ -680,7 +680,7 @@ lines. \set Score.automaticBars = ##f \override Score.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large -\addlyrics +\oldaddlyrics \context Staff \relative c' { \clef soprano c1 s s \clef mezzosoprano c s s @@ -773,7 +773,7 @@ chords are denoted open chords @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Staff \relative c'' { 1 s s s s @@ -1187,7 +1187,7 @@ also to some extent in newer jazz music. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Staff \relative c' { c1 d \override TextScript #'padding = #-4 @@ -1202,7 +1202,7 @@ also to some extent in newer jazz music. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Staff \relative c' { d1 \override TextScript #'padding = #-4 @@ -1217,7 +1217,7 @@ also to some extent in newer jazz music. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c' { \override TextScript #'padding = #-4 e1^"~~ S" f g a b^"~~ S" c d e @@ -1231,7 +1231,7 @@ also to some extent in newer jazz music. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c' { f1 g a \override TextScript #'padding = #-4 @@ -1246,7 +1246,7 @@ also to some extent in newer jazz music. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c'' { g1 a \override TextScript #'padding = #-4 @@ -1260,7 +1260,7 @@ also to some extent in newer jazz music. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c'' { a1 \override TextScript #'padding = #-4 @@ -1280,7 +1280,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c' { c1 d \override TextScript #'padding = #-4 @@ -1295,7 +1295,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c'' { a1 \override TextScript #'padding = #-4 @@ -1310,7 +1310,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c'' { a1 \override TextScript #'padding = #-4 @@ -1325,7 +1325,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c'' { a1 \override TextScript #'padding = #-4 @@ -1646,7 +1646,7 @@ but equal pitch. @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Staff \relative c'' { gis1 s s as s s s s s s } @@ -1714,7 +1714,7 @@ symbol indicates playing an octave lower (for example on double bass \set Score.automaticBars = ##f \override Staff.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c { \clef varbaritone f1 @@ -1882,7 +1882,7 @@ variants of the base chords. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Voice \relative c'' { 1 < a f d > < b g e > < d b g > < e c a > < f d b > } @@ -1919,7 +1919,7 @@ scores are notated like that). \set Score.automaticBars = ##f \override Staff.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large -\addlyrics +\oldaddlyrics \relative c'' { \clef french g1 s s @@ -2038,7 +2038,7 @@ section. @aref{functional harmony}. < c a f > < b g d > < c g e >2 } % %\override Score.LyricText #'font-style = #'large - \addlyrics + \oldaddlyrics \context Staff = SB \relative c { \clef bass \partial 4 c4 | f, g c2 @@ -2126,7 +2126,7 @@ of such two forms an octave. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Voice \relative c'' { < g g >1 s < g as >^"minor" s @@ -2147,7 +2147,7 @@ of such two forms an octave. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Staff \relative c'' { < g c >^"perfect" s < g cis >^"augm" s @@ -2168,7 +2168,7 @@ of such two forms an octave. \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large -\addlyrics +\oldaddlyrics \context Staff \relative c'' { < gis f'! >1^"dimin" s < g! f'! >^"minor" s @@ -2306,7 +2306,7 @@ unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato}, and @lilypond[fragment,notime] \set Score.automaticBars = ##f -\addlyrics +\oldaddlyrics \context Staff \relative c'' { c4-( d e-) \bar "||" c4-- d-- e-- \bar "||" @@ -3275,7 +3275,7 @@ sub@-do@-mi@-nant (S) and V = dominant (D). \set Score.automaticBars = ##f %\override Score.LyricText #'font-style = #'large %\set minVerticalAlign = #8 -\addlyrics +\oldaddlyrics \context Staff \relative c' { c1 d e f g a b c } @@ -3848,7 +3848,7 @@ with figures designating the chief @aref{interval}s and < bes g >8 as < as f > g < g es > f < d f > es | < g es >4 } >> } - \addlyrics + \oldaddlyrics \context Staff = rh \relative c' { \clef bass \key es \major diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index a113e720fa..32fa909fc9 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -7284,7 +7284,7 @@ supported @lilypond[quote,raggedright] << - \addlyrics { + \oldaddlyrics { b' ^\shortfermata _\shortfermata diff --git a/VERSION b/VERSION index 293ef2240f..bbada77fbc 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=3 -PATCH_LEVEL=10 -MY_PATCH_LEVEL=hwn1 +PATCH_LEVEL=11 +MY_PATCH_LEVEL= diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly index 08b3efe0d0..8b58482f76 100644 --- a/input/no-notation/denneboom.ly +++ b/input/no-notation/denneboom.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.10" \header{ filename = "denneboom.ly" enteredby = "jcn" @@ -34,7 +34,7 @@ ugloeit = \lyrics{ licht ge- spreid } -oboom = \notes\transpose c c'{ +oboom = \transpose c c'{ g,8 | c8. c16 c4. d8 | e8. e16 e4. e8 | @@ -42,7 +42,7 @@ oboom = \notes\transpose c c'{ d8. c16 c4 r8 } -bos = \notes\transpose c c'{ +bos = \transpose c c'{ g8 | g e a4. g8 | g8. f16 f4 r8 f8 | @@ -51,7 +51,7 @@ bos = \notes\transpose c c'{ } -melody = \notes{ +melody = { \oboom \oboom \bos @@ -59,7 +59,7 @@ melody = \notes{ } -verseOne = \notes{ +verseOne = { \oden \oden \ikheb @@ -70,7 +70,7 @@ verseOneStaff = \context Lyrics = one \verseOne -verseTwo = \notes{ +verseTwo = { \oden \oden \ugloeit @@ -106,7 +106,7 @@ denneboomShape = \paper{ } \score{ - \addlyrics + \oldaddlyrics \context Staff { \time 3/4 \melody } \context Lyrics \verseOne \paper{ diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index 21865956cf..5a633203db 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "2.3.4" +\version "2.3.10" \header { title = "Puer natus est nobis (excerptum)" subtitle = "Antiphona ad introitum VII" @@ -10,7 +10,7 @@ This file pretty nicely demonstrates what still does not work among ligatures: (i) horizontal spacing between ligatures and lyrics aligment is broken; (ii) lily crashes when removing Stem_engraver, but still using Slur_engraver (this is useful needed -for the \addlyrics feature when no slurs are to be typeset); (iii) +for the \oldaddlyrics feature when no slurs are to be typeset); (iii) episem causes a parse error (this used to work a while ago); (iv) support for augmentum dots is missing; (v) accidentals must be placed before the ligature (not demonstrated in this example)." diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index ddec9c87f1..e5fc8ea340 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "2.3.4" +\version "2.3.10" \header{ texidoc= "Lyrics can be set to a melody automatically. Excess lyrics will be @@ -37,7 +37,7 @@ textII = \context Lyrics = "middle-1" \lyrics { da -- da __ da -- da da da da da \context Lyrics = LB { s1 } \context Staff = SC \noise - \addlyrics + \oldaddlyrics \context Staff = SB \context Voice="middle" \m << \context Lyrics = LA \textI \context Lyrics = LB \textII diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly index 8ae96a7410..80f585cad3 100644 --- a/input/regression/lyrics-tenor-clef.ly +++ b/input/regression/lyrics-tenor-clef.ly @@ -1,9 +1,8 @@ - \header { texidoc = "Lyrics are not lowered despite the presence of an octavation 8." } -\version "2.3.4" +\version "2.3.10" \paper { \context { \Staff @@ -12,10 +11,9 @@ \context { \Lyrics minimumVerticalExtent = ##f - } + } raggedright = ##t } -<< -\relative c' { \clef "G_8" c c c c } -\newlyrics { bla bla bla bla } ->> + +\relative { \clef "G_8" c c c c } +\addlyrics { bla bla bla bla } diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly index 1a469c7844..43b39e41f9 100644 --- a/input/regression/newaddlyrics.ly +++ b/input/regression/newaddlyrics.ly @@ -8,22 +8,22 @@ \new Staff \relative { d'2 d c4 bes a2 \break } - \newlyrics { + \addlyrics { My first Li -- ly song, } - \newlyrics { + \addlyrics { Not much can go wrong! } \new Staff \relative { \clef bass d2 d c4 bes a2 \break } - \newlyrics { + \addlyrics { MY FIRST LI -- LY SONG, } - \newlyrics { + \addlyrics { NOT MUCH CAN GO WRONG! } >> -\version "2.3.4" +\version "2.3.10" diff --git a/input/simple-song.ly b/input/simple-song.ly index d68971a6de..0d1e2b9401 100644 --- a/input/simple-song.ly +++ b/input/simple-song.ly @@ -5,14 +5,14 @@ d,2 d c4 bes a2 \break c2 c d4 f g2 } - \newlyrics { + \addlyrics { My first Li -- ly song, Not much can go wrong! } >> %% Optional helper for automatic updating by convert-ly. May be omitted. -\version "2.3.4" +\version "2.3.10" %% Optional helper for quick click and edit mode. May be omitted #(ly:set-point-and-click 'line-column) diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh index 71a0d58fdf..26ac92a6c2 100644 --- a/lily/include/lily-lexer.hh +++ b/lily/include/lily-lexer.hh @@ -24,9 +24,6 @@ bool busy_parsing (); void kill_lexer (); void set_lexer (); -/* - TODO: this has a lot of SCM objects. Smobify me. - */ class Lily_lexer : public Includable_lexer { DECLARE_SMOBS(Lily_lexer,); diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 9dc4562539..80d47beb5f 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -169,9 +169,12 @@ line_spanner_common_parent (Grob *me) routine, via stencil_extent. At this point, the staves aren't separated yet, so it doesn't work cross-staff. + (huh? crossable staves have fixed distance? --hwn) + */ + MAKE_SCHEME_CALLBACK (Line_spanner, print, 1); SCM Line_spanner::print (SCM smob) @@ -203,7 +206,7 @@ Line_spanner::print (SCM smob) /* This is hairy. For the normal case, we simply find common parents, and draw a line between the bounds. When two note - heads are on different lines, there is no common parent + heads are on different systems, there is no common parent anymore. We have to find the piano-staff object. */ diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 25e00eaa1f..db7669729e 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -115,7 +115,9 @@ ;; ;; Ross. page 151 lists other values, we opt for a leaner look - ;; + ;; + ;; TODO: + ;; kern should scale with linethickness too. (kern . 3.0) (thin-kern . 3.0) (hair-thickness . 1.9) @@ -885,6 +887,7 @@ (grace-space-factor . 0.6) (shortest-duration-space . 2.0) (spacing-increment . 1.2) +; (base-shortest-duration . ,(ly:make-moment 1 8 3 2)) (base-shortest-duration . ,(ly:make-moment 1 8)) (meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface)))) )) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 39c20aabd1..49a9985b99 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -2137,8 +2137,8 @@ conversions.append (((2, 3, 9), conv, def conv (str): - str = re.sub (r'\\addlyrics', '\\oldaddlyrics', str) - str = re.sub (r'\\newlyrics', '\\addlyrics', str) + str = re.sub (r'\\addlyrics', r'\\oldaddlyrics', str) + str = re.sub (r'\\newlyrics', r'\\addlyrics', str) return str conversions.append (((2, 3, 10), conv, diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 2d76b3c7bb..a7c967a196 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -710,7 +710,7 @@ class Lilypond_snippet (Snippet): class Lilypond_file_snippet (Lilypond_snippet): def ly (self): name = self.substring ('filename') - return open (find_file (name)).read () + return '\\renameinput \"%s\"\n%s' % (name, open (find_file (name)).read ()) snippet_type_to_class = { 'lilypond_file' : Lilypond_file_snippet,