patch::: 1.1.44.jcn1

pl 44.jcn1
	- bf: twinke repeats

diff --git a/NEWS b/NEWS
index 23ddc6417352c87c1fd43a0bd8600b2ec2d5bd2b..1c4b2a0c7b6d76fdb9f1abdb33d1dadb3db9ce39 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+pl 44.jcn1
+       - bf: twinke repeats
 
 pl 44
 pl 43.jcn2

diff --git a/TODO b/TODO
index d23637eef9b35e0968ae0339788e9734156ef4d3..41074854548851a335f28ec03ebd431e8d97bc0a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -31,6 +31,7 @@ Grep for TODO and ugh/ugr/urg.
 . * turn slope-damping on/off
 . * tremolo stuff
 . * We need feta-din*.mf files for more sizes than 10.
+. * feta-accordeon has some 'strange turning paths' on 300dpi
 . * fix dynamics decently, ie. use kerning & ligatures.  
 . * dots & rest collisions?
 . * mudela-book.py

diff --git a/VERSION b/VERSION
index c9c12ced278c1f9c57fbda3cf4cf4763ab55eb64..ab235e0efa086dd622805b16fa7fc5c441cd11f8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=44
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 58d5b5541cd3d0997fc66ea9abe71a31b48e5f35..5a10ae11f72b4e854bb39f507e65533bcfa4b23e 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -118,13 +118,13 @@ textiii = \lyrics{
 \score{
        <
                \context Staff=i \repeat semi 2 < \global\melody >
-               \context Lyrics=top \context LyricVoice \repeat semi 2 {} \alternative < \tekst \texte >
+               \context Lyrics=top \context LyricVoice \repeat fold 2 {} \alternative { \tekst \texte }
                \context GrandStaff <
                        \context Staff=ii \repeat semi 2 < \global\melody >
                        \context Staff=iii \repeat semi 2 < \global\accompany >
                >
-               \context Lyrics =bottom \context LyricVoice \repeat semi 3 {} 
-                       \alternative < \texti \textii \textiii >
+               \context Lyrics =bottom \context LyricVoice \repeat fold 3 {} 
+                       \alternative { \texti \textii \textiii }
        >
        \paper{
                gourlay_maxmeasures = 14.0;

diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf
index 8367a5ae4b78cfffb279d866655fb992a354724e..2ba90d28d87872904ee970420b5678325d93b7dd 100644 (file)
--- a/mf/feta-accordion.mf
+++ b/mf/feta-accordion.mf
@@ -2,12 +2,11 @@
 
 accreg_dot_size# := .5interline#;
 
-% 'strange turning path' in accBayanbase:
+% FIXME
+% 'strange turning path' in accSB and others:
 %     mf '\mode=laserjet; input feta11'
-% accreg_linethickness# := 1.3stafflinethickness#;
-
-% so, do thinner lines, for now
-accreg_linethickness# := 1.2stafflinethickness#;
+%     mf '\mode=laserjet; input feta13'
+accreg_linethickness# := 1.3stafflinethickness#;
 
 % This dimention is the same on all registersymbols.
 % The different symbols should calculate their other
@@ -76,7 +75,9 @@ fet_beginchar("accBayanbase", "accBayanbase", "accBayanbase")
 fet_endchar;
 
 def def_B(expr w, h) = 
-       pickup pencircle scaled 0.1pt;
+       % huh?
+       % pickup pencircle scaled 0.1pt;
+       pickup pencircle scaled 0.15stafflinethickness;
        penpos10(thin, -90);
        penpos11(thin, -90);
        penpos12(thick, 0);
@@ -100,7 +101,9 @@ def def_B(expr w, h) =
 enddef;
 
 def def_S(expr w, h) =
-       pickup pencircle scaled 0.02pt;
+       % huh?
+       %pickup pencircle scaled 0.02pt;
+       pickup pencircle scaled 0.03stafflinethickness;
        penpos1(thin, 180);
        penpos2(thin, -90);
        penpos3(thick, 0);
@@ -144,7 +147,10 @@ fet_beginchar("accSB", "accSB", "accSB")
        set_char_box(.4staffsize#, .4staffsize#, 0, 2.4interline#);
        def_some_vars;
        def_B(.35width, .7height);
+
+       % FIXME -- strange turning path:
        penstroke z10e--z11e{right}..z12e{up}..z13e{left}--z14e;
+
        penstroke z13e{right}..z15e{up}..z16e{left}--z17e;
        penstroke z18e--z19e;
        pickup pencircle scaled .5thick;
@@ -170,7 +176,10 @@ fet_beginchar("accBB", "accBB", "accBB")
        set_char_box(.4staffsize#, .4staffsize#, 0, 2.4interline#);
        def_some_vars;
        def_B(.35width, .7height);
+
+       % FIXME -- strange turning path:
        penstroke z10e--z11e{right}..z12e{up}..z13e{left}--z14e;
+
        penstroke z13e{right}..z15e{up}..z16e{left}--z17e;
        penstroke z18e--z19e;
        pickup pencircle scaled .5thick;
@@ -239,7 +248,10 @@ fet_beginchar("accOldEES", "accOldEES", "accOldEES")
        filldraw (0, 0)--(0, thin)--(sw, thin)--(sw, ch-thin)
                --(sw+thick, ch-thin)--(sw+thick, thin)
                --(2sw+thick, thin)--(2sw+thick, 0)--cycle;
+
+       % FIXME -- strange turning path:
        penstroke z1e--z2e{right}..z3e..z4e{left}--z5e;
+
        penstroke z4e{right}..z6e{down}..z7e{right}..z8e{up};
        currentpicture := currentpicture shifted (-w/2, -shy*h);
        currentpicture := currentpicture shifted (0, r);