From 4c0e539b86e460eb36ac55fcccc53683da3b6139 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 5 Jan 1999 14:55:32 +0100 Subject: [PATCH] patch::: 1.1.18.jcn3 pl 18.jcn3 - bf: (beamed) forced stem shorten - bf: broken slurs and ties; minimal slur/tie length setting ignored - bf: separators on cygwin --- NEWS | 5 +++++ TODO | 4 ++++ VERSION | 2 +- aclocal.m4 | 31 ++++++++++++++++++++++++++++--- input/test/beam-urg.ly | 11 +++++++++++ lily/slur.cc | 13 ++++++++++--- lily/stem-info.cc | 6 +++++- lily/tie.cc | 11 +++++++++-- stepmake/NEWS | 3 +++ stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 31 ++++++++++++++++++++++++++++--- stepmake/stepmake/package.make | 2 +- 12 files changed, 106 insertions(+), 15 deletions(-) create mode 100644 input/test/beam-urg.ly diff --git a/NEWS b/NEWS index 819de03114..733fbe3bd9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +pl 18.jcn3 + - bf: (beamed) forced stem shorten + - bf: broken slurs and ties; minimal slur/tie length setting ignored + - bf: separators on cygwin + pl 18.jcn2 - bf: stem-length algorithm - bf: beam direction algorithm diff --git a/TODO b/TODO index cbde6686c0..8ab5d25dde 100644 --- a/TODO +++ b/TODO @@ -41,6 +41,8 @@ BUGS: * latex bla.tex broken (titles / \lilyfooter stuff?) + * check/set minimum slur/tie length + * msgfmt -o check? * \breathmark TeX macro @@ -59,6 +61,8 @@ BUGS: * space after bars? + * 'hinterfleisch' before bar (e.g. wtk1-fugue2)? + * \type Voice \times 2/3 { [c8 c16 c16 c16 c16] } * fix singleStaffBracket diff --git a/VERSION b/VERSION index 313548784a..c7fab2aa3f 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=18 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # 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 ba07a79c23..15d012b7a4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,7 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +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 @@ -298,9 +300,32 @@ dnl fi LN_S=cp # symbolic link does not work for native nt ZIP="zip -r -9" # DOTEXE=.exe - DIRSEP='\\' - PATHSEP=';' - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + # urg + # DIRSEP='\\' + # PATHSEP=';' + # + # cygwin fixes all these things. + # it seems these were used because of dos-style TEXINPUTS and + # MFINPUTS needed for miktex. + # but this breaks parsing of all other cygwin/unix style paths. + # + # if your (mik)tex breaks, make a: + # /usr/local/bin/tex: + # #!/bin/sh + # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $* + # + # and + # + # /usr/local/bin/mf: + # #!/bin/sh + # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $* + # + # this way, you may have buildscripts/out/lilypond-profile + # 'automatically' sourced from /usr/etc/profile.d/ too. + # + DIRSEP='/' + PATHSEP=':' + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else DIRSEP='/' PATHSEP=':' diff --git a/input/test/beam-urg.ly b/input/test/beam-urg.ly new file mode 100644 index 0000000000..681389210d --- /dev/null +++ b/input/test/beam-urg.ly @@ -0,0 +1,11 @@ +\score{ + \notes\relative c''{ + \property Score.beamquantisation = \none + % \property Score.beamquantisation = \normal + % \property Score.beamquantisation = \traditional + [g16 e f g] + } + \paper{ + linewidth = -1.; + } +} diff --git a/lily/slur.cc b/lily/slur.cc index 465102e6af..b88c4b5614 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -191,13 +191,20 @@ Slur::do_post_processing () dy_f_drul_[d] = dy_f_drul_[(Direction)-d]; - // pre and post + /* + urg, this is broken + but who *is* going to assure that dx >= slur_min? + */ +#if 0 + if (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT] < slur_min) { - dx_f_drul_[d] -= d * slur_min - - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]); + // huh? what was this supposed to do? +// dx_f_drul_[d] -= d * slur_min +// - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]); dx_f_drul_[d] = dx_f_drul_[(Direction)-d] + d * slur_min; } +#endif } } while (flip(&d) != LEFT); diff --git a/lily/stem-info.cc b/lily/stem-info.cc index 35e67136f5..ad09936111 100644 --- a/lily/stem-info.cc +++ b/lily/stem-info.cc @@ -91,7 +91,10 @@ Stem_info::Stem_info (Stem const *s) central line is never 'forced' */ if (((int)s->chord_start_f ()) && (s->dir_ != s->get_default_dir ())) - idealy_f_ -= shorten_f; + { + idealy_f_ -= shorten_f; + miny_f_ = miny_f_ ? (- 2 * internote_f - beam_f @@ -116,6 +119,7 @@ Stem_info::Stem_info (Stem const *s) } } + idealy_f_ /= internote_f; miny_f_ /= internote_f; maxy_f_ /= internote_f; diff --git a/lily/tie.cc b/lily/tie.cc index 1483196b2e..cc68a065e3 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -121,12 +121,19 @@ Tie::do_post_processing() // tie attached to outer notehead if (!head_l_drul_[d]) { + + /* + urg, this is broken + but who *is* going to assure that dx >= tie_min? + */ +#if 0 if (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT] < tie_min) { - dx_f_drul_[d] -= d * tie_min - - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]); +// dx_f_drul_[d] -= d * tie_min +// - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]); dx_f_drul_[d] = dx_f_drul_[(Direction)-d] + d * tie_min; } +#endif dy_f_drul_[d] = dy_f_drul_[(Direction) -d]; } diff --git a/stepmake/NEWS b/stepmake/NEWS index 514a33a8ac..97e21a5ad4 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,6 @@ +pl 65 + - unix style pathsep/dirsep for cygwin + pl 64 - gcc-2.8/egcs diff --git a/stepmake/VERSION b/stepmake/VERSION index 8195e1a7de..a2ba451210 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=64 +PATCH_LEVEL=65 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 db2f2d5173..3df8f7b6c8 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/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 @@ -296,9 +298,32 @@ dnl fi LN_S=cp # symbolic link does not work for native nt ZIP="zip -r -9" # DOTEXE=.exe - DIRSEP='\\' - PATHSEP=';' - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + # urg + # DIRSEP='\\' + # PATHSEP=';' + # + # cygwin fixes all these things. + # it seems these were used because of dos-style TEXINPUTS and + # MFINPUTS needed for miktex. + # but this breaks parsing of all other cygwin/unix style paths. + # + # if your (mik)tex breaks, make a: + # /usr/local/bin/tex: + # #!/bin/sh + # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $* + # + # and + # + # /usr/local/bin/mf: + # #!/bin/sh + # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $* + # + # this way, you may have buildscripts/out/lilypond-profile + # 'automatically' sourced from /usr/etc/profile.d/ too. + # + DIRSEP='/' + PATHSEP=':' + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else DIRSEP='/' PATHSEP=':' diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make index 79f7da48c0..0b0fb1d8b8 100644 --- a/stepmake/stepmake/package.make +++ b/stepmake/stepmake/package.make @@ -17,7 +17,7 @@ deb: dpkg-buildpackage -b; \ )' -makeflags=$(patsubst %==, %, $(patsubst ----%,,$(MAKEFLAGS:%=--%))) +makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%)))) diff: $(PYTHON) $(step-bindir)/package-diff.py --package=$(topdir) $(makeflags) -- 2.39.2