lilypond-1.3.134

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 93660837faa6bbab503107e2a4f5d231f6284ce3..fd6f49f175a5306dd6038d8090c54b61323ac004 100644 (file)
--- 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/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly
index 801484af2c08862c3578ef93aa9f4d21dffe95cf..1371aa5915eac82323e4a546014f5f7ec48df2d4 100644 (file)
--- a/mutopia/J.S.Bach/Duette/violino-i.ly
+++ b/mutopia/J.S.Bach/Duette/violino-i.ly
@@ -8,14 +8,35 @@ enteredby =   "jcn";
 copyright =    "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 violinoI =  \notes\relative c'' {
-  \property Voice.beamAutoEnd = "3/8"
-  %% should fix autobeamer: not only check shortest type's end in beam,
-  %%% but also the newly added type's end
-  \property Voice."beamAutoEnd_8" = "1/16"
-  %r4 r8 [g16(fis e)d] b'8 a r r [g16(fis e)d] c'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
+  
+     Normally, we want
+
+         [c8 c c] and [c16 c  c c  c c],
+
+     ie '(end *) = 3/8
+
+     However, we don't want
+
+         [c16 c  c c  c8] c8,  TODO: manually correct these
+
+     but rather
+
+         [c16 c  c c]  c8 c8,
+
+     ie '(end X) = 1/4
+        
+    X can't be 1/16 or 1/8
+
+    Hmm.
+   %}
+   
   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 |
@@ -29,15 +50,15 @@ violinoI =  \notes\relative c'' {
   <e16 fis,> 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 <c8( d, a>~|
-  <c d, a> )b r [d16(b a)g] e'8 d r r [c16(b a)g] g'8 | 
+  <c d, a> )b r d16(b a)g e'8 d r r c16(b a)g g'8 | 
 %10
   <fis a, d,> r r g16(fis)e d(b')g a(fis)e d(g)e g(fis)e d(e)cis |
   <d4. d,>~<d16 d,> fis,(g e d)e <c'!4. d,>~<c16 d,> e,(fis d cis)d |
   <b'4. g g,>~<b16 g g,> e,(dis)e fis g a8 b <c fis,>~ <c16 fis,> b(a)g fis e |
-  [dis e fis g] <a8 fis>~<a16 fis> fis(g)e d e b e(g)e dis e b e(g)e d e |
-  [cis d e fis] <g8 a,>~<g16 a,> e(fis)d cis d a d(fis)d cis d a d(fis)d c d |
+  dis e fis g <a8 fis>~<a16 fis> fis(g)e d e b e(g)e dis e b e(g)e d e |
+  cis d e fis <g8 a,>~<g16 a,> e(fis)d cis d a d(fis)d cis d a d(fis)d c d |
 %15
-  [b c d e] <f8 g,>~<f16 g,> e(dis)e a e cis' a(gis)a dis a fis'8 [b,()a] |
+  b c d e <f8 g,>~<f16 g,> 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] <a'8( b, fis b,>~|
   <a b,> <)g b,> r [b,16(a g)fis] c'8 b r r [a16(g fis)e] e'8 |
@@ -46,20 +67,20 @@ violinoI =  \notes\relative c'' {
   <b4. d, g>~<b16 d,> ais( b d cis)e d8 [b()cis\prall] d [gis()b] |
   <d,4. e,>~<d16 e,> gis,(a c! b)d <c8 e,> [a()b\prall] c [fis()a]|
   <c,4. d,>~<c16 d,> 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 <g'4 g, g,>~<g16 g,>c,(f! e d c |
+  g d'(e)c b c a e'(f)d c d b8 <g'4 g, g,>~<g16 g,>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 <f8 g, g,>~|
   <f16 g,> d(e)c b c fis8 a <c d, d,>~<c16 d, d,> c,(d)b a b e,8 <d'4 e,> ~|
   <d16 e,> 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] <f'8 g, g,> <e g, g,> r r d16(c b)a <g'8 a, d,> |
+  a g(a b c)d c(b a)g <f'8 g, g,> <e g, g,> r r d16(c b)a <g'8 a, d,> |
 %35
   <fis a, d,> r r a16( fis e)d <c'8 a, d,> <b16 b, d, g,> g(a)b e,(g)c,
   fis(g)a d,(fis|
@@ -68,8 +89,8 @@ violinoI =  \notes\relative c'' {
   <c4.\prall>~c16 b(a g)e' c()d b(a g)c a()c b(a)g
   \context Staff<
     %\context Voice { a16 f | g1. }
-    \context Voice { \property Voice.verticalDirection=1 a16 fis | g1. }
-    \context Voice=x { \property Voice.verticalDirection=-1 c,16 c | b1. }
+    \context Voice { \stemUp\slurUp\tieUp a16 fis | g1. }
+    \context Voice=x { \stemDown\slurDown\tieDown c,16 c | b1. }
   >
   \bar "|.";
 }
@@ -78,8 +99,8 @@ violinoI =  \notes\relative c'' {
 
 violinoIStaff =  \context Staff = violino <
   %urg
-  % \notes\property Voice.textStyle = "large" s4^"Moderato"
-  % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"}
+  % \notes\property Voice.TextScript \set #'font-style = #'large s4^"Moderato"
+  % \notes {s4. \property Voice.TextScript \set #'font-style = #'large s4^"Moderato"}
   % urg, timidity violino patches broken?
   %\property Staff.instrument = "violin"
   \property Staff.instrument = "viola"

diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly
index 7cc2dcd082ce475a6e067375818b2ddf6f220add..8c6e89738e70460dda9ed36a4db235e7f529dc79 100644 (file)
--- 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";
@@ -8,7 +9,7 @@ enteredby =      "jcn";
 copyright =     "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 % { 
 \include "violino-i.ly";

diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly
index fb2ca5202f1aebfe13a588cbdbdddc5989d39e74..f77c9ae23bbbff8d0f82fb4b8c5b3a686114b14a 100644 (file)
--- a/mutopia/J.S.Bach/Duette/violoncello-i.ly
+++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly
@@ -8,10 +8,13 @@ enteredby =   "jcn";
 copyright =    "Public Domain";
 }
 
-\version "1.3.117";
+\version "1.3.122";
 
 violoncelloI =  \notes\relative c{
-  \property Voice.beamAutoEnd = "3/8"
+  \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 |
   g()d b' g b()c b()e fis g d()d, |
   g r r [d'16(b a )g] e'8 d r r [c16(b a )b] g'8 |
@@ -19,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
@@ -56,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 499b2efdd3545d1486ffe259189896a51669e686..aad55f430ceeb0d587df06046811e6ad0ac44fed 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -30,7 +30,7 @@
            (ly-warn (string-append
                      "Programming error: No such font known "
                      (car name-mag-pair) " "
-                     (number->string (cdr name-mag-pair))
+                     (ly-number->string (cdr name-mag-pair))
                      ))
            "") ; issue no command
          (string-append "\\" (cddr c)))
@@ -64,7 +64,7 @@
      "\\font\\" command "="
      (car name-mag)
      " scaled "
-     (number->string (inexact->exact (* 1000  (cdr name-mag))))
+     (ly-number->string (inexact->exact (* 1000  (cdr name-mag))))
      "\n"))
 
   (define (ez-ball c l b)
@@ -107,6 +107,7 @@
      "}"
      "\\input lilyponddefs\\newdimen\\outputscale \\outputscale=\\lilypondpaperoutputscale pt\\turnOnPostScript"))
 
+  ;; Note: this string must match the string in ly2dvi.py!!!
   (define (header creator generate) 
     (string-append
      "% Generated automatically by: " creator generate "\n"))
@@ -180,8 +181,11 @@
   (define (define-origin file line col)
     ; use this for column positions
     (if point-and-click
-     (string-append "\\special{src:" (number->string line) ":"
-        (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-****}"