From bc08c9f183b5e9eb401cf8d685da8e26ccc09834 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 1 Mar 2001 22:05:03 +0100 Subject: [PATCH] patch::: 1.3.133.jcn5 1.3.133.jcn5 ============ * Bugfix: fixed point-and-click broken in jcn2. --- CHANGES | 5 +++++ Documentation/user/lilypond.tely | 11 ++++------- VERSION | 2 +- mutopia/J.S.Bach/Duette/violino-i.ly | 21 +++++++++------------ mutopia/J.S.Bach/Duette/violino-viola.ly | 1 + mutopia/J.S.Bach/Duette/violoncello-i.ly | 4 +++- scm/tex.scm | 7 +++++-- 7 files changed, 28 insertions(+), 23 deletions(-) diff --git a/CHANGES b/CHANGES index 13885158f0..098c529656 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.3.133.jcn5 +============ + +* Bugfix: fixed point-and-click broken in jcn2. + 1.3.133.jcn4 ============ diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 93660837fa..fd6f49f175 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -45,18 +45,15 @@ Copyright 1999 Han-Wen Nienhuys, Jan Nieuwenhuizen and Adrian Mariano @end ifinfo -@ifhtml +@ifnottex +@node Top +@top +@ifhtml This document is also available as a @uref{../lilypond.ps.gz,gzipped postscript file}. - @end ifhtml -@ifnottex -@node Top -@c FIXME: this should not be necessary... -@top - @chapter GNU LilyPond --- The music typesetter LilyPond produces sheet music from input files. This document describes diff --git a/VERSION b/VERSION index 80d24b236e..42a0067cb6 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=133 -MY_PATCH_LEVEL=jcn4 +MY_PATCH_LEVEL=jcn5 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index d9378651b3..1371aa5915 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -11,13 +11,11 @@ copyright = "Public Domain"; \version "1.3.122"; violinoI = \notes\relative c'' { - \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 3 8) + \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 3 8)\property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 16) %{ should fix autobeamer: not only check shortest type's end in beam, but also the newly added type's end - %\property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 16) - Normally, we want [c8 c c] and [c16 c c c c c], @@ -39,7 +37,6 @@ violinoI = \notes\relative c'' { Hmm. %} - %r4 r8 [g16(fis e)d] b'8 a r r [g16(fis e)d] c'8 | r4 r8 g16(fis e)d b'8 a r r g16(fis e)d c'8 | b r r d16(b)a g(e')c d(b)a g(c)a c(b)a g(a)fis | g d(e fis g a )b d(c b c a )b g(a b c d )e g()fis e(d)cis | @@ -53,15 +50,15 @@ violinoI = \notes\relative c'' { c(d)b a b e, b'(c)a g a d, a'(b)g fis g c, g'(a)fis e fis | b,(d)e fis(g)a b(d)c b(a)g fis(g)a b(c)d e(a)g fis e d | g d(e)fis g a b g(fis)g c, a' b, g'(fis)g a, c fis, g(a)b ~| - )b r [d16(b a)g] e'8 d r r [c16(b a)g] g'8 | + )b r d16(b a)g e'8 d r r c16(b a)g g'8 | %10 r r g16(fis)e d(b')g a(fis)e d(g)e g(fis)e d(e)cis | ~ fis,(g e d)e ~ e,(fis d cis)d | ~ e,(dis)e fis g a8 b ~ b(a)g fis e | - [dis e fis g] ~ fis(g)e d e b e(g)e dis e b e(g)e d e | - [cis d e fis] ~ e(fis)d cis d a d(fis)d cis d a d(fis)d c d | + dis e fis g ~ fis(g)e d e b e(g)e dis e b e(g)e d e | + cis d e fis ~ e(fis)d cis d a d(fis)d cis d a d(fis)d c d | %15 - [b c d e] ~ e(dis)e a e cis' a(gis)a dis a fis'8 [b,()a] | + b c d e ~ e(dis)e a e cis' a(gis)a dis a fis'8 [b,()a] | g16 b(cis dis e fis )g b( a g fis e)dis cis( dis e fis g)a fis(e dis cis b | )e g(fis)e a fis g b(a)g a fis g b(a)g fis e [dis()e fis()c] ~| <)g b,> r [b,16(a g)fis] c'8 b r r [a16(g fis)e] e'8 | @@ -70,20 +67,20 @@ violinoI = \notes\relative c'' { ~ ais( b d cis)e d8 [b()cis\prall] d [gis()b] | ~ gis,(a c! b)d [a()b\prall] c [fis()a]| ~ a(b)g fis g e b'(c)a g a fis c'(d)b a b | - g d'(e)c b c a e'(s)d c d b8 ~c,(f! e d c | + g d'(e)c b c a e'(f)d c d b8 ~c,(f! e d c | )b c(f, a g f)e g(f e d c )g c(d e f g )a d(c)b a g | %25 c16 g a b c d e g(f)e f d e c'(b)c a f g c,(b)c ~| d(e)c b c fis8 a ~ c,(d)b a b e,8 ~| b(c)a gis a e' b(c)a g a fis' c(d)b a b g' d(e)c b c | - a' g(fis e d c)b d(c b a g)fis e'(d c b)a \breathe [g(fis e)d] b'8| - a r r r16 a, b c d(e)fis g a b c d [g,(fis e)d] c'8 | + a' g(fis e d c)b d(c b a g)fis e'(d c b)a \breathe g(fis e)d b'8| + a r r r16 a, b c d(e)fis g a b c d g,(fis e)d c'8 | %30 b r r r4 r8 r4 r8 d16 b(a g e')c| d b(a g c a)b d(c f c a)b g(fis g a fis)g b(a g a fis| )g e(d)c f d e g(f)e f d e f(g)a d, f e a(b)c e, g| fis g(a)b e, g fis b(c)d fis, a g a(b)c fis, a g c(d)e g, b| - a g(a b c)d [c(b a)g] r r d16(c b)a | + a g(a b c)d c(b a)g r r d16(c b)a | %35 r r a16( fis e)d g(a)b e,(g)c, fis(g)a d,(fis| diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index 615caf450f..8c6e89738e 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -1,3 +1,4 @@ +#(set! point-and-click #t) \header{ filename = "violino-viola.ly"; title = "Vier Duette"; diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index 36bd5f4828..f77c9ae23b 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -12,6 +12,7 @@ copyright = "Public Domain"; violoncelloI = \notes\relative c{ \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 3 8) + % too many [c8 c c] stuff here; some manual beaming %\property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 16) g8()a d, g b()g d()fis a d a()fis | @@ -21,7 +22,7 @@ violoncelloI = \notes\relative c{ %5 d8 d'()a b16 c(d)b g b c,8 c'()g a16 b(c)a fis a | b,8()b' fis g a()e fis g()d e fis()d | - g r r g,16(fis e)d b'8 a r r g16(fis e )d c'8 | + g r r [g,16(fis e)d] b'8 a r r [g16(fis e )d] c'8 | b r r d16 b(a)g e' c d b(a)g c a c b(a)g a fis | g d( e fis g a )b d(c b c )a b g(a b c b )e g( fis e d cis | %10 @@ -58,6 +59,7 @@ violoncelloI = \notes\relative c{ d a'(b cis d)e fis8 [g,16( fis e)d] g8()e c a d()d,| g r r r16 d''(e)f b,(d)g, b(c)d g,(b)d, f(g)a d,(f| )b, d(e)f b,(d)g,8 a()b c16 d(e f g a)b d(c b a)g| + % FIXME? fis [a(g)fis e d] g8()e c g'8 b, e c d d, | g1.| \bar "|."; diff --git a/scm/tex.scm b/scm/tex.scm index bbb45d4550..ef5d567f9a 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -180,8 +180,11 @@ (define (define-origin file line col) ; use this for column positions (if point-and-click - (string-append "\\special{src:" (ly-number->string line) ":" - (ly-number->string col) " " file "}" + ; ly-number->string breaks point-and-click + (string-append "\\special{src:" + (number->string line) ":" + (number->string col) " " + file "}" ;; arg, the clueless take over the mailing list... ; "\\special{-****-These-warnings-are-harmless-***}" ; "\\special{-****-PLEASE-read-http://appel.lilypond.org/wiki/index.php3?PostProcessing-****}" -- 2.39.5