From: Jan Nieuwenhuizen Date: Thu, 28 Jun 2001 15:35:19 +0000 (+0200) Subject: patch::: 1.4.4.jcn3 X-Git-Tag: release/1.4.5~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c08e1d1a88aefcab88e987215ca110a7a1a8a377;p=lilypond.git patch::: 1.4.4.jcn3 1.4.4.jcn3 --- diff --git a/CHANGES b/CHANGES index ed0d052378..a24a79ed30 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,13 @@ -1.4.4.jcn2 +1.4.4.jcn3 ========== +TODO: look at other filledbox'es (stafflines and barlines don't match up). + +* Testing code off by default. On: -e "(define ps-testing 1)" -fps + +* Output via TeX/dvips still gives problems. Use direct postscript +output for real testing. + * Beam and stem fixes: - Stems drawn in PostScript (should do all filledbox'es in PS?). - Fixes for draw_box and draw_beam PostScript routines. diff --git a/Documentation/misc/CHANGES-1.3 b/Documentation/misc/CHANGES-1.3 index 864e359b6d..476a69dc15 100644 --- a/Documentation/misc/CHANGES-1.3 +++ b/Documentation/misc/CHANGES-1.3 @@ -41,7 +41,7 @@ dvips are stored in outdir. * PO updates. * petite-ouverture-a-danser.ly bugfix, twinkle.ly bugfix -V + 1.3.153 ======= @@ -363,7 +363,7 @@ staff. * Add a check for regular identifiers to parser. -1.3.145 +1.3.146 ======= * Make and ly2dvi fixes. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 8a0b07f13c..6bdfb552b6 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -500,8 +500,9 @@ Bugs that are not fault of LilyPond are documented here. Flex (2.5.4a-11) in unstable does not produce g++-3.0 compliant C++ code. To compile LilyPond with gcc-3.0 you may do: + @example - CC=gcc-3.0 CXX=g++-3.0 ./configure + CC=gcc-3.0 CXX=g++-3.0 ./configure --enable-config=gcc-3.0 make conf=gcc-3.0 -C lily out-gcc-3.0/lexer.cc patch -p1 < lexer-gcc-3.0.patch make conf=gcc-3.0 -C lily diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi index 5110fb12e2..dc2b06439d 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -19,11 +19,19 @@ webpage}. You may need the patch @file{guile-1.4-gnu-windows.patch} included in LilyPond's source distribution. @end table +@subsection Cross compiling + These binaries are cross compiled for Windows on a GNU/Linux box. You may want to check out the @uref{http://www.lilypond.org/gnu-windows/cross.tar.gz,cross compilation scripts}. +@subsection Compiling on Windows + +Compiling on Windows should be possible, but how should we now? If you +have any experiences you want to share, please do so at +@uref{http://lilypond.org/wiki?CompilingOnWindows,Compiling on Windows}. +Or write to one of the mailing lists. @section Windows installation specifics diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi index 9f2fa8bf9b..a06bc0e476 100644 --- a/Documentation/windows/installing.texi +++ b/Documentation/windows/installing.texi @@ -90,7 +90,8 @@ and try again. @subsection Trouble For problems and solutions see -@uref{Troubleshooting Windows,http://lilypond.org/TroubleshootingWindows}. +@uref{http://lilypond.org/wiki?TroubleshootingWindows,Troubleshooting +Windows} @subsection Additional software diff --git a/VERSION b/VERSION index 31dbd0d4c7..9da0ef98d4 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 PATCH_LEVEL=4 -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/input/test/trills.ly b/input/test/trills.ly new file mode 100644 index 0000000000..ab7cc17555 --- /dev/null +++ b/input/test/trills.ly @@ -0,0 +1,42 @@ +\header { + texidoc="Document trills, pralls and turns" + title="Marques des agr\'ements et leur signification" + copyright="(1689)" +} + +\score { + < + \property Score.TimeSignature = \turnOff + \context GrandStaff < + \context Staff=upper \notes\relative c'' { + \time 1/4 + c4-\prallprall + \time 3/8 + c4.^"TODO" + c4.-\downprall + c4.-\upprall + \time 5/8 + c4-\turn c4.-\upprall + } + \context Lyrics=one \lyrics { + "Tremblement"4 + "Tremblement"4. + "Cadence" + "autre" + "Double"4 "cadence"4. + } + \context Lyrics=two \lyrics { + "simple"4 + "appuy\'e"4. + } + \context Staff=lower \notes\relative c'' { + % autobeamer has som problems here + [\repeat unfold 4 { d32 c }] + d8~[\repeat unfold 4 { d32 c }] + d32 c b c \repeat unfold 4 { d32 c } + b32 c d c \repeat unfold 4 { d32 c } + [c32( b a16 b )c] [b32 c d c \repeat unfold 4 { d32 c }] + } + > + > +} \ No newline at end of file diff --git a/lily/beam.cc b/lily/beam.cc index 57f5a508bf..2f314fa422 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -813,13 +813,19 @@ Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev, but let's make sure two half-beams never touch */ - // FIXME: TODO stem width - Real w = here->relative_coordinate (0, X_AXIS) - prev->relative_coordinate (0, X_AXIS); + // FIXME: TODO (check) stem width / sloped beams + Real w = here->relative_coordinate (0, X_AXIS) + - prev->relative_coordinate (0, X_AXIS); + Real stem_w = gh_scm2double (prev->get_grob_property ("thickness")) + // URG + * me->paper_l ()->get_var ("stafflinethickness"); + w = w/2