patch::: 1.1.43.crypton1

pl 43.crypton1
	- bf: repeat :| placement + core dump
	  input/test/repeat.ly
	  input/test/coda-kludge.ly
	- bf: mf without ljfour

diff --git a/NEWS b/NEWS
index 9b3d25ffa872aea8069a2271b78d9d1ea33e7bcf..53b952e982ac57157b796347b73a016020c12123 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+pl 43.crypton1
+       - bf: repeat :| placement + core dump
+         input/test/repeat.ly
+         input/test/coda-kludge.ly
+       - bf: mf without ljfour
+
 pl 43.jcn1
        - configure, set-lily.sh, release stuff
 

diff --git a/TODO b/TODO
index 534c44f18ebc01bd1e8e3b9fbebb712049feefca..92ee0c62c75744b04c5a67ebb9824a9be794730a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -15,7 +15,12 @@ Grep for TODO and ugh/ugr/urg.
 .  * ps/lily.ps see comments.
 . * devise standard for functioning of Vertical_align_element.
 . * midi key.
-
+. * Repeats
+.  * unfold broken: 
+.   * without alternatives: repeat unfold 4 { a b c d }
+.   * count > alternatives: repeat unfold 79 { a b c d } 
+\alternative { { c c c c } { d d d d } }
+.  * kind of 'initial property' iso fold/volta(semi)/unfold strings
 . * fix singleStaffBracket
 . * declare performers in \midi
 . * fix MIDI

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

diff --git a/aclocal.m4 b/aclocal.m4
index 1ae2d849de1b2d028950894e8284bc0894565797..b55536ab7fe1d97f3fd786bbeebd84d423666e95 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -546,6 +546,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     AC_CHECK_PROGS(METAPOST, mp, no)
     if test "x$METAPOST" = "xno"; then
        AC_CHECK_PROGS(MPOST, mpost, -echo no mp or mpost)
+
        METAPOST=$MPOST
     fi
 
@@ -561,8 +562,20 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
        INIMETAPOST=$INIMPOST
     fi
 
+    AC_MSG_CHECKING(for working metafont mode)
+    modelist='ljfour lj4 lj3 lj2 ljet laserjet'
+    for MFMODE in $modelist; do
+       $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1
+       if test -f mfput.tfm; then
+           break;
+       fi
+    done
+    rm -f mfput.*
+    AC_MSG_RESULT($MFMODE)
+
     AC_SUBST(METAFONT)
     AC_SUBST(METAPOST)
+    AC_SUBST(MFMODE)
     AC_SUBST(INIMETAFONT)
     AC_SUBST(INIMETAPOST)
 ])

diff --git a/config.make.in b/config.make.in
index e4f53705ca7493625bcfb1301d97d733da04caba..be2cb00274d2222add1658f395f4e63e9e1de9ea 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -51,6 +51,7 @@ INIMETAPOST = @INIMETAPOST@
 LN = @LN@
 LN_S = @LN_S@
 METAFONT = @METAFONT@
+MFMODE = @MFMODE@
 METAPOST = @METAPOST@
 MSGFMT = @MSGFMT@
 PATHSEP = @PATHSEP@

diff --git a/configure.in b/configure.in
index eb276f305ae041a662727429532557e9b23672ce..10a18a76b29da98b39bbb1c729c2866203862c1f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -67,7 +67,7 @@ for i in $LOCALES; do
 done
 rm -f afm; ln -sf $LILYPONDPREFIX/mf/out afm
 rm -f tfm; ln -sf $LILYPONDPREFIX/mf/out tfm
-rm -f cmtfm; ln -sf `dirname $TEX_TFMDIR` cmtfm
+rm -f cmtfm; ln -sf $TEX_TFMDIR cmtfm
 AC_MSG_RESULT(ok)
 
 AC_STEPMAKE_END

diff --git a/input/bugs/unfold-many.ly b/input/bugs/unfold-many.ly
new file mode 100644 (file)
index 0000000..0b1bedb
--- /dev/null
+++ b/input/bugs/unfold-many.ly
@@ -0,0 +1,12 @@
+\score{
+       \context Staff \notes\relative c'{ 
+               % compare this to 'semi' with numbered voltas:
+               %  1-3: alternative 1
+               %    4: alternative 2
+               \repeat unfold 4 { g a b c } 
+               \alternative { 
+                       { c c c c }
+                       { d d d d }
+               }
+       }
+}

diff --git a/input/bugs/unfold.ly b/input/bugs/unfold.ly
new file mode 100644 (file)
index 0000000..76ccc3d
--- /dev/null
+++ b/input/bugs/unfold.ly
@@ -0,0 +1,5 @@
+\score{
+       \context Staff \notes\relative c'{ 
+               \repeat unfold 4 { g a b c }
+       }
+}

diff --git a/input/test/coda-kludge.ly b/input/test/coda-kludge.ly
index e68029ae2a4a7cf67672cd28ea4450a7168069a1..b9c09685d8ef48f5c2c466f5b8bc8d9be2ce955b 100644 (file)
--- a/input/test/coda-kludge.ly
+++ b/input/test/coda-kludge.ly
@@ -32,19 +32,19 @@ Hi,
                        c c c c
                        % coda-klugde: let volta span only one bar
                        \property Staff.voltaSpannerDuration = "1"
-                       \repeat 5 { d d d d }
+                       \repeat semi 5 { d d d d }
                                \alternative { { e e e e f f f f }
                        { g g g g } }
                }
                \context Lyrics \lyrics{
                        intro1
-                       \repeat 5 {}
-                       \alternative <
+                       \repeat fold 5 {}
+                       \alternative {
                                { chorus1 one verse1 }
                                { chorus1 two verse1 }
                                { chorus1 three verse }
                                { chorus1 four verse }
-                       >
+                       }
                        five1
                }
        >

diff --git a/input/test/repeat.ly b/input/test/repeat.ly
index 96a82264ea026ccf45a5239c59d4422284eea9ea..2c1d01c95157b5d950a64428d484575c4a19df04 100644 (file)
--- a/input/test/repeat.ly
+++ b/input/test/repeat.ly
@@ -16,5 +16,3 @@
                  }
        >
 }
-
-\version "1.0.16"; 

diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc
index 8de755f670dc8adc28e6f4c7e8160db8202c816f..b6c7e01bfcec85c2bd0546b7710f73b0ac767815 100644 (file)
--- a/lily/repeat-engraver.cc
+++ b/lily/repeat-engraver.cc
@@ -31,13 +31,32 @@ Repeat_engraver::do_try_music (Music* m)
 {
   if (New_repeated_music* r = dynamic_cast<New_repeated_music *> (m))
     {
+      if (!r->semi_fold_b_)
+        return true;
+
       Music_sequence* alt = r->alternatives_p_;
       Moment repeat_length_mom = r->repeat_body_p_->length_mom ();
       Moment stop_mom = now_mom () + repeat_length_mom;
       Moment alt_mom = now_mom () + repeat_length_mom;
+
+      /*
+       if there's a repeat block, we'll need a stop-repeat :| 
+       */
       if (repeat_length_mom)
        {
-         stop_mom += r->alternatives_length_mom ();
+         /*
+           if there are alternatives, the :| comes before last alternative
+           (only for semi-unfolded, but otherwise we're not here anyway?)
+           */
+         if (alt)
+           {
+             for (Cons<Music> *i (alt->music_p_list_p_->head_); i && i->next_; i = i->next_)
+               {
+                 stop_mom += i->car_->length_mom ();
+                 if (r->fold_b_)
+                   break;
+               }
+            }
          repeated_music_arr_.push (r);
          stop_mom_arr_.push (stop_mom);
        }
@@ -58,6 +77,9 @@ Repeat_engraver::do_try_music (Music* m)
       if (prop.length_i ())
        span_mom = prop.to_rat ();
 
+      if (!alt)
+       return true;
+
       int alt_i = r->repeats_i_ + 1 - cons_list_size_i (alt->music_p_list_p_->head_ ) >? 1;
       for (Cons<Music> *i = alt->music_p_list_p_->head_; i ; i = i->next_)
         {

diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf
index 5c016724e99eefb9ceb5236c2b08349d3b30c11a..8367a5ae4b78cfffb279d866655fb992a354724e 100644 (file)
--- a/mf/feta-accordion.mf
+++ b/mf/feta-accordion.mf
@@ -1,7 +1,13 @@
 % -*- Fundamental -*-
 
 accreg_dot_size# := .5interline#;
-accreg_linethickness# := 1.3stafflinethickness#;
+
+% 'strange turning path' in accBayanbase:
+%     mf '\mode=laserjet; input feta11'
+% accreg_linethickness# := 1.3stafflinethickness#;
+
+% so, do thinner lines, for now
+accreg_linethickness# := 1.2stafflinethickness#;
 
 % This dimention is the same on all registersymbols.
 % The different symbols should calculate their other

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 1ae2d849de1b2d028950894e8284bc0894565797..b55536ab7fe1d97f3fd786bbeebd84d423666e95 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -546,6 +546,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     AC_CHECK_PROGS(METAPOST, mp, no)
     if test "x$METAPOST" = "xno"; then
        AC_CHECK_PROGS(MPOST, mpost, -echo no mp or mpost)
+
        METAPOST=$MPOST
     fi
 
@@ -561,8 +562,20 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
        INIMETAPOST=$INIMPOST
     fi
 
+    AC_MSG_CHECKING(for working metafont mode)
+    modelist='ljfour lj4 lj3 lj2 ljet laserjet'
+    for MFMODE in $modelist; do
+       $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1
+       if test -f mfput.tfm; then
+           break;
+       fi
+    done
+    rm -f mfput.*
+    AC_MSG_RESULT($MFMODE)
+
     AC_SUBST(METAFONT)
     AC_SUBST(METAPOST)
+    AC_SUBST(MFMODE)
     AC_SUBST(INIMETAFONT)
     AC_SUBST(INIMETAPOST)
 ])

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 76ca3aa38900fedde3074de261336eb1175bd42f..bf7d6a0a9d29089f98c7616481c2362677d2d792 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -11,7 +11,7 @@ $(outdir)/%.log: %.mf
        rm $(basename $< ).*gf
 
 $(outdir)/%.tfm: %.mf
-       $(METAFONT) '\mode:=ljfour;  input $<;'
+       $(METAFONT) "\mode:=$(MFMODE); input $<;"
        mv $(@F) $(outdir)
        rm $(basename $<).*gf $(basename $<).*log