From 075cdb60cfe9a958180683a2c05e886ac19a6f12 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:49:49 +0000 Subject: [PATCH] lilypond-1.1.44 --- NEWS | 135 ++++++++++++++++---------- TODO | 43 +++----- aclocal.m4 | 56 +++++++++-- config.make.in | 1 + configure.in | 24 +++-- input/bugs/rep.ly | 14 +++ input/bugs/unfold-many.ly | 12 +++ input/bugs/unfold.ly | 5 + input/test/coda-kludge.ly | 8 +- input/test/repeat.ly | 2 - lily/repeat-engraver.cc | 24 ++++- mf/feta-accordion.mf | 8 +- stepmake/NEWS | 9 ++ stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 54 +++++++++-- stepmake/stepmake/metafont-rules.make | 2 +- stepmake/stepmake/script-rules.make | 13 ++- stepmake/stepmake/script-targets.make | 2 +- stepmake/stepmake/script-vars.make | 8 +- 19 files changed, 307 insertions(+), 115 deletions(-) create mode 100644 input/bugs/rep.ly create mode 100644 input/bugs/unfold-many.ly create mode 100644 input/bugs/unfold.ly diff --git a/NEWS b/NEWS index 7d1133c0fd..23ddc64173 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,37 @@ +pl 44 +pl 43.jcn2 + - bf: repeat :| placement + core dump + input/test/repeat.ly + input/test/coda-kludge.ly + - bf: mf without ljfour + * feta-accordion fix/hack for feta11 at 300dpi + +pl 43.hwn1 + - half assed attempt at ABC convertor. + - Spacing_spanner: "decentral" spacing stuff. Use -t to try. + - bf: StaffGroup vertical alignment + - \property {slur,tie,}ydirection -> {slurV,tieV,v}erticalDirection (1.0.20) + - Spanner now hangs on left endpoint. + - \property forgetAccidentals: do not remember accidentals. + Every note not in the key triggers typesetting of an accidental. + - \property noResetKey: do not reset key at start of measure: + accidental remain in effect until overriden + - bf: ties & accidentals (fix breaks oldTieBehavior) + - junked Tie::same_pitch_b_ + +pl 43.jcn1 + - configure, set-lily.sh, release stuff + +pl 42.tca2 + - lilypond don't put \interstaffline after last line. This to + get really nice vertical spacing for mudela-book. + - mudela-book: vertical spacing + - lilyponddefs.tex: commented out \parindent=0pt to get correct + paragraph indent for mudela-book + +************ +pl 43 pl 41.hwn3 - reinstated \property inheritance @@ -17,8 +50,6 @@ quence] Absolute_dynamic_req, Span_dynamic_req, Slur_req, Beam_req. Use Span_reqs and Text_script_reqs with type fields instead. - - pl 42.tca1 - updated mudela-book documentation - misc mudela-book.py @@ -98,8 +129,8 @@ Hara_kiri should be working again. spacing.) pl 40.mb1 - - bf: ly2dvi set MFINPUTS so standard tree is found before lilypond - - bf: lilypond-regtest.doc, ls-latex.py; now finds author/title + - bf: ly2dvi set MFINPUTS so standard tree is found before lilypond + - bf: lilypond-regtest.doc, ls-latex.py; now finds author/title pl 40.uu1 - large documentation patch by Adrian Mariano @@ -303,8 +334,8 @@ pl 33.jcn1 - allow autobeaming according to duration iso (crude) multiplicity pl 33.jbr1 - - change my email address - - Windows platform does a cp -r instead of a ln -s + - change my email address + - Windows platform does a cp -r instead of a ln -s pl 33.uu1 - bf: ^ and _ @@ -554,9 +585,9 @@ pl 23.ms1 - sinfonia.ly: several fixes - dynamics * increased range pppppp to ffffff - * added sp, spp, sff, rfz - * example see input/test/tchaikovsky.ly - * updated dynamics in refman + * added sp, spp, sff, rfz + * example see input/test/tchaikovsky.ly + * updated dynamics in refman pl 24.jcn2 @@ -577,7 +608,7 @@ pl 24.jcn2 pl 24.mb1 - - bf: Correct units now used in the .afm files. + - bf: Correct units now used in the .afm files. ****** @@ -589,13 +620,13 @@ pl 23.jcn9 - bf: lily-version pl 23.jbr1 - - scripts/ly2dvi.py: Windows 95 shell does not support redivrection - of stderr. We now distribute ash and use it when needed. - - stepmake/bin/package-zip32.sh: distribute ash, and guild ice-9/ - directory. We build and distribute manpages in html format instead - of text format. - - Documentation/ntweb: Updated doco and now distributing as a self - extracted binary with install script. + - scripts/ly2dvi.py: Windows 95 shell does not support redivrection + of stderr. We now distribute ash and use it when needed. + - stepmake/bin/package-zip32.sh: distribute ash, and guild ice-9/ + directory. We build and distribute manpages in html format instead + of text format. + - Documentation/ntweb: Updated doco and now distributing as a self + extracted binary with install script. pl 23.hwn4 - bugfixes @@ -750,7 +781,7 @@ pl 18.jcn5 - bf: vv-duet pl 18.mb1 - - \mark now works, using G_staff_side_item. + - \mark now works, using G_staff_side_item. - Improved layout of multi-bar rests, including a new font symbol. @@ -776,17 +807,17 @@ pl 18.jcn1 pl 18 (jan 4 '99) pl 17.jbr2 - - Documentation/README-W32: Brought my stuff up to date - - Documentation/ntweb: updated for realease - - stepmake/bin/package-zip32.sh: cygwin-b20 changes - - scripts/ly2dvi.py: LILYPONDPREFIX fixes + - Documentation/README-W32: Brought my stuff up to date + - Documentation/ntweb: updated for realease + - stepmake/bin/package-zip32.sh: cygwin-b20 changes + - scripts/ly2dvi.py: LILYPONDPREFIX fixes pl 17.jbr1 - - scripts/ly2dvi.py root is now the shared directory path not the - root of the lily installation. Environment variable LILYPONDPREFIX - is also the path to shared directory. - - lily/main.cc WINNT conditional added to avoid a casting of - main_prog + - scripts/ly2dvi.py root is now the shared directory path not the + root of the lily installation. Environment variable LILYPONDPREFIX + is also the path to shared directory. + - lily/main.cc WINNT conditional added to avoid a casting of + main_prog pl 17.hwn1 - bfs wtk1-fugue1 @@ -824,7 +855,7 @@ pl 15.uu1 pl15.tca1 - fixed verbatim option behaviour for mudela-book. - - added mudela-book option intertext="some text" + - added mudela-book option intertext="some text" - mudela-book now understand latex \begin{verbatim} pl 15.jcn1 @@ -843,8 +874,8 @@ parser, lilypond (mudela 1.0.14), manual parser, lilypond (Mudela 1.0.13) pl 14.jcn1 - - bf: get_chord C-m5- - - typos: chord-name + - bf: get_chord C-m5- + - typos: chord-name pl 14.tca2 - move option proccing out of main @@ -870,7 +901,7 @@ pl 12.jcn2 - bf: package-diff - new chord syntax, again: TONIC [DURATION] ['-' MODIFIERS/ADDITIONS] - shorthand prefix for note-mode: '@', no shorthand for notes in chord - mode... + mode... pl 11.jcn6 - bf: ly2dvi: better guess LILYPONDPREFIX: ../share/lilypond @@ -907,16 +938,16 @@ pl 11.jcn2 - duration with chords + change: @4 c @c7 pl 11.jcn1 - - minor chord syntax change: *c6 iso @c6; + - minor chord syntax change: *c6 iso @c6; ********** pl 11 pl9.tca1 - - included that missing init/mudela-book-defs.py. Added - one line to init/GNUMakefile to make .py-files be included. - - fragment and nonfragment options to override autodetection + - included that missing init/mudela-book-defs.py. Added + one line to init/GNUMakefile to make .py-files be included. + - fragment and nonfragment options to override autodetection pl 10.jcn1 - input/test/chords.ly @@ -964,12 +995,12 @@ pl 9 - fixed \relative pl8.tca1 - - changes to mudela-book. Junked fragment and floating options, - added eps option. Options should not stay as long that you get - comfortable with them. ;) - - Also possible to define your own commands with - a syntax like \mudela{c d e} - - updated mudela-book-doc.doc + - changes to mudela-book. Junked fragment and floating options, + added eps option. Options should not stay as long that you get + comfortable with them. ;) + - Also possible to define your own commands with + a syntax like \mudela{c d e} + - updated mudela-book-doc.doc pl 8.jcn3 - website: gnuisation of footers @@ -1090,7 +1121,7 @@ pl 4.uu1 - bf: mudela-book -> \default_paper is obsolete. pl 3.ms1 - - thumb-upgrade + - thumb-upgrade pl4.jcn1 - bf: dotted slur @@ -1114,10 +1145,10 @@ pl 3.tca1 - mudela-book example file in Documentation/tex/mudela-book-doc.doc pl 3.jcn5 - - bf: dashed-slur - - bf: LilyIdString - - more star fixes - - repeatbar fixes + - bf: dashed-slur + - bf: LilyIdString + - more star fixes + - repeatbar fixes pl 3.jcn3 - mup-to-ly.py: version 0.0 @@ -1161,12 +1192,12 @@ pl 1.jcn4 pl 2 pl 1.mb1 - - Support for cautionary accidentals. , i.e. accidentals - within parantheses. Syntax: 'cis?'. Try input/test/accid.fly - Note that the font has changed. - - bf: No unnecessary warnings about time signatures - - Added optional second argument of \key. Set to \major or \minor - to get a major or minor key. Default: major. + - Support for cautionary accidentals. , i.e. accidentals + within parantheses. Syntax: 'cis?'. Try input/test/accid.fly + Note that the font has changed. + - bf: No unnecessary warnings about time signatures + - Added optional second argument of \key. Set to \major or \minor + to get a major or minor key. Default: major. - bf: Compilation error in midi-walker.cc pl 1.jcn2 diff --git a/TODO b/TODO index 534c44f18e..d23637eef9 100644 --- a/TODO +++ b/TODO @@ -13,9 +13,17 @@ Grep for TODO and ugh/ugr/urg. . * PostScript . * header for PS enteredby = "bla " . * ps/lily.ps see comments. +. * down tuplet spanner. +. * didot / big point. . * devise standard for functioning of Vertical_align_element. . * midi key. - +. * Repeats +. * input/bugs/rep.ly (moved from test) +. * 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 @@ -53,11 +61,7 @@ There are distinct ways of specifying the first two (although at present, they're not properly distinguished) but no distinct way to specify the third. Should there be? . * rest collision minimum dist. -. * 1. is there a "no key signature mode" for lily yet so that i can just -enter the notes without worrying about it instead of having to -remember to put a "!" after each accidental? - -a note with a circle after it, meaning: +. * a note with a circle after it, meaning: note + circle = note + 1/4 of its length @@ -65,22 +69,12 @@ a note with a circle after it, meaning: page three, the c-sharp on the second line should be a quarter with a circle, not a quarter tied to a sixteenth. is this at all possible with lily? -tuplets that are written as "number : note", for example +. * tuplets that are written as "number : note", for example "3 : [image of a half note here]". possible? -"p+" and "p-" for dynamic markings. possible? . * repeat engraver, gallina.ly . * Matanya's tips: . * spacing for prefatory matter -. * The line length is 7.5 inch (19.05 -cm) and the height of normal size is equivalent to the traditional raster 1 -> size. (The Schott company sells Letraset sheets of musical symbols which are -> measured in raster sizes). It is agreed among most engravers I know that the -> standard size for adult readers in solo music should 70% of raster 1. Jeff's -> example was 75%, so I had to modify my file to match. - -So that makes for a staff space of 4 2/3 point. I'll add the -dimensions to the TODO file. . * accidentals closer to note head . * to space the staffs/staffgroups contained in the score. @@ -107,10 +101,10 @@ In the orchestscore.ly file, I tried: . * Slur . * Rhythmic_grouping . * Duration -. * Spring generation . * Collision . * Rest_collision . * clef grav prop's +. * parser .* TODO before 1.2 . * Morally pure LilyPond. @@ -142,6 +136,7 @@ In the orchestscore.ly file, I tried: . * make wide_spanner_engraver (line_group_spanne,r staff_symbol) . * remove Interval dim_ from Dimension_cache and rename the struct. . * do scaled fonts generally +. * Spacing. . * The Lilypond accidental symbols are available through the TeX macros, \textflat, \textsharp and \textnatural defined in the init file lilyponddefs.tex. All the symbols are defined in the files fetaXX.tex @@ -206,6 +201,7 @@ compilation. . * ly2dvi . * bottomnote for ly2dvi . * deps for ly2dvi + .* STUFF . * compulsory hshift . * Give # lines in linebreaking. @@ -214,11 +210,7 @@ compilation. . * \selectmusic to cut pieces from music. . * TODO: merge atom & molecule; make tree from molecule. . * Align_element::padding ? -. * uniformise property names... -. * ydirection <-> yDirection -. * rather allow '_' in identifiers first (i.e. junk ^ and _), -and do y_direction? -. * typo checks on property names? +. * typo checks on property names? . * use streambufs and iostream to provide IO handling for TeX stream, mudela stream, data-file. . * seriously buffer TeX output (do profile of writing .5 mb TeX file.) @@ -359,11 +351,6 @@ touching it. . * detect of 16/8 bit files . * examples to go with it. -. * Spring_spacer: -. * write a faster Spring_spacer (without matrices if possible) -. * relate energybound to linelen unitspace fontsize etc. -. * used fixed point fp? - . * \header . * output header info to MIDI too. diff --git a/aclocal.m4 b/aclocal.m4 index e1ea2a59d8..d579266f49 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,3 +1,5 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -196,20 +198,22 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ fi stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` + AC_MSG_CHECKING(Package) if test "x$PACKAGE" = "xSTEPMAKE"; then - echo Stepmake package! + AC_MSG_RESULT(Stepmake package!) (cd stepmake; rm -f stepmake; ln -s ../stepmake .) (cd stepmake; rm -f bin; ln -s ../bin .) AC_CONFIG_AUX_DIR(bin) stepmake=stepmake else - echo Package: $PACKAGE + AC_MSG_RESULT($PACKAGE) + AC_MSG_CHECKING(for stepmake) # Check for installed stepmake if test -d $stepmake; then - echo Using installed stepmake: $stepmake + AC_MSG_RESULT($stepmake) else stepmake='$(depth)'/stepmake - echo Using local stepmake: $datadir/stepmake not found + AC_MSG_RESULT(./stepmake ($datadir/stepmake not found)) fi AC_CONFIG_AUX_DIR(\ $HOME/usr/local/share/stepmake/bin\ @@ -275,14 +279,15 @@ dnl fi AC_CHECK_PROGS(TAR, tar, error) if test "x`uname`" = "xHP-UX"; then + AC_PATH_PROG(BASH, bash, /bin/sh) AC_STEPMAKE_WARN(avoiding buggy /bin/sh) - AC_CHECK_PROGS(SHELL, bash, /bin/ksh) + AC_PATH_PROG(SHELL, bash, /bin/ksh) else + AC_PATH_PROG(BASH, bash, /bin/sh) SHELL=/bin/sh AC_SUBST(SHELL) fi - AC_CHECK_PROGS(BASH, bash, /bin/sh) AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python) AC_SUBST(PYTHON) @@ -474,7 +479,8 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ fi ]) -AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ +#why has this been dropped? +AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tex-prefix, [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)], [TEXPREFIX=$enableval], @@ -508,6 +514,29 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_SUBST(MFDIR) ]) +AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ + AC_ARG_ENABLE(tex-tfmdir, + [ enable-tex-tfmdir=DIR set the tex-directory where cmr10.tfm lives (default: use kpsewhich)], + [TFMDIR=$enableval], + [TFMDIR=auto] ) + + AC_CHECK_PROGS(KPSEWHICH, kpsewhich, no) + AC_MSG_CHECKING(for TeX TFM directory) + if test "x$TFMDIR" = xauto ; then + if test "x$TEX_TFMDIR" = "x" ; then + if test "x$KPSEWHICH" != "xno" ; then + CMR10=`kpsewhich tfm cmr10.tfm` + TEX_TFMDIR=`dirname $CMR10` + else + AC_STEPMAKE_WARN(Please set TEX_TFMDIR (to where cmr10.tfm lives): + TEX_TFMDIR=/usr/local/TeX/lib/tex/fonts ./configure) + fi + fi + fi + AC_MSG_RESULT($TEX_TFMDIR) + AC_SUBST(TEX_TFMDIR) +]) + AC_DEFUN(AC_STEPMAKE_TEXMF, [ # urg, never know what names these teTeX guys will think up @@ -520,6 +549,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 @@ -535,8 +565,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 e4f53705ca..be2cb00274 100644 --- 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 43abc3439b..10a18a76b2 100644 --- a/configure.in +++ b/configure.in @@ -35,7 +35,7 @@ AC_STEPMAKE_LOCALE AC_STEPMAKE_GETTEXT AC_STEPMAKE_MSGFMT AC_STEPMAKE_TEXMF -# AC_STEPMAKE_TEXMF_DIRS +AC_STEPMAKE_TEXMF_DIRS AC_STEPMAKE_YODL AC_STEPMAKE_GUILE @@ -54,13 +54,21 @@ AC_CHECK_PROGS(MAKEINFO, makeinfo, error) AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl, You should install Yodl 1.30.2 or newer) +AC_MSG_CHECKING(links for running from sourcetree) +LILYPONDPREFIX=$absolute_builddir +LOCALES="it nl" +for i in $LOCALES; do + dir=$LILYPONDPREFIX/share/locale/$i/LC_MESSAGES + if test ! -x $dir ; then + mkdir -p $dir + fi + rm -f $dir/lilypond.mo + ln -sf $LILYPONDPREFIX/po/out/$i.mo $dir/lilypond.mo +done +rm -f afm; ln -sf $LILYPONDPREFIX/mf/out afm +rm -f tfm; ln -sf $LILYPONDPREFIX/mf/out tfm +rm -f cmtfm; ln -sf $TEX_TFMDIR cmtfm +AC_MSG_RESULT(ok) -AC_MSG_CHECKING(Checking TFM directory) -CMR10=`kpsewhich tfm cmr10.tfm` -TEX_TFMDIR=`dirname $CMR10` -AC_MSG_RESULT($TEX_TFMDIR) - -AC_SUBST(TEX_TFMDIR) AC_STEPMAKE_END - diff --git a/input/bugs/rep.ly b/input/bugs/rep.ly new file mode 100644 index 0000000000..94a06157c0 --- /dev/null +++ b/input/bugs/rep.ly @@ -0,0 +1,14 @@ +\score{ + < + \context Staff \notes\relative c'{ + c4 d e f + \repeat semi 3 { g a b c } +% \alternative { { c b a g } { f e d c } } c c c c + \alternative { { c b a g } { f e d c } { c d e f } } + g g g g + \repeat semi 2 { c c c c } + \repeat semi 2 { c c c c } + g g g g + } + > +} diff --git a/input/bugs/unfold-many.ly b/input/bugs/unfold-many.ly new file mode 100644 index 0000000000..0b1bedbc2b --- /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 index 0000000000..76ccc3d8cb --- /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 e68029ae2a..b9c09685d8 100644 --- 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 96a82264ea..2c1d01c951 100644 --- 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 8de755f670..b6c7e01bfc 100644 --- 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 (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 *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 *i = alt->music_p_list_p_->head_; i ; i = i->next_) { diff --git a/mf/feta-accordion.mf b/mf/feta-accordion.mf index 5c016724e9..8367a5ae4b 100644 --- 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/NEWS b/stepmake/NEWS index d25b32274e..3f3f98ee14 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,12 @@ +pl 77 + - mfmode + +pl 76 + - bfs: shells, scripts + +pl 75 + - bfs: release + pl 74 - avoid buggy /bin/sh on hp-ux - bf: make/stepmake.make diff --git a/stepmake/VERSION b/stepmake/VERSION index a9f9a07036..0583295050 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=74 +PATCH_LEVEL=77 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index e1ea2a59d8..c92667b586 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -196,20 +196,22 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ fi stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` + AC_MSG_CHECKING(Package) if test "x$PACKAGE" = "xSTEPMAKE"; then - echo Stepmake package! + AC_MSG_RESULT(Stepmake package!) (cd stepmake; rm -f stepmake; ln -s ../stepmake .) (cd stepmake; rm -f bin; ln -s ../bin .) AC_CONFIG_AUX_DIR(bin) stepmake=stepmake else - echo Package: $PACKAGE + AC_MSG_RESULT($PACKAGE) + AC_MSG_CHECKING(for stepmake) # Check for installed stepmake if test -d $stepmake; then - echo Using installed stepmake: $stepmake + AC_MSG_RESULT($stepmake) else stepmake='$(depth)'/stepmake - echo Using local stepmake: $datadir/stepmake not found + AC_MSG_RESULT(./stepmake ($datadir/stepmake not found)) fi AC_CONFIG_AUX_DIR(\ $HOME/usr/local/share/stepmake/bin\ @@ -275,14 +277,15 @@ dnl fi AC_CHECK_PROGS(TAR, tar, error) if test "x`uname`" = "xHP-UX"; then + AC_PATH_PROG(BASH, bash, /bin/sh) AC_STEPMAKE_WARN(avoiding buggy /bin/sh) - AC_CHECK_PROGS(SHELL, bash, /bin/ksh) + AC_PATH_PROG(SHELL, bash, /bin/ksh) else + AC_PATH_PROG(BASH, bash, /bin/sh) SHELL=/bin/sh AC_SUBST(SHELL) fi - AC_CHECK_PROGS(BASH, bash, /bin/sh) AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python) AC_SUBST(PYTHON) @@ -474,7 +477,8 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ fi ]) -AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ +#why has this been dropped? +AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tex-prefix, [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)], [TEXPREFIX=$enableval], @@ -508,6 +512,29 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_SUBST(MFDIR) ]) +AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ + AC_ARG_ENABLE(tex-tfmdir, + [ enable-tex-tfmdir=DIR set the tex-directory where cmr10.tfm lives (default: use kpsewhich)], + [TFMDIR=$enableval], + [TFMDIR=auto] ) + + AC_CHECK_PROGS(KPSEWHICH, kpsewhich, no) + AC_MSG_CHECKING(for TeX TFM directory) + if test "x$TFMDIR" = xauto ; then + if test "x$TEX_TFMDIR" = "x" ; then + if test "x$KPSEWHICH" != "xno" ; then + CMR10=`kpsewhich tfm cmr10.tfm` + TEX_TFMDIR=`dirname $CMR10` + else + AC_STEPMAKE_WARN(Please set TEX_TFMDIR (to where cmr10.tfm lives): + TEX_TFMDIR=/usr/local/TeX/lib/tex/fonts ./configure) + fi + fi + fi + AC_MSG_RESULT($TEX_TFMDIR) + AC_SUBST(TEX_TFMDIR) +]) + AC_DEFUN(AC_STEPMAKE_TEXMF, [ # urg, never know what names these teTeX guys will think up @@ -520,6 +547,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 @@ -535,8 +563,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 76ca3aa389..bf7d6a0a9d 100644 --- 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 diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make index 813ffde61b..c431f2cd29 100644 --- a/stepmake/stepmake/script-rules.make +++ b/stepmake/stepmake/script-rules.make @@ -3,7 +3,18 @@ $(outdir)/%: %.pl cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -#FIXME. Check for bash? +$(outdir)/%: %.bash + cat $< | sed $(sed-atvariables) > $@ + chmod 755 $@ + +$(outdir)/%: %.scm + cat $< | sed $(sed-atvariables) > $@ + chmod 755 $@ + +$(outdir)/%: %.expect + cat $< | sed $(sed-atvariables) > $@ + chmod 755 $@ + $(outdir)/%: %.sh cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ diff --git a/stepmake/stepmake/script-targets.make b/stepmake/stepmake/script-targets.make index 1ba75cdf04..0159636812 100644 --- a/stepmake/stepmake/script-targets.make +++ b/stepmake/stepmake/script-targets.make @@ -1,2 +1,2 @@ -all: $(PERL_SCRIPTS) $(PYTHON_SCRIPTS) $(SH_SCRIPTS) +all: $(BASH_SCRIPTS) $(EXPECT_SCRIPTS) $(PERL_SCRIPTS) $(PYTHON_SCRIPTS) $(SCM_SCRIPTS) $(SH_SCRIPTS) diff --git a/stepmake/stepmake/script-vars.make b/stepmake/stepmake/script-vars.make index ef705ba066..4f0c29d8d4 100644 --- a/stepmake/stepmake/script-vars.make +++ b/stepmake/stepmake/script-vars.make @@ -2,9 +2,15 @@ PERL_SCRIPTS_IN := $(wildcard *.pl) PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.pl=)) +BASH_SCRIPTS_IN := $(wildcard *.bash) +BASH_SCRIPTS = $(addprefix $(outdir)/, $(BASH_SCRIPTS_IN:.bash=)) +EXPECT_SCRIPTS_IN := $(wildcard *.expect) +EXPECT_SCRIPTS = $(addprefix $(outdir)/, $(EXPECT_SCRIPTS_IN:.expect=)) +SCM_SCRIPTS_IN := $(wildcard *.scm) +SCM_SCRIPTS = $(addprefix $(outdir)/, $(SCM_SCRIPTS_IN:.scm=)) SH_SCRIPTS_IN := $(wildcard *.sh) SH_SCRIPTS = $(addprefix $(outdir)/, $(SH_SCRIPTS_IN:.sh=)) PYTHON_SCRIPTS_IN := $(wildcard *.py) PYTHON_SCRIPTS = $(addprefix $(outdir)/, $(PYTHON_SCRIPTS_IN:.py=)) -ALL_SCRIPTS_IN = $(SH_SCRIPTS_IN) $(PERL_SCRIPTS_IN) $(PYTHON_SCRIPTS_IN) +ALL_SCRIPTS_IN = $(BASH_SCRIPTS_IN) $(EXPECT_SCRIPTS_IN) $(PERL_SCRIPTS_IN) $(PYTHON_SCRIPTS_IN) $(SCM_SCRIPTS_IN) $(SH_SCRIPTS_IN) EXTRA_DIST_FILES += $(ALL_SCRIPTS_IN) -- 2.39.5