diff -urN ../lilypond-1.4.9/Documentation/topdocs/index.tely ./Documentation/topdocs/index.tely
--- ../lilypond-1.4.9/Documentation/topdocs/index.tely Thu Aug 23 14:59:51 2001
+++ ./Documentation/topdocs/index.tely Thu Nov 22 01:12:22 2001
@@ -42,14 +42,6 @@
almost no restrictions.
-is actively developed. Experimental, development releases have
-an odd version number (e.g. 1.5.7), while stable releases have
-(e.g. 1.4.7) should be unchanging and bug-free. Unless you have special
-needs, you should use the stable version. You can access the websites of
-the stable version @uref{http://lilypond.org/stable, here}. The website
-of the development series are @uref{http://lilypond.org/development,
-here}
-
LilyPond has a development version and a stable version. This webpage
is for the @b{stable} release. This means that it won't change much,
diff -urN ../lilypond-1.4.9/Documentation/user/refman.itely ./Documentation/user/refman.itely
--- ../lilypond-1.4.9/Documentation/user/refman.itely Sun Nov 18 01:08:52 2001
+++ ./Documentation/user/refman.itely Sat Dec 29 23:51:44 2001
@@ -7,7 +7,10 @@
@c before saving changes
-@
+
+@c NOTE: if you're submitting a patch, please make sure that the doco
+@c also compiles without errors.
+@c thanks --hwn
@macro refbugs
@strong{BUGS}
@@ -769,6 +772,7 @@
+
@c . {Bar lines}
@node Bar lines
@subsection Bar lines
@@ -1178,7 +1182,9 @@
@refbugs
- Currently, only tick marks are supported, not comma style breath marks.
+ The current layout of the default comma style breath marks
+ could be improved and more optional symbols should be added to the
+ font.
@c . {Tempo}
@@ -2458,16 +2464,30 @@
The grob is @internalsref{RehearsalMark} in @internalsref{Score} context. See
@code{input/test/boxed-molecule.ly} if you need boxes around the marks.
+
+
@node Bar numbers
@subsection Bar numbers
-Bar numbers (grob: @internalsref{BarNumber}) are printed at the start of the
-line. See @code{input/test/boxed-molecule.ly} for boxed bar numbers.
+
+@cindex bar numbers
+@cindex measure numbers
+@cindex currentBarNumber
+
+Bar numbers are @internalsref{BarNumber} grobs. They are printed at the
+start of the line. The number itself is a property that can be set by
+modifying the @code{currentBarNumber} property, i.e.
+@example
+ \property Score.currentBarNumber = #217
+@end example
+
+If you want boxed bar numbers, see the example file
+@code{input/test/boxed-molecule.ly}.
@refbugs
It is not possible to have bar numbers printed at regular intervals
-only.
+
@node Instrument names
@subsection Instrument names
@@ -3466,19 +3486,19 @@
@cindex @code{papersize}
To change the paper size, you must first set the
-@code{papersize} variable at top level. Set it to
+@code{papersize} paper variable variable. Set it to
the strings @code{a4}, @code{letter}, or @code{legal}. After this
specification, you must set the font as described above. If you want
the default font, then use the 20 point font.
@example
- papersize = "a4"
+ \paper @{papersize = "a4" @}
\include "paper16.ly"
@end example
The file @code{paper16.ly} will now include a file named @file{a4.ly}, which
will set the paper variables @code{hsize} and @code{vsize} (used by
-@code{ly2dvi})
+Lilypond and @code{ly2dvi})
@c . {Line break}
@node Line break
@@ -3910,6 +3930,16 @@
\time 3/4 c2 e4 | g2.
@end example
+@cindex skipTypesetting
+
+Failed bar checks are most often caused by entering incorrect
+durations. Incorrect durations often completely garble up the score,
+especially if it is polyphonic, so you should start correcting the score
+by scanning for failed bar checks and incorrect durations. To speed up
+this process, you can use @code{skipTypesetting} (See @ref{Skipping
+corrected music})). Bar
+
+
@c . {Point and click}
@node Point and click
@subsection Point and click
diff -urN ../lilypond-1.4.9/Documentation/windows/GNUmakefile ./Documentation/windows/GNUmakefile
--- ../lilypond-1.4.9/Documentation/windows/GNUmakefile Sun Sep 16 21:22:53 2001
+++ ./Documentation/windows/GNUmakefile Mon Dec 3 18:03:41 2001
@@ -1,7 +1,7 @@
depth=../..
-EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch)
+EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch) setup.hint
STEPMAKE_TEMPLATES=documentation texinfo install install-out
@@ -18,28 +18,9 @@
POST_INSTALLS=$(wildcard post-*.sh)
OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%)
-# lily-*: rename to '-profile' or so
-PROFILES=$(wildcard *lily-*.sh) lilypond-profile.sh
+PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh
OUT_PROFILES=$(PROFILES:%=$(outdir)/%)
-##as2text.scm
-PYTHON_WRAPPERS=\
- abc2ly\
- convert-ly\
- etf2ly\
- lilypond-book\
- ly2dvi\
- mup2ly\
- musedata2ly\
- pmx2ly\
- update-lily\
-#
-
-OUT_PYTHON_WRAPPERS=$(PYTHON_WRAPPERS:%=$(outdir)/%)
-
-TEX_WRAPPERS=dvips latex mktextfm tex yap
-OUT_TEX_WRAPPERS=$(TEX_WRAPPERS:%=$(outdir)/%)
-
# profiles
$(outdir)/%.sh: %.sh
cat $< | sed $(sed-atvariables) > $@
@@ -50,44 +31,9 @@
cp $< $@
chmod 755 $@
-# python wrappers
-$(outdir)/%: python-wrapper.sh
- cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@
- chmod 755 $@
-
-ATVARIABLES += OPTIONS
-
-# tex wrappers
-#$(outdir)/%: %-wrapper.sh
-# cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@
-# chmod 755 $@
-
-$(outdir)/latex: tex-wrapper.sh
- cat $< | sed $(sed-atvariables) -e "s!@name@!latex!g" > $@
- chmod 755 $@
-
-$(outdir)/dvips: tex-wrapper.sh
- cat $< | sed $(sed-atvariables) -e "s!@name@!dvips!g" > $@
- chmod 755 $@
-
-MKTEXFTM_OPTIONS=--dest-dir \"$$(cygpath -w \"\"/usr/lilypond/share/lilypond/tfm\"\")\"
-$(outdir)/mktextfm: tex-wrapper.sh
- cat $< | sed -e 's!@OPTIONS@!$(MKTEXFTM_OPTIONS)!' $(sed-atvariables) -e "s!@name@!maketfm!g" > $@
- chmod 755 $@
-
-$(outdir)/tex: tex-wrapper.sh
- cat $< | sed $(sed-atvariables) -e "s!@name@!tex!g" > $@
- chmod 755 $@
-
-$(outdir)/yap: tex-wrapper.sh
- cat $< | sed $(sed-atvariables) -e "s!@name@!yap!g" > $@
- chmod 755 $@
-
-default: $(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS) $(OUT_POST_INSTALLS) $(OUT_PROFILES)
-
-# urg: change suffixes before overwriting python scripts
+default: $(OUT_POST_INSTALLS) $(OUT_PROFILES)
-INSTALLATION_OUT_SUFFIXES=1 2 3 4
+INSTALLATION_OUT_SUFFIXES=1 2
# URG.
# By popular demand,
@@ -100,14 +46,8 @@
INSTALLATION_OUT_DIR1=$(shell dirname $(shell dirname $(prefix)))/etc/profile.d
INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
-INSTALLATION_OUT_DIR2=$(prefix)/wrappers
-INSTALLATION_OUT_FILES2=$(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS)
-
-INSTALLATION_OUT_DIR3=$(datadir)/tex
-INSTALLATION_OUT_FILES3=$(shell kpsewhich geometry.sty)
-
-INSTALLATION_OUT_DIR4=$(datadir)/tfm
-INSTALLATION_OUT_FILES4=$(shell kpsewhich cmr10.tfm)
+INSTALLATION_OUT_DIR2=$(datadir)/tex
+INSTALLATION_OUT_FILES2=$(shell kpsewhich geometry.sty)
else
diff -urN ../lilypond-1.4.9/Documentation/windows/compiling.texi ./Documentation/windows/compiling.texi
--- ../lilypond-1.4.9/Documentation/windows/compiling.texi Sun Sep 16 21:17:12 2001
+++ ./Documentation/windows/compiling.texi Sun Dec 9 22:36:57 2001
@@ -1,3 +1,11 @@
+\input texinfo @c -*-texinfo-*-
+@setfilename compiling.info
+@settitle Compiling LilyPond on Windows
+
+@html
+
+@end html
+
@section Obtaining LilyPond
You can get the latest version of LilyPond at
@@ -12,7 +20,7 @@
Check out the @uref{http://sources.redhat.com/cygwin,Cygwin webpage}.
You can get the latest version of the GNU + Cygnus tools from cygnus
@uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
-Install everything, including tetex.
+Install everything, including tetex and texmf.
@item GUILE 1.4, or newer.
Check out the @uref{http://www.gnu.org/software/guile.html,GUILE
webpage}. You may need the patch @file{guile-1.4-gnu-windows.patch}
@@ -50,19 +58,26 @@
introduction of the non-feature bzip2. Here's how I did it:
@quotation
@example
- mkdir cygwin-20010709
- cd cygwin-20010709
- tar xjf cygwin-src-20010709.tar.bz2
- cd winsup/cinstall
+ mkdir cygwin-20011208 && cd cygwin-20011208
+ export CVSROOT=:pserver:anoncvs@@anoncvs.cygnus.com:/cvs/src
+ touch $HOME/.cvspass
+ cvs login
+ cvs -z3 co -D20011208 winsup
+ cd src/winsup/cinstall
patch < $HOME/usr/src/lilypond/Documentation/windows/cygwin-installer.patch
+ autoconf
cd ../bz2lib
MINGW32=yes CFLAGS='-mno-cygwin' ./configure
make
cd -
MINGW32=yes CFLAGS='-mno-cygwin' ./configure
- cp $HOME/usr/src/cygwin/cygwin-1.3.2/usr/lib/mingw/crt2.o .
- make w32api_lib=/home/cygwin/cygwin-1.3.2/usr/lib/w32api \
- CXX='g++ -L/home/cygwin/cygwin-1.3.2/usr/lib/mingw'
+ CYGWIN=$HOME/usr/src/cygwin/cygwin-1.3.6
+ cp $CYGWIN/usr/lib/mingw/crt2.o .
+ cp $HOME/usr/src/lilypond/Documentation/windows/LilyPond.ico .
+ make w32api_lib=$CYGWIN/usr/lib/w32api \
+ CXX="g++ -L$CYGWIN/usr/lib/mingw"
+ cp -pv setup.exe $CYGWIN/dist/cygwin-1.3.6/new-setup.exe
+ strip $CYGWIN/dist/cygwin-1.3.6/new-setup.exe
@end example
@end quotation
@item @var{--prefix=/usr/lilypond-x.y.x}
@@ -70,11 +85,6 @@
We think it's silly, but do this is on special request of Windows users.
@item @file{fix-suffixes.sh}
Add @file{.exe} to binary executables, add @file{.py} to Python scripts.
-@item @file{python-wrapper.sh}
-All python scripts get a wrapper script to make direct invocation easier.
-@item @file{latex-wrapper.sh}
-TeX and LaTeX get a wrapper script that changes the TEX path variables
-to DOS style, which is needed by non-Cygwin TeX, that's currently used.
@item @file{/etc/postinstall/}
A number of post installation scripts try to set registry entries and
symlinks that are needed for the additional windows packages.
diff -urN ../lilypond-1.4.9/Documentation/windows/cygwin-installer.patch ./Documentation/windows/cygwin-installer.patch
--- ../lilypond-1.4.9/Documentation/windows/cygwin-installer.patch Mon Apr 16 23:17:44 2001
+++ ./Documentation/windows/cygwin-installer.patch Sun Dec 9 22:36:57 2001
@@ -1,29 +1,74 @@
-diff -urN ../cinstall/Makefile.in ./Makefile.in
---- ../cinstall/Makefile.in Thu Feb 8 05:55:22 2001
-+++ ./Makefile.in Thu Apr 12 11:41:37 2001
-@@ -130,11 +130,15 @@
- @chmod a-x $@
-
- clean:
-- rm -f *.o *.rc $(PROGS)
-- $(MAKE) -C zlib clean
-+ rm -f *.o $(PROGS)
-+ $(MAKE) -C zlib $@
+diff -purN --exclude=*~ ../cinstall.orig/ChangeLog ./ChangeLog
+--- ../cinstall.orig/ChangeLog Wed Dec 5 15:50:02 2001
++++ ./ChangeLog Sat Dec 8 12:52:17 2001
+@@ -1,3 +1,22 @@
++2001-12-02 Jan Nieuwenhuizen
++
++ * configure.in (CXXFLAGS): Bugfix.
++
++ * mklink2.c: Compile fix.
++
++ * Forward port patch to cvs -D20011208.
++
++ * Makefile.in: Fix realclean target.
++
++ * desktop.cc: Remove spurious line breaks from etc_profile.
++ (make_lily_bat): New function.
++ (save_icon): Parametrize.
++ (do_desktop_setup): LilyPond support; disable Cygwin support.
++
++ * res.rc: Adapted for LilyPond.
++
++ * ini.cc (fprintf): Cygwin -> GNU LilyPond
++
+ 2001-12-06 Robert Collins
+
+ * README: Wishlist updates.
+@@ -2458,4 +2477,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa
+ * zlib/Makefile.in: Regenerate from Makefile.am
+
+ %%% $Id: ChangeLog,v 2.159 2001/12/05 14:50:02 rbcollins Exp $
+-$Revision: 2.159 $
++$Revision: 2.159.jcn1 $
+diff -purN --exclude=*~ ../cinstall.orig/Makefile.in ./Makefile.in
+--- ../cinstall.orig/Makefile.in Mon Dec 3 23:22:08 2001
++++ ./Makefile.in Sat Dec 8 12:11:00 2001
+@@ -35,7 +35,7 @@ CC := @CC@
+ CC_FOR_TARGET := $(CC)
+ CXX := @CXX@
+
+-CFLAGS := @CFLAGS@ -Werror -Winline -Wall -Wpointer-arith -Wcast-align\
++CFLAGS := @CFLAGS@ -Winline -Wall -Wpointer-arith -Wcast-align\
+ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wcomments
+ CXXFLAGS := @CXXFLAGS@ $(CFLAGS) -fno-rtti
+@@ -169,7 +169,9 @@ clean:
+ $(MAKE) -C zlib clean
realclean: clean
- rm -f Makefile config.cache
-+ rm -f Makefile *.d
-+ rm -f config.cache config.log config.status
-+ rm -f inilex.c iniparse.c iniparse.h version.c
-+
-+distclean: realclean
++ rm -f Makefile *.d version.c
++ rm -f config.cache config.log config.status
++ $(MAKE) -C zlib realclean
install: all
$(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir)
-diff -urN ../cinstall/desktop.cc ./desktop.cc
---- ../cinstall/desktop.cc Sat Nov 11 05:55:16 2000
-+++ ./desktop.cc Thu Apr 12 11:39:52 2001
-@@ -79,9 +79,7 @@
+diff -purN --exclude=*~ ../cinstall.orig/configure.in ./configure.in
+--- ../cinstall.orig/configure.in Mon Dec 11 01:07:56 2000
++++ ./configure.in Sat Dec 8 12:11:00 2001
+@@ -64,7 +64,7 @@ if test -z "$CXX"; then
+ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+ fi
+
+-CXXFLAGS='$(CFLAGS)'
++CXXFLAGS="$CFLAGS"
+ ])
+
+ AC_CANONICAL_SYSTEM
+diff -purN --exclude=*~ ../cinstall.orig/desktop.cc ./desktop.cc
+--- ../cinstall.orig/desktop.cc Thu Nov 29 10:52:32 2001
++++ ./desktop.cc Sat Dec 8 12:47:59 2001
+@@ -81,9 +81,7 @@ static const char *etc_profile[] = {
"done",
"",
"export MAKE_MODE=unix",
@@ -34,13 +79,13 @@
"",
"cd \"$HOME\"",
"",
-@@ -197,6 +195,30 @@
+@@ -204,6 +202,35 @@ make_cygwin_bat ()
}
static void
+make_lily_bat ()
+{
-+ batname = backslash (concat (root_dir, "/lilypond.bat", 0));
++ batname = backslash (concat (get_root_dir (), "/lilypond.bat", 0));
+
+ /* if the batch file exists, don't overwrite it */
+ if (_access (batname, 0) == 0)
@@ -52,89 +97,114 @@
+
+ fprintf (bat, "@echo off\n\n");
+
-+ fprintf (bat, "%.2s\n", root_dir);
-+ fprintf (bat, "chdir %s\n\n", backslash (concat (root_dir+2, "/bin", 0)));
-+
-+ /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
-+ fprintf (bat, "bash --login -i\n");
++ fprintf (bat, "%.2s\n", get_root_dir ());
++ fprintf (bat, "chdir %s\n\n",
++ backslash (concat (get_root_dir () + 2, "/bin", 0)));
++
++ if (_access (cygpath ("/usr/bin/rxvt"), 0) == 0)
++ fprintf (bat, "rxtv -e /bin/bash --login -i \n");
++ else
++ /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
++ fprintf (bat, "bash --login -i\n");
+
+ fclose (bat);
++
+}
+
+static void
make_etc_profile ()
{
- char *fname = concat (root_dir, "/etc/profile", 0);
-@@ -299,11 +321,11 @@
+ char *fname = cygpath ("/etc/profile", 0);
+@@ -301,11 +328,11 @@ out:
}
static void
-save_icon ()
-+save_icon (char* iconfile, char* iconres)
++save_icon (char const* iconfile, char const* iconres)
{
-- iconname = backslash (concat (root_dir, "/cygwin.ico", 0));
-+ iconname = backslash (concat (root_dir, iconfile, 0));
-
+- iconname = backslash (cygpath ("/cygwin.ico", 0));
+-
- HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
++ iconname = backslash (concat (get_root_dir (), iconfile, 0));
++
+ HRSRC rsrc = FindResource (NULL, iconres, "FILE");
if (rsrc == NULL)
{
fatal ("FindResource failed");
-@@ -323,7 +345,7 @@
+@@ -325,12 +352,13 @@ save_icon ()
static void
- do_desktop_setup()
+ do_desktop_setup ()
{
- save_icon ();
+ save_icon ("/cygwin.ico", "CYGWIN.ICON");
make_cygwin_bat ();
make_etc_profile ();
-@@ -335,6 +357,17 @@
+ make_passwd_group ();
- if (root_desktop) {
- desktop_icon ("Cygwin", batname);
-+ }
-+
++#if 0
+ if (root_menu)
+ {
+ start_menu ("Cygwin Bash Shell", batname);
+@@ -339,6 +367,20 @@ do_desktop_setup ()
+ if (root_desktop)
+ {
+ desktop_icon ("Cygwin", batname);
++ }
++#endif
++
+ save_icon ("/LilyPond.ico", "LILYPOND.ICON");
+ make_lily_bat ();
-+
-+ if (root_menu) {
-+ start_menu ("GNU LilyPond Shell", batname);
-+ }
-+
-+ if (root_desktop) {
-+ desktop_icon ("GNU LilyPond", batname);
- }
++
++ if (root_menu)
++ {
++ start_menu ("GNU LilyPond Shell", batname);
++ }
++
++ if (root_desktop)
++ {
++ desktop_icon ("GNU LilyPond", batname);
+ }
}
-diff -urN ../cinstall/ini.cc ./ini.cc
---- ../cinstall/ini.cc Thu Oct 5 05:55:27 2000
-+++ ./ini.cc Thu Apr 12 11:39:52 2001
-@@ -174,7 +174,7 @@
+diff -purN --exclude=*~ ../cinstall.orig/ini.cc ./ini.cc
+--- ../cinstall.orig/ini.cc Mon Dec 3 23:22:09 2001
++++ ./ini.cc Sat Dec 8 12:49:35 2001
+@@ -252,7 +252,7 @@ fprintf (FILE * f, const char *fmt, ...)
{
*nl = 0;
- /*OutputDebugString (stderrbuf);*/
+ /*OutputDebugString (stderrbuf); */
- MessageBox (0, buf, "Cygwin Setup", 0);
-+ MessageBox (0, buf, "GNU LilyPond Cygwin Setup", 0);
++ MessageBox (0, buf, "GNU LilyPond Setup", 0);
stderrbuf[0] = 0;
}
-
-diff -urN ../cinstall/msg.cc ./msg.cc
---- ../cinstall/msg.cc Sat Aug 26 05:55:14 2000
-+++ ./msg.cc Thu Apr 12 11:39:52 2001
-@@ -44,7 +44,7 @@
+
+diff -purN --exclude=*~ ../cinstall.orig/mklink2.c ./mklink2.c
+--- ../cinstall.orig/mklink2.c Tue Nov 13 02:49:32 2001
++++ ./mklink2.c Sat Dec 8 12:11:00 2001
+@@ -1,5 +1,5 @@
+-#include
+ #include "win32.h"
++#include
+ #include "shlobj.h"
+ #include "mklink2.h"
+
+diff -purN --exclude=*~ ../cinstall.orig/msg.cc ./msg.cc
+--- ../cinstall.orig/msg.cc Tue Nov 13 02:49:32 2001
++++ ./msg.cc Sat Dec 8 12:49:59 2001
+@@ -47,7 +47,7 @@ mbox (const char *name, int type, int id
vsprintf (buf, fmt, args);
log (0, "mbox %s: %s", name, buf);
- return MessageBox (0, buf, "Cygwin Setup", type | MB_TOPMOST);
-+ return MessageBox (0, buf, "GNU LilyPond Cygwin Setup", type | MB_TOPMOST);
++ return MessageBox (0, buf, "GNU LilyPond Setup", type | MB_TOPMOST);
}
void
-diff -urN ../cinstall/res.rc ./res.rc
---- ../cinstall/res.rc Wed Mar 7 18:13:31 2001
-+++ ./res.rc Fri Apr 13 16:06:40 2001
-@@ -30,10 +30,10 @@
+diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc
+--- ../cinstall.orig/res.rc Mon Dec 3 23:22:09 2001
++++ ./res.rc Sat Dec 8 12:53:34 2001
+@@ -30,10 +30,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
IDD_SOURCE DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -144,11 +214,15 @@
BEGIN
- ICON IDI_CYGWIN,-1,5,5,20,20
+ ICON IDI_LILYPOND,-1,5,5,20,20
- CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
- BS_AUTORADIOBUTTON,55,15,152,10
CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button",
-@@ -49,7 +49,7 @@
- CAPTION "Local package directory"
+ BS_AUTORADIOBUTTON,55,15,75,10
+ CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
+@@ -46,10 +46,10 @@ END
+
+ IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 215, 95
+ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+-CAPTION "Cygwin Setup"
++CAPTION "GNU LilyPond Setup"
FONT 8, "MS Sans Serif"
BEGIN
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
@@ -156,7 +230,7 @@
PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14
LTEXT "Local Package &Directory",IDC_STATIC,55,15,85,11
EDITTEXT IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL
-@@ -60,10 +60,10 @@
+@@ -60,10 +60,10 @@ END
IDD_ROOT DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -169,7 +243,7 @@
PUSHBUTTON "B&rowse...",IDC_ROOT_BROWSE,150,10,34,14
LTEXT "Select install root &directory",IDC_STATIC,55,15,85,11
EDITTEXT IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL
-@@ -84,10 +84,10 @@
+@@ -84,10 +84,10 @@ END
IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -179,10 +253,10 @@
BEGIN
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- LTEXT "Select Download &Site",IDC_STATIC,55,5,135,11
+ LTEXT "Select Download &Sites",IDC_STATIC,55,5,135,11
LISTBOX IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT |
- WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-@@ -98,10 +98,10 @@
+ LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+@@ -98,10 +98,10 @@ END
IDD_OTHER_URL DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -195,9 +269,9 @@
LTEXT "Select &URL to download from",IDC_STATIC,55,15,135,11
EDITTEXT IDC_OTHER_URL,55,25,127,12,ES_AUTOHSCROLL
DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
-@@ -111,10 +111,10 @@
+@@ -111,10 +111,10 @@ END
- IDD_NET DIALOG DISCARDABLE 0, 0, 215, 95
+ IDD_NET DIALOGEX 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
@@ -205,10 +279,10 @@
BEGIN
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button",
- BS_AUTORADIOBUTTON,55,10,69,10
CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button",
-@@ -135,10 +135,10 @@
+ BS_AUTORADIOBUTTON,55,10,73,10
+ CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button",
+@@ -135,10 +135,10 @@ END
IDD_DLSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
@@ -221,7 +295,7 @@
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
LTEXT "Downloading...",IDC_STATIC,55,5,135,8
LTEXT "(URL)",IDC_DLS_URL,55,15,150,8
-@@ -157,10 +157,10 @@
+@@ -157,10 +157,10 @@ END
IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
@@ -234,7 +308,7 @@
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
LTEXT "Installing...",IDC_INS_ACTION,55,5,135,8
LTEXT "(PKG)",IDC_INS_PKG,55,15,150,8
-@@ -178,10 +178,10 @@
+@@ -178,10 +178,10 @@ END
IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -247,7 +321,7 @@
LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
WS_EX_RIGHT
EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -195,10 +195,10 @@
+@@ -195,10 +195,10 @@ END
IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -260,7 +334,7 @@
LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
WS_EX_RIGHT
EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -212,26 +212,25 @@
+@@ -212,17 +212,14 @@ END
IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -270,32 +344,34 @@
BEGIN
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
- LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114,
-+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
-+ LTEXT "GNU LilyPond GNU LilyPond Setup Program",IDC_STATIC,55,10,114,
- 8
+- 8
- LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10
-- LTEXT "Copyright (C) 2000 Red Hat Inc",IDC_STATIC,55,35,135,8
-- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,150,
-- 10
-+ LTEXT "Version (1.4pre)",IDC_VERSION,55,25,120,10
+- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,55,35,120,
+- 8
+- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,112,
+- 8
++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
++ LTEXT "GNU LilyPond Setup Program",IDC_STATIC,55,10,114,8
++ LTEXT "Version 1.4.9",IDC_VERSION,55,25,120,10
+ LTEXT "Copyright (C) 2000-2001 Red Hat Inc",IDC_STATIC,55,35,135,8
+ LTEXT " (C) 2001 Jan Nieuwenhuizen ",IDC_STATIC,55,45,135,8
DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
END
-
- IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 292, 206
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+@@ -230,10 +227,10 @@ END
+ IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 429, 266
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
FONT 8, "MS Sans Serif"
BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- LTEXT "Select packages to install",IDC_STATIC,55,5,85,8
+- ICON IDI_CYGWIN,IDC_STATIC,0,2,21,20
++ ICON IDI_LILYPOND,IDC_STATIC,0,2,21,20
+ LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,125,5,
+ 99,8
CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
- WS_VISIBLE,55,15,230,155
-@@ -249,10 +248,10 @@
+@@ -256,10 +253,10 @@ END
IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -308,7 +384,20 @@
CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button",
BS_AUTOCHECKBOX,55,25,100,8
CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button",
-@@ -298,6 +297,7 @@
+@@ -271,10 +268,10 @@ END
+
+ IDD_FTP_AUTH DIALOGEX 0, 0, 215, 95
+ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+-CAPTION "Cygwin Setup"
++CAPTION "GNU LilyPond Setup"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
+ LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
+ WS_EX_RIGHT
+ EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+@@ -322,6 +319,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
@@ -316,7 +405,7 @@
IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
/////////////////////////////////////////////////////////////////////////////
-@@ -305,6 +305,7 @@
+@@ -329,6 +327,7 @@ IDI_CYGWIN ICON DISCARDA
// FILE
//
@@ -324,20 +413,31 @@
CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
/////////////////////////////////////////////////////////////////////////////
-@@ -354,7 +355,8 @@
+@@ -383,7 +382,9 @@ STRINGTABLE DISCARDABLE
BEGIN
IDS_ROOT_SLASH "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root. Proceed anyway?"
IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?"
- IDS_MIRROR_LST "http://sources.redhat.com/cygwin/mirrors.lst"
+ // IDS_MIRROR_LST "http://appel.lilypond.org/lilypond/gnu-windows/mirrors.lst"
-+ IDS_MIRROR_LST "http://www.lilypond.org/gnu-windows/mirrors.lst"
++ // IDS_MIRROR_LST "http://www.lilypond.org/gnu-windows/mirrors.lst"
++ IDS_MIRROR_LST "http://www.lilypond.org/gnu-windows/testing/mirrors.lst"
IDS_DIALOG_FAILED "Unable to create Dialog Box"
IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
IDS_DOWNLOAD_SHORT "Download error: %s too short (%d, wanted %d)"
-diff -urN ../cinstall/resource.h ./resource.h
---- ../cinstall/resource.h Thu Mar 1 05:55:20 2001
-+++ ./resource.h Thu Apr 12 11:39:52 2001
-@@ -47,11 +47,12 @@
+@@ -392,7 +393,8 @@ BEGIN
+ IDS_OLD_SETUPINI "This setup.ini is older than the one you used last time you installed cygwin. Proceed anyway?"
+ IDS_ERR_RENAME "Can't rename %s to %s: %s"
+ IDS_NOTHING_INSTALLED "Nothing needed to be installed"
+- IDS_INSTALL_COMPLETE "Installation Complete"
++ // IDS_INSTALL_COMPLETE "Installation Complete. See http://www.lilypond.org/gnu-windows/"
++ IDS_INSTALL_COMPLETE "Installation Complete. See http://www.lilypond.org/gnu-windows/testing for support."
+ END
+
+ STRINGTABLE DISCARDABLE
+diff -purN --exclude=*~ ../cinstall.orig/resource.h ./resource.h
+--- ../cinstall.orig/resource.h Sat Jun 30 03:37:55 2001
++++ ./resource.h Sat Dec 8 12:11:00 2001
+@@ -47,12 +47,13 @@
#define IDB_SPIN 118
#define IDB_RTARROW 119
#define IDI_SPIN 120
@@ -347,21 +447,8 @@
#define IDB_CHECK_YES 123
#define IDB_CHECK_NO 124
#define IDB_CHECK_NA 125
-+#define IDI_CYGWIN 126
+ #define IDD_FTP_AUTH 126
++#define IDI_CYGWIN 127
#define IDC_SOURCE_DOWNLOAD 1000
#define IDC_SOURCE_NETINST 1001
#define IDC_SOURCE_CWD 1002
-diff -urN ../cinstall/zlib/Makefile.in ./zlib/Makefile.in
---- ../cinstall/zlib/Makefile.in Tue Aug 8 05:55:18 2000
-+++ ./zlib/Makefile.in Thu Apr 12 11:42:10 2001
-@@ -299,6 +299,10 @@
-
- clean: clean-am
-
-+realclean: clean
-+ rm -f Makefile *.d
-+ rm -f config.cache config.log config.status
-+
- distclean-am: distclean-noinstLIBRARIES distclean-compile \
- distclean-tags distclean-generic clean-am
-
diff -urN ../lilypond-1.4.9/Documentation/windows/fix-suffixes.sh ./Documentation/windows/fix-suffixes.sh
--- ../lilypond-1.4.9/Documentation/windows/fix-suffixes.sh Thu Apr 19 12:56:39 2001
+++ ./Documentation/windows/fix-suffixes.sh Mon Dec 3 18:03:41 2001
@@ -27,6 +27,6 @@
for i in `/bin/ls -d1 $*`; do
fix_extension $i .exe '.*Windows.*\(executable\).*'
- fix_extension $i .py '.*\(python\).*'
+# fix_extension $i .py '.*\(python\).*'
done
diff -urN ../lilypond-1.4.9/Documentation/windows/gs-profile.sh ./Documentation/windows/gs-profile.sh
--- ../lilypond-1.4.9/Documentation/windows/gs-profile.sh Thu Jan 1 01:00:00 1970
+++ ./Documentation/windows/gs-profile.sh Mon Dec 3 18:03:41 2001
@@ -0,0 +1,18 @@
+#!@SHELL@
+# /etc/profile.d/gs-profile.sh -- Check for GhostScript
+
+gs550="/usr/windows/gstools/gs5.50"
+gs650="/usr/windows/gs/gs6.50/bin"
+
+# Maybe read registry, but that may be hairy?
+#
+# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\
+# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1"
+
+if [ -e "$gs550/gswin32.exe" ]; then
+ PATH="$gs550:$PATH"
+fi
+
+if [ -e "$gs650/gswin32.exe" ]; then
+ PATH="$gs650:$PATH"
+fi
diff -urN ../lilypond-1.4.9/Documentation/windows/gsview-profile.sh ./Documentation/windows/gsview-profile.sh
--- ../lilypond-1.4.9/Documentation/windows/gsview-profile.sh Thu Jan 1 01:00:00 1970
+++ ./Documentation/windows/gsview-profile.sh Mon Dec 3 18:03:41 2001
@@ -0,0 +1,19 @@
+#!@SHELL@
+# /etc/profile.d/gsview-profile.sh Check for GhostView
+
+gsview26="/usr/windows/gstools/gsview"
+gsview36="/usr/windows/Ghostgum/GSview"
+
+# Maybe read registry, but that may be hairy?
+#
+# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\
+# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1"
+
+if [ -e "$gsview26/gsview32.exe" ]; then
+ PATH="$gsview26:$PATH"
+fi
+
+if [ -e "$gsview36/gsview32.exe" ]; then
+ PATH="$gsview36:$PATH"
+fi
+
diff -urN ../lilypond-1.4.9/Documentation/windows/installing.texi ./Documentation/windows/installing.texi
--- ../lilypond-1.4.9/Documentation/windows/installing.texi Wed Nov 14 22:45:33 2001
+++ ./Documentation/windows/installing.texi Sun Dec 9 22:36:57 2001
@@ -2,54 +2,44 @@
@setfilename installing.info
@settitle LilyPond on Windows
+@html
+
+@end html
+
+@html
+
+@end html
+
@node Top
@top
@chapter WINDOWS - Installing GNU LilyPond on Windows
-This document explains how to install the binary release for windows
-on a Microsoft Windows 95, 98, NT or 2000 machine.
+This document explains how to install the binary release for windows on
+a Microsoft Windows 95, 98, NT or 2000 machine. Please follow the
+instructions carefully. If it doesn't work for you, please send a
+bugreport, following the guidelines in the section on bugreports below.
-This release is a free extra service of the developers to assist windows
-users. When reporting problems, please keep in mind that we (the developers)
-do not use Windows. In fact, if you know something about Windows, and
-are able to write code, please send us code that works better (see
-@uref{compiling.html,compiling}).
@section Windows binary setup
-Apart from LilyPond itself, you need Cygwin, GUILE, Python and a TeX
-installation, but all this software be installed by running setup.exe:
-
-@table @asis
-@item LilyPond
-Download and run
-@c let's do http, so that people read the README
-@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe}
-to install LilyPond.
-
-This will install the minimal set of cygwin tools needed to run
-LilyPond. Make sure to install in the default place, @file{c:/cygwin},
-and install everything.
-
-As of version 1.3.150, you also have the option to install MiKTeX and
-GSView from this installer, which is recommended. If you choose to
-install these by hand (see below), make sure to install them
-@strong{before} you install LilyPond, otherwise your LilyPond setup will
-be broken.
-
-If you already have cygwin installed, don't worry: nothing will be
-installed twice. To expand on this minimal set, click
-@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a
-Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
-@end table
-
+All the software you need is installed by downloading and running
+@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe}. You
+will be asked some questions. If you are unsure just click "Next". Do
+not change the default install directory @file{c:/cygwin}.
+
+This installs LilyPond, and Cygwin, GUILE, Python, MiKTeX and GSView. If
+you already have some of that software under @file{c:/cygwin}, then
+don't worry: nothing will be installed twice.
+
+If you want to install any of this software by hand, do this
+@strong{before} you run @file{setup.exe}, otherwise your LilyPond setup
+may not work.
-@section Windows running setup
+@section Testing LilyPond
-If you're lucky, after running @file{setup.exe} you're all set up.
-
-Open a LilyPond shell (or any bash shell), and type
+Open a LilyPond shell (To open a a lilypond shell, click the "GNU
+LilyPond" icon), and type
@quotation
@example
@@ -57,7 +47,7 @@
@end example
@end quotation
-If you don't see something similar to
+You should see something similar to
@quotation
@example
@@ -75,25 +65,84 @@
@end example
@end quotation
-you should try adding @file{/usr/lilypond-x.y.z/bin} to your @var{PATH},
-do:
+Then, prepare a file called @file{foo.ly}, by issuing
+@example
+notepad foo.ly
+@end example
+Enter the following into the file
+@example
-@quotation
+\score @{ \notes @{ c4 ( ) c4 @} @}
+
+@end example
+Close the file and save it. Run the following command a few times (at
+least three times) until it says @code{PS output to `foo.ps', DVI output
+to `foo.dvi'}.
@example
-PATH=/usr/lilypond-1.4.2/bin:$PATH
+
+ly2dvi -P foo
+
@end example
-@end quotation
+You can now view the file using the following command
+@example
+
+gsview32 foo.ps
+
+@end example
+
+If this works, then you can head to the
+@uref{../../user/out-www/lilypond/Tutorial.html,Tutorial} to start using
+LilyPond.
+
+
-and try again.
+@section Removing LilyPond
+Start @file{setup.exe}, click Next, select "Install from Local
+Directory". Then click next until you reach "Select packages to
+install". Click "View". Now, for every package, click on the recycle
+icon until it says "Uninstall". Then, click Next.
-@subsection Trouble
+(If you find this too tedious, you can also simply remove
+@file{c:/cygwin}. This also removes the @file{/home/} directories under
+cygwin (i.e. @file{C:\CYGWIN\HOME}, so make sure that you bring
+important files in safety first.)
+
+@section Troubleshooting
For problems and solutions see
@uref{http://lilypond.org/wiki?TroubleshootingWindows,Troubleshooting
Windows}
+@section Bugreports
+
+We can only help you with a problem if you give a full, detailed
+bugreport. A bugreport includes
+
+@itemize @bullet
+@item A @emph{precise} description of the problem.
+@item A full description of your platform (machine type, operating
+system)
+@item All version numbers of relevant software you run. Specifically, we
+want to see the output of the following commands:
+@example
+ python --version
+ lilypond --version
+ ly2dvi --version
+ gswin32 --version
+@end example
+@item If ly2dvi fails, then please run it as follows and include the
+ output in the
+@example
+ ly2dvi --verbose MY-FILE
+@end example
+@end itemize
+
+You can also check out
+@uref{http://lilypond.org/wiki/?TroubleshootingWindows} for more
+instructions on how to make a bug report.
+@ignore
@subsection Additional software
LilyPond needs a number of software packages to be really useful. These
@@ -137,11 +186,8 @@
@uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum,ftp.cs.wisc.edu}.
or visit the
@uref{http://www.cs.wisc.edu/~ghost/,Ghostscript, Ghostview and GSview site}.
-
@end table
-
-
[TODO:
@@ -150,9 +196,6 @@
]
-
-@ignore
-
guile -v
Guile 1.4.1
@@ -184,4 +227,19 @@
@end ignore
+@ignore
+@c irrelevant.
+
+If you want to install more of cygwnTo expand on this minimal set,
+@section If you already have MikTeX, GSView or
+If you already have cygwin installed, don't worry: nothing will be
+installed twice. To expand on this minimal set, click
+@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a
+Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
+
+
+This will install the minimal set of cygwin tools needed to run
+LilyPond. Make sure to install in the default place, @file{c:/cygwin},
+and install everything.
+@end ignore
diff -urN ../lilypond-1.4.9/Documentation/windows/lily-gs.sh ./Documentation/windows/lily-gs.sh
--- ../lilypond-1.4.9/Documentation/windows/lily-gs.sh Sun Jul 8 23:01:26 2001
+++ ./Documentation/windows/lily-gs.sh Mon Dec 3 18:03:41 2001
@@ -14,12 +14,18 @@
# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1"
+
+## we set GS_LIB although the registry keys have been set.
+##
+
if [ -e "$gs550/gswin32.exe" ]; then
PATH="$gs550:$PATH"
+ GS_LIB='C:\cygwin\usr\windows\gs\gs5.50\lib'
fi
if [ -e "$gs650/gswin32.exe" ]; then
PATH="$gs650:$PATH"
+ GS_LIB='C:\cygwin\usr\windows\gs\gs6.50\lib'
fi
if [ -e "$gsview26/gsview32.exe" ]; then
@@ -29,3 +35,9 @@
if [ -e "$gsview36/gsview32.exe" ]; then
PATH="$gsview36:$PATH"
fi
+
+
+
+
+export GS_LIB
+export PATH
diff -urN ../lilypond-1.4.9/Documentation/windows/lily-miktex.sh ./Documentation/windows/lily-miktex.sh
--- ../lilypond-1.4.9/Documentation/windows/lily-miktex.sh Sun Jul 8 23:01:26 2001
+++ ./Documentation/windows/lily-miktex.sh Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
-#!@SHELL@
-# /etc/profile.d/lily-miktex.sh -- Check for MiKTeX
-
-
-# Educated guess in case we have no regtool
-a="//c/Program Files/MiKTeX"
-
-# Registry entry
-reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\')"
-b="$(cygpath -u ""$reg"")"
-
-# Where we installed it
-c="/usr/windows/MiKTeX"
-
-for i in "$a" "$b" "$c"; do
- if [ -d "$i" ]; then
- texmf="$i"
- fi
-done
-
-PATH="$texmf/miktex/bin:$PATH"
-
diff -urN ../lilypond-1.4.9/Documentation/windows/lily-python.sh ./Documentation/windows/lily-python.sh
--- ../lilypond-1.4.9/Documentation/windows/lily-python.sh Thu Apr 19 12:56:39 2001
+++ ./Documentation/windows/lily-python.sh Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
-#!@SHELL@
-# /etc/profile.d/post-python.sh -- Check for Python
-
-# Educated guess in case we have no regtool
-a="//c/Program Files/Python"
-
-# Registry entry
-reg="$(regtool -q get 'HKLM\Software\Python\PythonCore\1.5\InstallPath\')"
-b="$(cygpath -u ""$reg"")"
-
-# Where we installed it
-c="/usr/windows/Python"
-
-for i in "$a" "$b" "$c"; do
- if [ -d "$i" ]; then
- python="$i"
- fi
-done
-
-PATH="$python:$PATH"
diff -urN ../lilypond-1.4.9/Documentation/windows/post-gs.sh ./Documentation/windows/post-gs.sh
--- ../lilypond-1.4.9/Documentation/windows/post-gs.sh Thu Apr 19 12:56:39 2001
+++ ./Documentation/windows/post-gs.sh Thu Jan 1 01:00:00 1970
@@ -1,54 +0,0 @@
-#!@SHELL@
-# /etc/postinstall/post-gs.sh -- Install GS and GSView
-
-
-gs550="/usr/windows/gstools/gs5.50"
-gs650="/usr/windows/gs/gs6.50"
-
-gsview26="/usr/windows/gstools/gsview"
-gsview36="/usr/windows/Ghostgum/GSview"
-
-# maybe set this too, but how (what type is value, a list?)
-# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\
-# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1"
-
-# gsview needs gs register entries, so it seems
-
-if [ -e "$gs550/gswin32.exe" ]; then
- regtool -s set 'HKLM\Software\Aladdin Ghostscript\5.50\GS_LIB' \
- "c:\cygwin\windows\gstools\gs5.50;c:\cygwin\windows\gstools\gs5.50\fonts"
- regtool -s set 'HKLM\Software\Aladdin Ghostscript\5.50\GS_DLL' \
- "c:\cygwin\windows\gstools\gs5.50\\gsdll32.dll"
-fi
-
-if [ -e "$gs650/gswin32.exe" ]; then
- regtool -s set 'HKLM\Software\AFPL Ghostscript\6.50\GS_DLL' \
- "C:\cygwin\windows\gs\gs6.50\bin\gsdll32.dll"
- regtool -s set 'HKLM\Software\AFPL Ghostscript\6.50\GS_LIB' \
- "C:\cygwin\windows\gs\gs6.50\lib;C:\cygwin\windows\gs\fonts"
-fi
-
-# nothing to be done
-if [ -e "$gsview26/gsview32.exe" ]; then
- true
-fi
-
-if [ -e "$gsview36/gsview32.exe" ]; then
- regtool -s set 'HKLM\Software\Ghostgum\GSview\3.6' \
- "C:\cygwin\windows\Ghostgum"
-fi
-
-# What's in the registry
-
-# regtool -v list HKLM\Software\Aladdin Ghostscript\5.50
-# GS_LIB = "c:\cygwin\windows\gstools\gs5.50;c:\cygwin\windows\gstools\gs5.50\fonts"
-# GS_DLL = "c:\cygwin\windows\gstools\gs5.50\\gsdll32.dll"
-
-# regtool -v list HKLM\Software\Ghostgum\GSview
-# 3.6 = "C:\cygwin\windows\Ghostgum"
-
-# regtool -v list HKLM\Software\AFPL Ghostscript\6.50
-# GS_DLL = "C:\cygwin\windows\gs\gs6.50\bin\gsdll32.dll"
-# GS_LIB = "C:\cygwin\windows\gs\gs6.50\lib;C:\cygwin\windows\gs\fonts"
-
-
diff -urN ../lilypond-1.4.9/Documentation/windows/post-lily.sh ./Documentation/windows/post-lily.sh
--- ../lilypond-1.4.9/Documentation/windows/post-lily.sh Thu Apr 19 12:56:39 2001
+++ ./Documentation/windows/post-lily.sh Thu Jan 1 01:00:00 1970
@@ -1,8 +0,0 @@
-#!@SHELL@
-# /etc/profile.d/post-lily.sh -- Setup LilyPond
-
-rm -f /usr/lilypond
-lily=@prefix@
-ln -s $lily /usr/lilypond
-
-
diff -urN ../lilypond-1.4.9/Documentation/windows/post-lilypond.sh ./Documentation/windows/post-lilypond.sh
--- ../lilypond-1.4.9/Documentation/windows/post-lilypond.sh Thu Jan 1 01:00:00 1970
+++ ./Documentation/windows/post-lilypond.sh Mon Dec 3 18:03:41 2001
@@ -0,0 +1,8 @@
+#!@SHELL@
+# /etc/profile.d/post-lily.sh -- Setup LilyPond
+
+rm -f /usr/lilypond
+lily=@prefix@
+ln -s $lily /usr/lilypond
+
+
diff -urN ../lilypond-1.4.9/Documentation/windows/post-miktex.sh ./Documentation/windows/post-miktex.sh
--- ../lilypond-1.4.9/Documentation/windows/post-miktex.sh Tue Apr 24 01:23:32 2001
+++ ./Documentation/windows/post-miktex.sh Thu Jan 1 01:00:00 1970
@@ -1,30 +0,0 @@
-#!@SHELL@
-# /etc/profile.d/post-miktex.sh -- Setup MiKTeX
-
-
-# Educated guess in case we have no regtool
-a="//c/Program Files/MiKTeX"
-
-# Registry entry
-reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\')"
-b="$(cygpath -u ""$reg"")"
-
-# Where we installed it
-c="/usr/windows/MiKTeX"
-
-for i in "$a" "$b" "$c"; do
- if [ -d "$i" ]; then
- texmf="$i"
- fi
-done
-
-rm -f /usr/share/texmf
-ln -s "$texmf" /usr/share/texmf
-
-# What's in the registry
-# $ regtool -s set 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\' "C:\cygwin\usr\windows\MiKTeX"
-
-# regtool -v list HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX
-# TEXMF Root Directories = "C:\cygwin\usr\windows\miktex\spool\texmf;C:\cygwin\windows\MiKTeX"
-# Install Root = "C:\cygwin\usr\windows\MiKTeX"
-
diff -urN ../lilypond-1.4.9/Documentation/windows/post-python.sh ./Documentation/windows/post-python.sh
--- ../lilypond-1.4.9/Documentation/windows/post-python.sh Thu Apr 19 12:56:39 2001
+++ ./Documentation/windows/post-python.sh Thu Jan 1 01:00:00 1970
@@ -1,41 +0,0 @@
-#!@SHELL@
-# /etc/profile.d/post-python.sh -- Setup Python
-
-# Educated guess in case we have no regtool
-a="//c/Program Files/Python"
-
-# Registry entry
-reg="$(regtool -q get 'HKLM\Software\Python\PythonCore\1.5\InstallPath\')"
-b="$(cygpath -u ""$reg"")"
-
-# Where we installed it
-c="/usr/windows/Python"
-
-for i in "$a" "$b" "$c"; do
- if [ -d "$i" ]; then
- python="$i"
- fi
-done
-
-# What's in the registry
-
-# regtool -v list HKLM\Software\Python\PythonCore\1.5
-# InstallPath\ ()
-# PythonPath\ ()
-# Dll\ ()
-# Modules\ ()
-
-# regtool -v list HKLM\Software\Python\PythonCore\1.5\InstallPath
-# InstallGroup\ ()
-# = "C:\cygwin\usr\windows\Python"
-
-# regtool -v list HKLM\Software\Python\PythonCore\1.5\PythonPath
-# = "C:\cygwin\usr\windows\Python\Lib\plat-win;C:\cygwin\usr\windows\Python\Lib;C:\cygwin\usr\windows\Python\DLLs;C:\cygwin\usr\windows\Python\Lib\lib-tk"
-
-# regtool -v list HKLM\Software\Python\PythonCore\1.5\Dll
-# = "C:\WINDOWS\SYSTEM\Python15.dll"
-
-# regtool -v list HKLM\Software\Python\PythonCore\1.5\Modules\
-# = ""
-
-
diff -urN ../lilypond-1.4.9/Documentation/windows/python-wrapper.sh ./Documentation/windows/python-wrapper.sh
--- ../lilypond-1.4.9/Documentation/windows/python-wrapper.sh Tue Aug 14 18:46:08 2001
+++ ./Documentation/windows/python-wrapper.sh Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-#!@SHELL@
-# @name@.sh -- @name@ wrapper for Windows
-
-if echo | python - >/dev/null 2>&1; then
- echo
-else
- cat <] BIBFILES...';
+
+
+
+(options, files) = getopt.getopt(sys.argv[1:], 's:o:', [])
+
+output = 'bib.html'
+style = 'long'
+for (o,a) in options:
+ if o == '-h' or o == '--help':
+ usage ()
+ sys.exit (0)
+ elif o == '-s' or o == '--style':
+ style = a
+ elif o == '-o' or o == '--output':
+ output = a
+ else:
+ raise 'unknown opt ', o
+
+
+if style not in ['alpha','index','long','longp','long-pario','short','short-pario','split']:
+ sys.stderr.write ("Unknown style \`%s'\n" % style)
+
+tempfile = tempfile.mktemp ('bib2html')
+
+if not files:
+ usage ()
+ sys.exit (2)
+
+
+def strip_extension (f, ext):
+ (p, e) = os.path.splitext (f)
+ if e == ext:
+ e = ''
+ return p + e
+
+nf = []
+for f in files:
+ nf.append (strip_extension(f, '.bib'))
+
+files = string.join (nf,',')
+
+open(tempfile + '.aux', 'w').write (r'''
+\relax
+\citation{*}
+\bibstyle{html-%(style)s}
+\bibdata{%(files)s}''' % vars ())
+
+cmd = "bibtex %s" % tempfile;
+
+sys.stdout.write ("Invoking `%s'\n" % cmd)
+os.system (cmd)
+
+
+#TODO: do tex -> html on output
+
+bbl =open (tempfile + '.bbl').read ()
+
+open (output, 'w').write (bbl)
+
+
+def cleanup (tempfile):
+ for a in ['aux','bbl', 'blg']:
+ os.unlink (tempfile + '.' + a)
+
+cleanup(tempfile)
+
+
+
+
+
+
+
+
+
+
+
diff -urN ../lilypond-1.4.9/buildscripts/lilypond-profile.sh ./buildscripts/lilypond-profile.sh
--- ../lilypond-1.4.9/buildscripts/lilypond-profile.sh Thu May 10 11:52:20 2001
+++ ./buildscripts/lilypond-profile.sh Wed Nov 21 23:37:49 2001
@@ -15,7 +15,7 @@
GS_FONTPATH="$datadir/afm:$datadir/pfa"
# For direct ps output: ps/lilyponddefs.ps
-GS_LIB="$datadir/ps"
+GS_LIB="$datadir/ps:"${GS_LIB:=""}
# bit silly. for ly2dvi, overrules compiled-in datadir...
# Better comment this out. Compiled-in datadir serves exactly the
diff -urN ../lilypond-1.4.9/input/no-notation/bar-check.ly ./input/no-notation/bar-check.ly
--- ../lilypond-1.4.9/input/no-notation/bar-check.ly Thu Jan 1 01:00:00 1970
+++ ./input/no-notation/bar-check.ly Sat Dec 29 23:51:44 2001
@@ -0,0 +1,12 @@
+
+\header {
+
+texidoc = "skipTypesetting doesn't affect bar checks."
+
+}
+
+\score { \notes {
+ \property Score.skipTypesetting = ##t
+ c4 c4
+ |
+ c4 c4 }}
diff -urN ../lilypond-1.4.9/input/regression/breathing-sign.ly ./input/regression/breathing-sign.ly
--- ../lilypond-1.4.9/input/regression/breathing-sign.ly Thu Apr 5 00:02:37 2001
+++ ./input/regression/breathing-sign.ly Mon Dec 3 13:04:04 2001
@@ -21,7 +21,11 @@
< \context Voice = two { \stemDown es4 \breathe bes es }
\context Voice = one { \stemUp g4 as g }
> |
- es8 d es f g4 \breathe |
+% Change to wedge:
+ \property Voice.BreathingSign \override #'text = #"scripts-upbow"
+ es8 d es f g8 \breathe f |
+% Revert to old layout:
+ \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::brew_molecule
es8 d \breathe es f g f |
es2 r4 \bar "||"
}
diff -urN ../lilypond-1.4.9/input/regression/collisions.ly ./input/regression/collisions.ly
--- ../lilypond-1.4.9/input/regression/collisions.ly Thu Apr 5 00:02:37 2001
+++ ./input/regression/collisions.ly Thu Nov 29 14:03:25 2001
@@ -13,8 +13,8 @@
twovoice = \context Staff \notes <
- \context Voice=i { \stemDown c4 d e f g2~ g4 a [c8 d e f] c2| }
- \context Voice=ii { \stemUp g4 f e g ~ g2 g2 c4 g4 g2 }
+ \context Voice=i { \stemDown e1 c4 d e f g2~ g4 a [c8 d e f] c2| }
+ \context Voice=ii { \stemUp e1 g4 f e g ~ g2 g2 c4 g4 g2 }
>
twovoicesteminvert = \context Staff \notes <
diff -urN ../lilypond-1.4.9/input/regression/non-empty-text.ly ./input/regression/non-empty-text.ly
--- ../lilypond-1.4.9/input/regression/non-empty-text.ly Thu Apr 5 00:02:38 2001
+++ ./input/regression/non-empty-text.ly Mon Dec 3 13:04:04 2001
@@ -7,11 +7,12 @@
"
}
\score { \notes {
-\property Voice.TextScript \override #'no-spacing-rods = ##f
-c4_"very wide and long text" c4
+c2_"very wide and long text" c | \break
+\fatText % short for \property Voice.textNonEmpty = ##t
+c_"very wide and long text" c
}
\paper {
- linewidth = -1.0
+ linewidth = 3.\cm
}
}
diff -urN ../lilypond-1.4.9/input/regression/stanza-number.ly ./input/regression/stanza-number.ly
--- ../lilypond-1.4.9/input/regression/stanza-number.ly Thu Apr 5 00:16:43 2001
+++ ./input/regression/stanza-number.ly Mon Dec 3 13:04:04 2001
@@ -7,7 +7,7 @@
< \context LyricsVoice \lyrics {
\property LyricsVoice . stanza = "first"
-\property LyricsVoice . stz = "2nd"
+\property LyricsVoice . stz = #'("2" (super "nd"))
Foo1 Bar1 }
\notes { c''1 \break c''1 }>}
diff -urN ../lilypond-1.4.9/lily/bar-check-iterator.cc ./lily/bar-check-iterator.cc
--- ../lilypond-1.4.9/lily/bar-check-iterator.cc Thu Jan 1 01:00:00 1970
+++ ./lily/bar-check-iterator.cc Sat Dec 29 23:51:44 2001
@@ -0,0 +1,68 @@
+/*
+ bar-check-iterator.cc -- implement Bar_check_iterator
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 2001 Han-Wen Nienhuys
+
+ */
+
+#include "simple-music-iterator.hh"
+#include "command-request.hh"
+#include "translator-group.hh"
+
+/*
+ Check bar checks. We do this outside the engravers so that you can
+ race through the score using skipTypesetting to correct durations.
+ */
+class Bar_check_iterator : Simple_music_iterator
+{
+public:
+ VIRTUAL_COPY_CONS(Bar_check_iterator);
+ virtual void process (Moment);
+ Bar_check_iterator( );
+ static SCM constructor_cxx_function;
+};
+
+IMPLEMENT_CTOR_CALLBACK (Bar_check_iterator);
+
+Music * get_barcheck ()
+{
+ Music *bc = new Music;
+ bc->set_mus_property ("iterator-ctor", Bar_check_iterator::constructor_cxx_function);
+ return bc;
+}
+
+Bar_check_iterator::Bar_check_iterator()
+{
+}
+
+void
+Bar_check_iterator::process (Moment m)
+{
+ if (m == Moment (0))
+ {
+ Translator_group *tr = report_to_l ();
+
+ SCM mp = tr->get_property (ly_symbol2scm ("measurePosition"));
+ SCM sync= tr->get_property (ly_symbol2scm ("barCheckNoSynchronize"));
+
+ Moment * where =unsmob_moment (mp);
+ if (where && *where)
+ {
+ music_l_->origin ()->warning (_f ("barcheck failed at: %s",
+ where->str ()));
+
+
+ if (!to_boolean (sync))
+ {
+ tr = tr->where_defined (ly_symbol2scm("measurePosition"));
+ Moment zero;
+ tr->set_property (ly_symbol2scm ("measurePosition"), zero.smobbed_copy ());
+ }
+ }
+ }
+ Simple_music_iterator::process(m);
+
+}
+
diff -urN ../lilypond-1.4.9/lily/collision.cc ./lily/collision.cc
--- ../lilypond-1.4.9/lily/collision.cc Sat May 12 13:21:49 2001
+++ ./lily/collision.cc Thu Nov 29 14:15:45 2001
@@ -13,7 +13,7 @@
#include "paper-def.hh"
#include "axis-group-interface.hh"
#include "item.hh"
-
+#include "stem.hh"
MAKE_SCHEME_CALLBACK (Collision,force_shift_callback,2);
@@ -37,6 +37,165 @@
return gh_double2scm (0.0);
}
+
+
+
+
+void
+check_meshing_chords (Grob*me,
+ Drul_array< Array < Real > > *offsets,
+ Drul_array< Array < Slice > > const &extents,
+ Drul_array > const &clash_groups)
+
+{
+ if (!extents[UP].size () || ! extents[DOWN].size ())
+ return ;
+
+
+ Grob *cu =clash_groups[UP][0];
+ Grob *cd =clash_groups[DOWN][0];
+
+ Grob * nu_l= Note_column::first_head (cu);
+ Grob * nd_l = Note_column::first_head (cd);
+
+
+
+ /*
+ this case (distant half collide),
+
+ |
+ x |
+ | x
+ |
+
+ the noteheads may be closer than this case (close half collide)
+
+ |
+ |
+ x
+ x
+ |
+ |
+
+ */
+
+ bool close_half_collide = false;
+ bool distant_half_collide = false;
+ bool full_collide = false;
+
+ /*
+ TODO:
+
+ filter out the 'o's in this configuration, since they're no part
+ in the collision.
+
+ |
+ x|o
+ x|o
+ x
+
+
+ */
+ Array ups = Stem::note_head_positions (Note_column::stem_l (cu));
+ Array dps = Stem::note_head_positions (Note_column::stem_l (cd));
+
+ /*
+ they're too far apart to collide.
+
+ */
+
+ if (ups[0] > dps.top () + 1)
+ return ;
+
+ bool touch = (ups[0] - dps.top () >= 0);
+
+ bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ());
+
+ merge_possible = merge_possible &&
+ Rhythmic_head::balltype_i (nu_l) == Rhythmic_head::balltype_i (nd_l);
+
+ merge_possible = merge_possible && Rhythmic_head::balltype_i (nu_l) != 0;
+
+ if (!to_boolean (me->get_grob_property ("merge-differently-dotted")))
+ merge_possible = merge_possible && Rhythmic_head::dot_count (nu_l) == Rhythmic_head::dot_count (nd_l);
+
+ int i = 0, j=0;
+ while (i < ups.size () && j < dps.size ())
+ {
+ if (abs (ups[i] - dps[j]) == 1)
+ {
+ merge_possible = false;
+ if (ups[i] > dps[j])
+ close_half_collide = true;
+ else
+ distant_half_collide = true;
+ }
+ else if (ups[i]==dps[j])
+ full_collide = true;
+ else if (ups[i] >dps[0] && ups[i] < dps.top ())
+ merge_possible = false;
+ else if (dps[j] >ups[0] && dps[j] < ups.top ())
+ merge_possible = false;
+
+ if (ups[i] < dps[j])
+ i++;
+ else if (ups[i] > dps[j])
+ j++;
+ else
+ {
+ i++;
+ j++;
+ }
+ }
+
+ Drul_array center_note_shifts;
+ center_note_shifts[LEFT] = 0.0;
+ center_note_shifts[RIGHT] = 0.0;
+
+
+ Real shift_amount = 1;
+
+ if (touch)
+ shift_amount *= -1;
+
+ /*
+ for full collisions, the right hand head may obscure dots, so
+ make sure the dotted heads go to the right.
+ */
+ if ((Rhythmic_head::dot_count (nu_l) > Rhythmic_head::dot_count (nd_l)
+ && full_collide))
+ shift_amount = 1;
+
+ /*
+ TODO: these numbers are magic; should devise a set of grob props
+ to tune this behavior. */
+
+ if (merge_possible)
+ shift_amount *= 0.0;
+ else if (close_half_collide && !touch)
+ shift_amount *= 0.52;
+ else if (distant_half_collide && !touch)
+ shift_amount *= 0.4;
+ else if (distant_half_collide || close_half_collide || full_collide)
+ shift_amount *= 0.5;
+ /*
+ we're meshing.
+ */
+ else if (Rhythmic_head::dot_count (nu_l) || Rhythmic_head::dot_count (nd_l))
+ shift_amount *= 0.1;
+ else
+ shift_amount *= 0.25;
+
+ Direction d = UP;
+ do
+ {
+ for (int i=0; i < clash_groups[d].size (); i++)
+ (*offsets)[d][i] += d * shift_amount;
+ }
+ while ((flip (&d))!= UP);
+}
+
+
/*
TODO: make callback of this.
@@ -146,6 +305,15 @@
}
}
while ((flip (&d))!= UP);
+
+ /*
+ do horizontal shifts of each direction
+
+ |
+ x||
+ x||
+ x|
+ */
do
{
@@ -161,49 +329,13 @@
}
while ((flip (&d))!= UP);
- /*
- if the up and down version are close, and can not be merged, move
- all of them again. */
- if (extents[UP].size () && extents[DOWN].size ())
- {
- Grob *cu_l =clash_groups[UP][0];
- Grob *cd_l =clash_groups[DOWN][0];
+ /*
+ Check if chords are meshing
+ */
- /*
- TODO.
- */
- Grob * nu_l= Note_column::first_head (cu_l);
- Grob * nd_l = Note_column::first_head (cd_l);
-
- int downpos = Note_column::head_positions_interval (cd_l)[BIGGER];
- int uppos = Note_column::head_positions_interval (cu_l)[SMALLER];
-
- bool merge =
- downpos == uppos
- && Rhythmic_head::balltype_i (nu_l) == Rhythmic_head::balltype_i (nd_l);
-
-
- if (!to_boolean (me->get_grob_property ("merge-differently-dotted")))
- merge = merge && Rhythmic_head::dot_count (nu_l) == Rhythmic_head::dot_count (nd_l);
-
- /*
- notes are close, but can not be merged. Shift
- */
- if (abs (uppos - downpos) < 2 && !merge)
- do
- {
- for (int i=0; i < clash_groups[d].size (); i++)
- {
- if(Rhythmic_head::dot_count (nu_l) > Rhythmic_head::dot_count (nd_l))
- offsets[d][i] += d * 0.5;
- else
- offsets[d][i] -= d * 0.5;
- }
- }
- while ((flip (&d))!= UP);
- }
-
+ check_meshing_chords (me, &offsets, extents, clash_groups);
+
do
{
for (int i=0; i < clash_groups[d].size (); i++)
diff -urN ../lilypond-1.4.9/lily/command-request.cc ./lily/command-request.cc
--- ../lilypond-1.4.9/lily/command-request.cc Fri Apr 13 01:32:50 2001
+++ ./lily/command-request.cc Sat Dec 29 23:51:44 2001
@@ -10,13 +10,6 @@
#include "debug.hh"
#include "musical-request.hh"
-bool
-Barcheck_req::do_equal_b (Request const *r) const
-{
- Barcheck_req const*b = dynamic_cast (r);
- return b;
-}
-
Tempo_req::Tempo_req ()
{
set_mus_property ("duration", Duration (2,0).smobbed_copy ());
@@ -101,7 +94,7 @@
ADD_MUSIC (Articulation_req);
-ADD_MUSIC (Barcheck_req);
+
ADD_MUSIC (Break_req);
ADD_MUSIC (Breathing_sign_req);
ADD_MUSIC (Busy_playing_req);
diff -urN ../lilypond-1.4.9/lily/dot-column-engraver.cc ./lily/dot-column-engraver.cc
--- ../lilypond-1.4.9/lily/dot-column-engraver.cc Wed May 16 00:49:48 2001
+++ ./lily/dot-column-engraver.cc Sat Dec 29 23:51:44 2001
@@ -66,7 +66,6 @@
{
dotcol_ = new Item (get_property ("DotColumn"));
- Dot_column::set_interface (dotcol_);
announce_grob (dotcol_, 0);
}
diff -urN ../lilypond-1.4.9/lily/dot-column.cc ./lily/dot-column.cc
--- ../lilypond-1.4.9/lily/dot-column.cc Wed May 16 00:49:48 2001
+++ ./lily/dot-column.cc Sat Dec 29 23:51:44 2001
@@ -16,11 +16,9 @@
#include "axis-group-interface.hh"
#include "stem.hh"
-void
-Dot_column::set_interface (Grob* me)
-{
-}
+
MAKE_SCHEME_CALLBACK (Dot_column,force_shift_callback,2);
+
SCM
Dot_column::force_shift_callback (SCM element_smob, SCM axis)
{
diff -urN ../lilypond-1.4.9/lily/include/stem.hh ./lily/include/stem.hh
--- ../lilypond-1.4.9/lily/include/stem.hh Sun Mar 11 19:10:33 2001
+++ ./lily/include/stem.hh Thu Nov 29 14:03:25 2001
@@ -35,6 +35,7 @@
static int heads_i (Grob *) ;
static bool invisible_b (Grob *) ;
static Interval head_positions (Grob *) ;
+ static Array note_head_positions (Grob *);
static Real get_default_stem_end_position (Grob*me) ;
static void position_noteheads (Grob*);
static Real stem_end_position (Grob*) ;
diff -urN ../lilypond-1.4.9/lily/include/timing-translator.hh ./lily/include/timing-translator.hh
--- ../lilypond-1.4.9/lily/include/timing-translator.hh Mon Apr 23 00:27:16 2001
+++ ./lily/include/timing-translator.hh Sat Dec 29 23:51:44 2001
@@ -20,12 +20,9 @@
public:
VIRTUAL_COPY_CONS (Translator);
Timing_translator ();
- Music *check_;
protected:
virtual void initialize ();
- virtual bool try_music (Music *req_l);
- virtual void process_music ();
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
diff -urN ../lilypond-1.4.9/lily/parser.yy ./lily/parser.yy
--- ../lilypond-1.4.9/lily/parser.yy Sun Nov 18 01:08:53 2001
+++ ./lily/parser.yy Sat Dec 29 23:51:44 2001
@@ -1066,6 +1066,11 @@
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
}
+ | '|' {
+ extern Music * get_barcheck();
+ $$ = get_barcheck ();
+ $$->set_spot (THIS->here_input ());
+ }
| BAR STRING {
Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2);
@@ -1160,9 +1165,6 @@
| hyphen_req {
$$ = $1;
}
- | '|' {
- $$ = new Barcheck_req;
- }
| '~' {
$$ = new Tie_req;
}
diff -urN ../lilypond-1.4.9/lily/span-bar.cc ./lily/span-bar.cc
--- ../lilypond-1.4.9/lily/span-bar.cc Sun Sep 16 23:19:01 2001
+++ ./lily/span-bar.cc Sat Dec 29 23:51:44 2001
@@ -42,44 +42,29 @@
* lines is evaluated as 0, which results in a solid span bar line
* with faulty y coordinate.
*/
+
+
+/*
+ This routine was originally by Juergen Reuter, but it was a on the
+ bulky side. Rewritten by Han-Wen.
+ */
SCM
Span_bar::brew_molecule (SCM smobbed_me)
{
Grob *me = unsmob_grob (smobbed_me);
SCM first_elt = me->get_grob_property ("elements");
- Grob *first_staff_bar = unsmob_grob (gh_car (first_elt));
- Grob *last_staff_bar = 0;
- // compute common refpoint of elements & last_staff_bar
+ // compute common refpoint of elements
Grob *refp = me;
- for (SCM elts = first_elt;
- gh_pair_p (elts);
- elts = gh_cdr (elts))
- {
- SCM smobbed_staff_bar = gh_car (elts);
- Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
- refp = staff_bar->common_refpoint (refp, Y_AXIS);
- last_staff_bar = staff_bar;
- }
-
- // determine refp->extent, but ignore lyrics etc. above and below
- Interval refp_extent;
- refp_extent[LEFT] =
- first_staff_bar->relative_coordinate (refp, (Axis)Y_AXIS) -
- 0.5 * (first_staff_bar->extent (refp, Y_AXIS)[UP] -
- first_staff_bar->extent (refp, Y_AXIS)[DOWN]);
- refp_extent[RIGHT] =
- last_staff_bar->relative_coordinate (refp, (Axis)Y_AXIS) +
- 0.5 * (last_staff_bar->extent (refp, Y_AXIS)[UP] -
- last_staff_bar->extent (refp, Y_AXIS)[DOWN]);
-
- // global yoffs correction (compensate centering around refp)
- Real yoffs = 0.5 * (refp_extent[LEFT] - refp_extent[RIGHT]);
+ for (SCM elts = first_elt; gh_pair_p (elts); elts = gh_cdr (elts))
+ {
+ SCM smobbed_staff_bar = gh_car (elts);
+ Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
+ refp = staff_bar->common_refpoint (refp, Y_AXIS);
+ }
- // evaluate glyph
Span_bar::evaluate_glyph(me);
- SCM glyph = me->get_grob_property (ly_symbol2scm ("glyph"));
-
+ SCM glyph = me->get_grob_property ("glyph");
/*
glyph may not be a string, when ME is killed by Hara Kiri in
@@ -87,48 +72,36 @@
*/
if (!gh_string_p (glyph))
return SCM_EOL;
-
+
String glyph_str = ly_scm2string (glyph);
// compose span_bar_mol
- Molecule span_bar_mol = Molecule::Molecule ();
+ Molecule span_bar_mol;
+
Interval prev_extent;
- for (SCM elts = first_elt;
- gh_pair_p (elts);
- elts = gh_cdr (elts))
- {
- SCM smobbed_staff_bar = gh_car (elts);
- Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
- Interval ext = staff_bar->extent (refp, Y_AXIS);
-
- if (ext.empty_b ())
- continue;
-
- if (!prev_extent.empty_b ()) {
-
- Interval l;
- l[LEFT] = prev_extent[UP];
- l[RIGHT] = ext[DOWN];
-
- //SCM smobbed_staff_bar = gh_car (elts);
- //Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
- SCM smobbed_interstaff_bar_molecule =
- Bar::compound_barline (staff_bar, glyph_str, l.length()).
- smobbed_copy ();
-
- Molecule *interstaff_bar_mol =
- unsmob_molecule (smobbed_interstaff_bar_molecule);
-
- yoffs += prev_extent.length (); // skip staff bar
- yoffs += 0.5 * (l[RIGHT] - l[LEFT]); // compensate interstaff bar centering
- interstaff_bar_mol->translate_axis (yoffs, Y_AXIS);
- yoffs += 0.5 * (l[RIGHT] - l[LEFT]);
+ for (SCM elts = first_elt; gh_pair_p (elts); elts = gh_cdr (elts))
+ {
+ SCM smobbed_staff_bar = gh_car (elts);
+ Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
+ Interval ext = staff_bar->extent (refp, Y_AXIS);
+ if (ext.empty_b ())
+ continue;
- span_bar_mol.add_molecule (*interstaff_bar_mol);
+ if (!prev_extent.empty_b ())
+ {
+ Interval l(prev_extent [UP],
+ ext[DOWN]);
+
+ Molecule interbar
+ = Bar::compound_barline (staff_bar, glyph_str, l.length());
+ interbar.translate_axis (l.center (), Y_AXIS);
+ span_bar_mol.add_molecule (interbar);
+ }
+ prev_extent = ext;
}
- prev_extent = ext;
- }
+ span_bar_mol.translate_axis (- me->relative_coordinate (refp, Y_AXIS), Y_AXIS);
+
return span_bar_mol.smobbed_copy ();
}
diff -urN ../lilypond-1.4.9/lily/stanza-number-engraver.cc ./lily/stanza-number-engraver.cc
--- ../lilypond-1.4.9/lily/stanza-number-engraver.cc Sun Jun 10 00:17:08 2001
+++ ./lily/stanza-number-engraver.cc Mon Dec 3 13:04:04 2001
@@ -49,7 +49,7 @@
// TODO
- if (gh_string_p (s))
+ if (gh_string_p (s) || gh_pair_p (s))
/*
diff -urN ../lilypond-1.4.9/lily/stem.cc ./lily/stem.cc
--- ../lilypond-1.4.9/lily/stem.cc Tue Oct 2 00:48:47 2001
+++ ./lily/stem.cc Thu Nov 29 14:23:45 2001
@@ -51,21 +51,6 @@
return 0;
}
-Interval
-Stem::head_positions (Grob*me)
-{
- if (!heads_i (me))
- {
- Interval iv;
- return iv;
- }
-
- Drul_array e (extremal_heads (me));
-
- return Interval (Staff_symbol_referencer::position_f (e[DOWN]),
- Staff_symbol_referencer::position_f (e[UP]));
-}
-
Real
Stem::chord_start_f (Grob*me)
@@ -196,6 +181,32 @@
return exthead;
}
+
+static int
+icmp (int const &a, int const &b)
+{
+ return a-b;
+}
+
+Array
+Stem::note_head_positions (Grob *me)
+{
+ Array ps ;
+ for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = gh_cdr (s))
+ {
+ Grob * n = unsmob_grob (gh_car (s));
+ int p = int (Staff_symbol_referencer::position_f (n));
+
+ ps.push (p);
+ }
+
+ ps.sort (icmp);
+ return ps;
+}
+
+
+
+
void
Stem::add_head (Grob*me, Grob *n)
{
@@ -347,6 +358,24 @@
return (gh_number_p (s)) ? gh_scm2int (s) : 2;
}
+
+
+Interval
+Stem::head_positions (Grob*me)
+{
+ if (!heads_i (me))
+ {
+ Interval iv;
+ return iv;
+ }
+
+ Drul_array e (extremal_heads (me));
+
+ return Interval (Staff_symbol_referencer::position_f (e[DOWN]),
+ Staff_symbol_referencer::position_f (e[UP]));
+}
+
+
void
Stem::position_noteheads (Grob*me)
{
diff -urN ../lilypond-1.4.9/lily/text-engraver.cc ./lily/text-engraver.cc
--- ../lilypond-1.4.9/lily/text-engraver.cc Wed Nov 14 22:24:20 2001
+++ ./lily/text-engraver.cc Mon Dec 3 13:04:04 2001
@@ -128,12 +128,16 @@
text->set_grob_property ("text", r->get_mus_property ("text"));
SCM nonempty = get_property ("textNonEmpty");
- if (to_boolean (nonempty))
- /*
- empty text: signal that no rods should be applied.
- */
- text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F);
-
+ if (gh_boolean_p (nonempty))
+ if (gh_scm2bool (nonempty))
+ /*
+ empty text: signal that no rods should be applied.
+ Default nowadays.
+ */
+ text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F);
+ else
+ text->set_grob_property ("no-spacing-rods" , SCM_BOOL_T);
+
announce_grob (text, r);
texts_.push (text);
}
diff -urN ../lilypond-1.4.9/lily/timing-engraver.cc ./lily/timing-engraver.cc
--- ../lilypond-1.4.9/lily/timing-engraver.cc Sun Mar 11 19:10:34 2001
+++ ./lily/timing-engraver.cc Sat Dec 29 23:51:44 2001
@@ -20,7 +20,6 @@
protected:
virtual void start_translation_timestep ();
virtual void stop_translation_timestep ();
- virtual void process_music ();
public:
VIRTUAL_COPY_CONS (Translator);
};
@@ -61,11 +60,3 @@
}
-/*
- ugh. Translator doesn't do process_music ().
- */
-void
-Timing_engraver::process_music ()
-{
- Timing_translator::process_music ();
-}
diff -urN ../lilypond-1.4.9/lily/timing-translator.cc ./lily/timing-translator.cc
--- ../lilypond-1.4.9/lily/timing-translator.cc Mon Apr 23 00:27:16 2001
+++ ./lily/timing-translator.cc Sat Dec 29 23:51:44 2001
@@ -14,42 +14,10 @@
#include "global-translator.hh"
#include "multi-measure-rest.hh"
-/*
- TODO: change the rest of lily, so communication with
- Timing_translator is only done through properties. This means the
- class declaration can go here. */
-
-bool
-Timing_translator::try_music (Music*r)
-{
- if (dynamic_cast (r))
- {
- check_ = r;
- return true;
- }
- return false;
-}
-
-void
-Timing_translator::process_music ()
-{
- if (check_ && measure_position ())
- {
- check_->origin ()->warning (_f ("barcheck failed at: %s",
- measure_position ().str ()));
- Moment zero;
-
- if (!to_boolean (get_property ("barCheckNoSynchronize")))
- daddy_trans_l_->set_property ("measurePosition", zero.smobbed_copy ());
- }
-}
-
void
Timing_translator::stop_translation_timestep ()
{
- check_ = 0;
-
Translator *t = this;
Global_translator *global_l =0;
do
@@ -130,7 +98,6 @@
void
Timing_translator::start_translation_timestep ()
{
- check_ =00;
Translator *t = this;
Global_translator *global_l =0;
do
diff -urN ../lilypond-1.4.9/ly/drumpitch.ly ./ly/drumpitch.ly
--- ../lilypond-1.4.9/ly/drumpitch.ly Sat May 5 22:29:47 2001
+++ ./ly/drumpitch.ly Sat Dec 29 23:51:44 2001
@@ -47,7 +47,7 @@
(mutehiconga cghm ,(make-pitch 0 1 0))
(openhiconga cgho ,(make-pitch 0 1 1))
(hiconga cgh ,(make-pitch 0 2 -1))
- (openloconga cglo ,(make-pitch 0 1 2))
+ (openloconga cglo ,(make-pitch 0 1 2))
(loconga cgl ,(make-pitch 0 2 0))
(hitimbale timh ,(make-pitch 0 3 0))
(lotimbale timl ,(make-pitch 0 3 1))
@@ -116,7 +116,7 @@
#(define timbales `(
(losidestick cross ,#f ,(make-pitch -1 6 0))
(lotimbale default ,#f ,(make-pitch -1 6 0))
- (cowbell triangle ,#f ,(make-pitch 0 0 0))
+ (cowbell triangle ,#f ,(make-pitch 0 2 0))
(hisidestick cross ,#f ,(make-pitch 0 1 0))
(hitimbale default ,#f ,(make-pitch 0 1 0))
))
@@ -137,20 +137,23 @@
(hibongo default ,#f ,(make-pitch 0 1 0))
))
-#(define guiro `(
- (shortguiro default "staccato",(make-pitch 0 0 0))
- (longguiro default "tenuto" ,(make-pitch 0 0 0))
- (guiro default ,#f ,(make-pitch 0 0 0))
- ))
-#(define triangle `(
+#(define percussion `(
(opentriangle cross "open" ,(make-pitch 0 0 0))
(mutetriangle cross "stopped" ,(make-pitch 0 0 0))
(triangle cross ,#f ,(make-pitch 0 0 0))
+ (shortguiro default "staccato",(make-pitch 0 0 0))
+ (longguiro default "tenuto" ,(make-pitch 0 0 0))
+ (guiro default ,#f ,(make-pitch 0 0 0))
+ (cowbell triangle ,#f ,(make-pitch 0 0 0))
+ (claves default ,#f ,(make-pitch 0 0 0))
+ (tambourine default ,#f ,(make-pitch 0 0 0))
+ (cabasa cross ,#f ,(make-pitch 0 0 0))
+ (maracas default ,#f ,(make-pitch 0 0 0))
+ (handclap default ,#f ,(make-pitch 0 0 0))
))
-
\pitchnames
#(append (map (lambda (x) (cons (car x) (caddr x))) drum-pitch-names)
(map (lambda (x) (cons (cadr x) (caddr x))) drum-pitch-names)
diff -urN ../lilypond-1.4.9/ly/german-chords.ly ./ly/german-chords.ly
--- ../lilypond-1.4.9/ly/german-chords.ly Thu Apr 19 12:56:39 2001
+++ ./ly/german-chords.ly Sat Dec 29 23:51:44 2001
@@ -14,7 +14,7 @@
(list 7 (+ (if german-Bb 0 1) (caddr pitch)))
(cdr pitch)
)))
- (cons
+ (list
(list-ref '("C" "D" "E" "F" "G" "A" "H" "B") (car dopitch))
(accidental->text-super (cadr dopitch))
)
diff -urN ../lilypond-1.4.9/ly/property.ly ./ly/property.ly
--- ../lilypond-1.4.9/ly/property.ly Fri May 18 17:40:58 2001
+++ ./ly/property.ly Sat Dec 29 23:51:44 2001
@@ -18,6 +18,13 @@
tieDown = \property Voice.Tie \override #'direction = #-1
tieBoth = \property Voice.Tie \revert #'direction
+
+dotsUp = \property Voice.Dots \override #'direction = #1
+dotsDown = \property Voice.Dots \override #'direction = #-1
+dotsBoth = \property Voice.Dots \revert #'direction
+
+
+
dynamicUp = {
\property Voice.DynamicText \override #'direction = #1
\property Voice.DynamicLineSpanner \override #'direction = #1
@@ -84,18 +91,21 @@
\stemUp
\slurUp
\tieUp
+ \dotsUp
}
voiceTwo = {
\stemDown
\slurDown
\tieDown
+ \dotsDown
}
voiceThree = {
\stemUp
\slurUp
\tieUp
+ \dotsUp
\shiftOn
}
@@ -103,6 +113,7 @@
\stemDown
\slurDown
\tieDown
+ \dotsDown
\shiftOn
}
@@ -147,8 +158,8 @@
emptyText = \property Voice.textNonEmpty = ##f
fatText = \property Voice.textNonEmpty = ##t
-showStaffSwitch = \property PianoStaff.followVoice = ##t
-hideStaffSwitch = \property PianoStaff.followVoice = ##f
+showStaffSwitch = \property Voice.followVoice = ##t
+hideStaffSwitch = \property Voice.followVoice = ##f
% To remove a Volta bracet or some other graphical object,
diff -urN ../lilypond-1.4.9/mf/GNUmakefile ./mf/GNUmakefile
--- ../lilypond-1.4.9/mf/GNUmakefile Sun Nov 18 01:08:53 2001
+++ ./mf/GNUmakefile Thu Nov 29 14:03:25 2001
@@ -67,3 +67,5 @@
rm -f *.tfm *.log
+
+out/feta-test16.dvi: feta-eindelijk.mf
diff -urN ../lilypond-1.4.9/mf/feta-eindelijk.mf ./mf/feta-eindelijk.mf
--- ../lilypond-1.4.9/mf/feta-eindelijk.mf Sat Feb 24 22:06:31 2001
+++ ./mf/feta-eindelijk.mf Sun Dec 9 23:24:30 2001
@@ -27,13 +27,17 @@
% stem#:=1/8*staff_space#;
stem# = 1/5staff_space#;
+
+%%
+%% DOCME: what is FLARE, what is STEM
+%%
% flare# = 2/3staff_space#;
flare# = 2/3staff_space# - 1/8stafflinethickness#;
define_pixels(stem,flare);
ball_crook_stem = stem;
-ball_crook_balldiam =flare;
+ball_crook_balldiam = flare;
save block_rest_y, block_rest_x;
@@ -175,6 +179,54 @@
fet_endchar;
+
+%
+% Draw a (rest) crook, starting at thickness STEM in point A,
+% ending a ball W to the left, diameter BALLDIAM
+% ypart of the center of the ball is BALLDIAM/4 lower than ypart A
+%
+
+
+%
+% TODO: this is rather ugly, the bulb is too circular, making for
+% abrupt change in direction (z5r{right}), which gives a strange bend
+% since y1r == y5r.
+%
+% Also, the crook-bulb change gives a sharp concave corner, probably not
+% good either.
+%
+
+def balled_crook(expr a, w, balldiam, stem) =
+begingroup;
+ save x,y;
+ save valley_pen_angle;
+
+ penpos1(balldiam/2,-90);
+ penpos2(balldiam/2,0);
+ penpos3(balldiam/2,90);
+ penpos4(balldiam/2,180);
+ x4r=xpart a-w; y3r=ypart a+balldiam/4;
+ x1l=x2l=x3l=x4l;
+ y1l=y2l=y3l=y4l;
+ valley_pen_angle := 250;
+% valley_pen_angle := 247;
+% x5l=x4r+9/8balldiam - 0.5 * stem * (xpart (dir(250)));
+ x5 =x4r+9/8balldiam;
+
+ y5r=y1r;
+ penpos5(0.95 stem,valley_pen_angle);
+
+ penpos6(stem,260);
+ x6l=xpart a; y6l=ypart a;
+
+% fill z1r{right} .. z2r .. z3r .. z4r .. z1r .. z5r
+% .. z6r -- z6l .. z5l .. z1l .. z4l .. z3l .. z2l .. cycle;
+ penstroke z1e..z2e..z3e..z4e..z1e..z5e{right}..z6e;
+ penlabels(1,2,3,4,5,6);
+endgroup;
+enddef;
+
+
def rest_crook(expr a, w) =
balled_crook(a, w, ball_crook_balldiam, ball_crook_stem)
enddef;
diff -urN ../lilypond-1.4.9/mf/feta-generic.mf ./mf/feta-generic.mf
--- ../lilypond-1.4.9/mf/feta-generic.mf Tue Aug 14 13:45:04 2001
+++ ./mf/feta-generic.mf Thu Nov 29 14:03:25 2001
@@ -38,11 +38,11 @@
input feta-custodes;
else:
% input feta-bolletjes;
-& input feta-banier;
-% input feta-eindelijk;
+% input feta-banier;
+ input feta-eindelijk;
% input feta-klef;
% input feta-toevallig;
- input feta-schrift;
+% input feta-schrift;
% input feta-haak;
% %input feta-timesig;
% input feta-pendaal;
diff -urN ../lilypond-1.4.9/mf/feta-macros.mf ./mf/feta-macros.mf
--- ../lilypond-1.4.9/mf/feta-macros.mf Thu Apr 13 21:23:41 2000
+++ ./mf/feta-macros.mf Fri Nov 23 00:54:42 2001
@@ -10,7 +10,7 @@
makegrid(0pt,0pt for i:=-4.8pt step .2pt until 4.8pt: ,i endfor)
(0pt,0pt for i:=-4.8pt step .2pt until 4.8pt: ,i endfor);
fi
- enddef;
+enddef;
def treq =
tracingequations := tracingonline := 1;
@@ -168,30 +168,6 @@
endgroup;
enddef;
-%
-% Draw a (rest) crook, starting at thickness STEM in point A,
-% ending a ball W to the left, diameter BALLDIAM
-% ypart of the center of the ball is BALLDIAM/4 lower than ypart A
-%
-def balled_crook(expr a, w, balldiam, stem) =
-begingroup;
- save x,y;
- penpos1(balldiam/2,-90);
- penpos2(balldiam/2,0);
- penpos3(balldiam/2,90);
- penpos4(balldiam/2,180);
- x4r=xpart a-w; y3r=ypart a+balldiam/4;
- x1l=x2l=x3l=x4l;
- y1l=y2l=y3l=y4l;
- penpos5(stem,250);
- x5=x4r+9/8balldiam; y5r=y1r;
- penpos6(stem,260);
- x6l=xpart a; y6l=ypart a;
- penstroke z1e..z2e..z3e..z4e..z1e..z5e{right}..z6e;
- penlabels(1,2,3,4,5,6);
-endgroup;
-enddef;
-
def y_mirror_char =
currentpicture := currentpicture yscaled -1;
set_char_box(charbp, charwd, charht, chardp);
diff -urN ../lilypond-1.4.9/mf/feta-test16.mf ./mf/feta-test16.mf
--- ../lilypond-1.4.9/mf/feta-test16.mf Thu Sep 2 02:17:49 1999
+++ ./mf/feta-test16.mf Fri Nov 23 00:54:42 2001
@@ -7,7 +7,7 @@
test:=1;
% smoked cheese
-% test := -1;
+%test := -1;
% dem piksels.
diff -urN ../lilypond-1.4.9/po/fr.po ./po/fr.po
--- ../lilypond-1.4.9/po/fr.po Sun Sep 16 21:17:12 2001
+++ ./po/fr.po Fri Nov 30 21:13:05 2001
@@ -1,74 +1,74 @@
-# it.po -- GNU LilyPond's french language file
-# Laurent Martelli , 1998.
+# Messages français pour lilypond.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Michel Robitaille , 1996.
#
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: lilypond 1.3.18\n"
+"Project-Id-Version: lilypond 1.4.9\n"
"POT-Creation-Date: 2001-09-09 17:30+0200\n"
-"PO-Revision-Date: 1999-12-28 00:32 +1\n"
-"Last-Translator: Laurent Martelli \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2001-11-30 12:00-0500\n"
+"Last-Translator: Michel Robitaille \n"
+"Language-Team: French \n"
"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
#: ly2dvi.py:106
msgid "Generate .dvi with LaTeX for LilyPond"
-msgstr ""
+msgstr "Générer un fichier .dvi à l'aide de LaTeX pour LilyPond"
#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93
#: update-lily.py:118 warn.cc:23
msgid "warning: "
-msgstr "avertissement: "
+msgstr "AVERTISSEMENT: "
#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848
#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9
#: warn.cc:17
msgid "error: "
-msgstr "erreur: "
+msgstr "Erreur: "
#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125
-#, fuzzy
msgid "Exiting ... "
-msgstr "Ligne ..."
+msgstr "Fin d'exécution... "
#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... FILE"
-msgstr "Usage: %s [OPTION... [FICHIER]"
+msgstr "Usage: %s [OPTION]... FICHIER"
#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187
msgid "Options:"
-msgstr "Options: "
+msgstr "Options:"
#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191
-#, fuzzy, c-format
+#, c-format
msgid "Report bugs to %s"
-msgstr "Rapporter les bugs "
+msgstr "Rapporter toutes anomalies à %s"
#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208
#, c-format
msgid "Invoking `%s'"
-msgstr ""
+msgstr "Invocation de `%s'"
#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211
#, c-format
msgid "command exited with value %d"
-msgstr ""
+msgstr "fin de la commande avec l'état %d"
#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213
msgid "(ignored)"
-msgstr ""
+msgstr "(ignoré)"
#: ly2dvi.py:322
-#, fuzzy, c-format
+#, c-format
msgid "Cleaning %s..."
-msgstr "Cration des voix..."
+msgstr "Nettoyage de %s..."
#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237
-#, fuzzy, c-format
+#, c-format
msgid "no such setting: %s"
-msgstr "Pas d'instrument tel: `%s'"
+msgstr ""
#: ly2dvi.py:350 main.cc:113
msgid "write Makefile dependencies for every input file"
@@ -80,26 +80,24 @@
#: ly2dvi.py:352 main.cc:111 main.cc:116
msgid "DIR"
-msgstr "REP"
+msgstr "RÉP"
#: ly2dvi.py:352
-#, fuzzy
msgid "add DIR to LilyPond's search path"
-msgstr "ajoute REP au chemin de recherche"
+msgstr "ajouter le RÉPERTOIRE au chemin de recherche de LilyPond"
#: ly2dvi.py:353
#, c-format
msgid "keep all output, and name the directory %s.dir"
-msgstr ""
+msgstr "conserver toutes les sortie et nommer le répertoire %s.dir"
#: ly2dvi.py:354
msgid "don't run LilyPond"
-msgstr ""
+msgstr "ne pas exécuter LilyPond"
#: ly2dvi.py:355 main.cc:114
-#, fuzzy
msgid "produce MIDI output only"
-msgstr "produit seulement la sortie MIDI"
+msgstr "produire une sortie MIDI seulement"
#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115
msgid "FILE"
@@ -107,23 +105,23 @@
#: ly2dvi.py:356
msgid "write ouput to FILE"
-msgstr ""
+msgstr "produire la sortie dans le FICHIER"
#: ly2dvi.py:357
msgid "find pfa fonts used in FILE"
-msgstr ""
+msgstr "repérer les fontes pfa utilisées dans le FICHIER"
#: ly2dvi.py:359
msgid "generate PostScript output"
-msgstr ""
+msgstr "générer une sortie PostScript"
#: ly2dvi.py:360
msgid "KEY=VAL"
-msgstr ""
+msgstr "CLÉ=VALEUR"
#: ly2dvi.py:360
msgid "change global setting KEY to VAL"
-msgstr ""
+msgstr "modifier le paramètre globale de la CLÉ à VAL"
#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255
msgid "verbose"
@@ -131,36 +129,36 @@
#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256
msgid "print version number"
-msgstr "afficher le numro de version"
+msgstr "afficher le numéro de version"
#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258
msgid "show warranty and copyright"
msgstr ""
#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605
-#, fuzzy, c-format
+#, c-format
msgid "Running %s..."
-msgstr "Cration des voix..."
+msgstr "Exécution de %s..."
#: ly2dvi.py:398
-#, fuzzy, c-format
+#, c-format
msgid "Analyzing %s..."
-msgstr "Cration des voix..."
+msgstr "Analyse de %s..."
#: ly2dvi.py:454
#, c-format
msgid "no lilypond output found for %s"
-msgstr ""
+msgstr "aucune sortie n'a été trouvée pour %s"
#: ly2dvi.py:496
-#, fuzzy, c-format
+#, c-format
msgid "invalid value: %s"
-msgstr "caractres illgal: `%c'"
+msgstr "valeur invalide: %s"
#: ly2dvi.py:639
-#, fuzzy, c-format
+#, c-format
msgid "not a PostScript file: `%s'"
-msgstr "impossible d'ouvrir le fichier: `%s'"
+msgstr "n'est pas un fichier PostScript: `%s'"
#: ly2dvi.py:657
#, c-format
@@ -168,42 +166,42 @@
msgstr ""
#: ly2dvi.py:824 scores.cc:44
-#, fuzzy, c-format
+#, c-format
msgid "dependencies output to `%s'..."
-msgstr "Sortie papier vers %s..."
+msgstr ""
#: ly2dvi.py:835
-#, fuzzy, c-format
+#, c-format
msgid "%s output to `%s'..."
-msgstr "Sortie de Lily vers %s..."
+msgstr ""
#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837
#: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
#, c-format
msgid "can't find file: `%s'"
-msgstr "ne peut pas trouver le fichier: `%s'"
+msgstr "ne peut repérer le fichier: `%s'"
#: ly2dvi.py:848
msgid "no files specified on command line."
-msgstr ""
+msgstr "aucun fichier spéficié sur la ligne de commande."
#: mup2ly.py:51
msgid "Convert mup to ly"
-msgstr ""
+msgstr "Conversion de mup vers ly"
#: mup2ly.py:166
#, c-format
msgid "%s is far from completed. Not all constructs are recognised."
-msgstr ""
+msgstr "%s est loin d'être complet. Tous les construits n'ont pas été reconnus."
#: mup2ly.py:964
-#, fuzzy, c-format
+#, c-format
msgid "no such context: %s"
-msgstr "Pas d'instrument tel: `%s'"
+msgstr "pas de tel contexte: %s"
#: mup2ly.py:1115
msgid "debug"
-msgstr ""
+msgstr "débug"
#: mup2ly.py:1116
msgid "define macro NAME [optional expansion EXP]"
@@ -211,39 +209,39 @@
#: main.cc:115 mup2ly.py:1118
msgid "write output to FILE"
-msgstr ""
+msgstr "produire la sortie dans le FICHIER"
#: mup2ly.py:1119
msgid "only pre-process"
-msgstr ""
+msgstr "pré-traitement seulement"
#: mup2ly.py:1200
-#, fuzzy, c-format
+#, c-format
msgid "Processing `%s'..."
-msgstr "Traitement..."
+msgstr "Traitement de `%s'..."
#: mup2ly.py:1219
-#, fuzzy, c-format
+#, c-format
msgid "Writing `%s'..."
-msgstr "Ligne ..."
+msgstr "Écriture de `%s'..."
#: update-lily.py:51
msgid "Fetch and rebuild from latest source package"
-msgstr ""
+msgstr "Repérer et reconstruire depuis les sources du dernier package"
#: update-lily.py:223
-#, fuzzy, c-format
+#, c-format
msgid "Cleaning `%s'..."
-msgstr "Cration des voix..."
+msgstr "Nettoyage de `%s'..."
#: update-lily.py:243
#, c-format
msgid "unpack and build in DIR [%s]"
-msgstr ""
+msgstr "dépaqueter et construire dan le RÉPERTOIRE [%s]"
#: update-lily.py:244
msgid "execute COMMAND, subtitute:"
-msgstr ""
+msgstr "exécuter la COMMANDE de substitution:"
#: update-lily.py:245
msgid "%b: build root"
@@ -252,12 +250,11 @@
#: update-lily.py:246
#, c-format
msgid "%n: package name"
-msgstr ""
+msgstr "%n: nom du package"
#: update-lily.py:247
-#, fuzzy
msgid "%r: release directory"
-msgstr "ne peut pas trouver ou crer `%s'"
+msgstr ""
#: update-lily.py:248
msgid "%t: tarball"
@@ -265,12 +262,12 @@
#: update-lily.py:249
msgid "%v: package version"
-msgstr ""
+msgstr "%v: version du package"
#: update-lily.py:252
#, c-format
msgid "keep all output, and name the directory %s"
-msgstr ""
+msgstr "conserver toutes les sorties et nommer le répertoire %s"
#: update-lily.py:253
msgid "upon failure notify EMAIL[,EMAIL]"
@@ -286,9 +283,9 @@
msgstr ""
#: update-lily.py:365
-#, fuzzy, c-format
+#, c-format
msgid "Listing `%s'..."
-msgstr "Ligne ..."
+msgstr "Listage de `%s'..."
#: update-lily.py:426
#, c-format
@@ -301,29 +298,28 @@
msgstr ""
#: update-lily.py:435 update-lily.py:448
-#, fuzzy, c-format
+#, c-format
msgid "Fetching `%s'..."
-msgstr "Cration des voix..."
+msgstr ""
#: update-lily.py:457
-#, fuzzy, c-format
+#, c-format
msgid "Building `%s'..."
-msgstr "Cration des voix..."
+msgstr ""
#: data-file.cc:54
-#, fuzzy
msgid "EOF in a string"
-msgstr "EOF dans une chane"
+msgstr "Fin de fichier (EOF) dans la chaîne"
#: getopt-long.cc:145
#, c-format
msgid "option `%s' requires an argument"
-msgstr "l'option `%s' requiert un argument"
+msgstr "L'option `%s' requiert un argument"
#: getopt-long.cc:149
#, c-format
msgid "option `%s' doesn't allow an argument"
-msgstr "l'option `%s' n'accepte pas d'argument"
+msgstr "L'option `%s' ne requiert pas un argument"
#: getopt-long.cc:153
#, c-format
@@ -333,12 +329,11 @@
#: getopt-long.cc:160
#, c-format
msgid "invalid argument `%s' to option `%s'"
-msgstr "argument `%s' invalide pour l'option `%s'"
+msgstr "argument invalide `%s' pour l'option `%s'"
#: input.cc:96
-#, fuzzy
msgid "non fatal error: "
-msgstr "Erreur non fatale: "
+msgstr "pas une erreur fatale: "
#: input.cc:104 source-file.cc:63 source-file.cc:156
msgid "position unknown"
@@ -346,47 +341,45 @@
#: mapped-file-storage.cc:74
msgid "can't map file"
-msgstr "impossible de mapper le fichier"
+msgstr ""
#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45
#: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
#, c-format
msgid "can't open file: `%s'"
-msgstr "impossible d'ouvrir le fichier: `%s'"
+msgstr "ne peut ouvrir le fichier: `%s'"
#: simple-file-storage.cc:56
-#, fuzzy, c-format
+#, c-format
msgid "Huh? Got %d, expected %d characters"
-msgstr "Hein? %d caractres reus, %d attendus"
+msgstr ""
#: text-stream.cc:10
msgid ""
-msgstr ""
+msgstr ""
#: warn.cc:36
-#, fuzzy
msgid "programming error: "
-msgstr "Erreur de programmation: "
+msgstr "erreur de programmation: "
#: warn.cc:36
-#, fuzzy
msgid " (Continuing; cross thumbs)"
-msgstr " (je continure; croisez les doigts)"
+msgstr " (Poursuite; croisons les doigts)"
#: afm.cc:59
-#, fuzzy, c-format
+#, c-format
msgid "can't find character number: %d"
-msgstr "impossible de trouver le caractres numro %d"
+msgstr "ne peut repérer le numéro de caractère: %d"
#: afm.cc:74
-#, fuzzy, c-format
+#, c-format
msgid "can't find character called: `%s'"
-msgstr "impossible de trouver le caractres appel `%s'"
+msgstr "ne peut repérer le caractère portant le nom: `%s'"
#: afm.cc:124
#, c-format
msgid "Error parsing AFM file: `%s'"
-msgstr ""
+msgstr "Erreur d'analyse syntaxique du fichier AFM: `%s'"
#: all-font-metrics.cc:95
#, c-format
@@ -396,37 +389,34 @@
#: all-font-metrics.cc:97
#, c-format
msgid "does not match: `%s'"
-msgstr ""
+msgstr "ne concorde pas: `%s'"
#: all-font-metrics.cc:102
-msgid ""
-" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V "
-"to show font paths."
+msgid " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V to show font paths."
msgstr ""
#: all-font-metrics.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "can't find font: `%s'"
-msgstr "ne peut pas trouver le fichier: `%s'"
+msgstr "ne peut repérer la fonte: `%s'"
#: all-font-metrics.cc:168
-#, fuzzy
msgid "Loading default font"
-msgstr "Impossible de trouver la police `%s', chargement la police par dfaut"
+msgstr "Chargement de la fonte par défaut"
#: all-font-metrics.cc:183
-#, fuzzy, c-format
+#, c-format
msgid "can't find default font: `%s'"
-msgstr "Impossible de trouver la fonte par dfaut `%s', abandon."
+msgstr "ne peut reprérer la fonte par défaut: `%s'"
#: all-font-metrics.cc:184 includable-lexer.cc:51 scores.cc:137
-#, fuzzy, c-format
+#, c-format
msgid "(search path: `%s')"
-msgstr "chemin de recherche= %s"
+msgstr "(chemin de recherche: `%s')"
#: all-font-metrics.cc:185
msgid "Giving up"
-msgstr ""
+msgstr "Abandon"
#: auto-change-iterator.cc:43 change-iterator.cc:59
#: part-combine-music-iterator.cc:97
@@ -434,51 +424,46 @@
msgstr ""
#: beam-engraver.cc:91 beam-engraver.cc:124
-#, fuzzy
msgid "can't find start of beam"
-msgstr "impossible de trouver le caractres numro %d"
+msgstr ""
#: beam-engraver.cc:158
-#, fuzzy
msgid "already have a beam"
-msgstr "Il y a dj une barre"
+msgstr ""
#: beam-engraver.cc:222
-#, fuzzy
msgid "unterminated beam"
-msgstr "Barre non termine"
+msgstr ""
#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195
-#, fuzzy
msgid "stem must have Rhythmic structure"
-msgstr "La tige doit avoir une structure rythmique."
+msgstr ""
#: beam-engraver.cc:272
msgid "stem doesn't fit in beam"
-msgstr "la tige ne rentre pas dans la barre"
+msgstr ""
#: beam-engraver.cc:273
msgid "beam was started here"
-msgstr "la barre a commenc ici"
+msgstr ""
#: beam.cc:86
-#, fuzzy
msgid "beam has less than two stems"
-msgstr "barre avec moins de deux tiges"
+msgstr ""
#: beam.cc:637
msgid "weird beam vertical offset"
msgstr ""
#: break-align-item.cc:136
-#, fuzzy, c-format
+#, c-format
msgid "unknown spacing pair `%s', `%s'"
-msgstr "traducteur inconnu `%s'"
+msgstr ""
#: change-iterator.cc:21
#, c-format
msgid "can't change `%s' to `%s'"
-msgstr "impossible de changer `%s' en `%s'"
+msgstr ""
#.
#. We could change the current translator's id, but that would make
@@ -505,41 +490,36 @@
#: chord.cc:376
#, c-format
msgid "invalid subtraction: not part of chord: %s"
-msgstr "soustraction invalide: ne fait pas partie de l'accord: %s"
+msgstr ""
#: chord.cc:405
#, c-format
msgid "invalid inversion pitch: not part of chord: %s"
-msgstr "renversement invalide: ne fait pas partie de l'accord: %s"
+msgstr ""
#: collision.cc:127
-#, fuzzy
msgid "Too many clashing notecolumns. Ignoring them."
-msgstr "Trop de colonnes de notes superposes. Je les ignore."
+msgstr ""
#: dimensions.cc:13
msgid "NaN"
msgstr ""
#: dynamic-engraver.cc:197 span-dynamic-performer.cc:86
-#, fuzzy
msgid "can't find start of (de)crescendo"
-msgstr "ne peut pas trouver un (de)crescendo la fin"
+msgstr ""
#: dynamic-engraver.cc:222
-#, fuzzy
msgid "already have a crescendo"
-msgstr "Il y a dj une barre"
+msgstr ""
#: dynamic-engraver.cc:223
-#, fuzzy
msgid "already have a decrescendo"
-msgstr "Il y a dj une barre"
+msgstr ""
#: dynamic-engraver.cc:317
-#, fuzzy
msgid "unterminated (de)crescendo"
-msgstr "crescendo non termin"
+msgstr ""
#: extender-engraver.cc:97
msgid "unterminated extender"
@@ -562,9 +542,8 @@
msgstr ""
#: grace-iterator.cc:43
-#, fuzzy
msgid "no Grace context available"
-msgstr "pas une vrai variable"
+msgstr ""
#: grace-position-engraver.cc:96
msgid "Unattached grace notes. Attaching to last musical column."
@@ -575,9 +554,8 @@
msgstr ""
#: hairpin.cc:94
-#, fuzzy
msgid "crescendo too small"
-msgstr "trop petit"
+msgstr ""
#: hyphen-engraver.cc:90
msgid "unterminated hyphen"
@@ -616,7 +594,7 @@
#: line-of-score.cc:267
msgid "Calculating column positions..."
-msgstr "Calcul de la position des colonnes..."
+msgstr ""
#: lyric-phrasing-engraver.cc:284
msgid "lyrics found without any matching notehead"
@@ -646,23 +624,20 @@
msgstr ""
#: main.cc:110
-#, fuzzy
msgid "FIELD"
-msgstr "FICHIER"
+msgstr ""
#: main.cc:110
msgid "write header field to BASENAME.FIELD"
msgstr ""
#: main.cc:111
-#, fuzzy
msgid "add DIR to search path"
-msgstr "ajoute REP au chemin de recherche"
+msgstr ""
#: main.cc:112
-#, fuzzy
msgid "use FILE as init file"
-msgstr "utilise FICHIER comme fichier d'initialisation"
+msgstr ""
#: main.cc:116
msgid "prepend DIR to dependencies"
@@ -676,29 +651,24 @@
#. No version number or newline here. It confuses help2man
#.
#: main.cc:137
-#, fuzzy, c-format
+#, c-format
msgid "Usage: %s [OPTION]... FILE..."
-msgstr "Usage: %s [OPTION]... [FICHIER]..."
+msgstr "Usage: %s [OPTION]... FICHIER..."
#: main.cc:139
msgid "Typeset music and or play MIDI from FILE"
msgstr ""
#: main.cc:143
-#, fuzzy
msgid ""
"LilyPond is a music typesetter. It produces beautiful sheet music\n"
"using a high level description file as input. LilyPond is part of \n"
"the GNU Project.\n"
msgstr ""
-"Lilypond est un formateur de musique. Il produit de belle\n"
-"paritions partir de description de gaut niveau en entre. Lilypond\n"
-"fait partie du projet GNU.\n"
#: main.cc:153
-#, fuzzy
msgid "This binary was compiled with the following options:"
-msgstr "Cet excutable a t compil avec les options suivantes:"
+msgstr "Ce binaire a été compilé avec les options suivantes:"
#: main.cc:56 main.cc:180
#, c-format
@@ -711,12 +681,11 @@
#: main.cc:63 main.cc:187 main.cc:199
#, c-format
msgid "Copyright (c) %s by"
-msgstr "Copyright (c) %s par"
+msgstr "Copyright (c) %s écrit par"
#: main.cc:197
-#, fuzzy
msgid "GNU LilyPond -- The music typesetter"
-msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU"
+msgstr ""
#: main.cc:72 main.cc:205
msgid ""
@@ -736,9 +705,9 @@
msgstr ""
#: midi-item.cc:139
-#, fuzzy, c-format
+#, c-format
msgid "no such instrument: `%s'"
-msgstr "Pas d'instrument tel: `%s'"
+msgstr ""
#: midi-item.cc:228
msgid "silly duration"
@@ -749,9 +718,9 @@
msgstr ""
#: music-output-def.cc:115
-#, fuzzy, c-format
+#, c-format
msgid "can't find `%s' context"
-msgstr "ne peut pas trouver `%s'"
+msgstr "ne peut repérer le contexte `%s'"
#: music.cc:232
msgid "ly_get_mus_property (): Not a Music"
@@ -802,36 +771,35 @@
msgstr ""
#: paper-def.cc:109
-#, fuzzy, c-format
+#, c-format
msgid "paper output to `%s'..."
-msgstr "Sortie papier vers %s..."
+msgstr ""
#: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
msgid ", at "
-msgstr ", "
+msgstr ", à "
#: paper-outputter.cc:232
-#, fuzzy, c-format
+#, c-format
msgid "writing header field `%s' to `%s'..."
-msgstr "impossible d'ouvrir le fichier: `%s'"
+msgstr ""
#: paper-score.cc:80
msgid "Preprocessing elements..."
-msgstr ""
+msgstr "Pré-traitement des éléments..."
#: paper-score.cc:114
msgid "Outputting Score, defined at: "
msgstr ""
#: paper-stream.cc:41
-#, fuzzy, c-format
+#, c-format
msgid "can't create directory: `%s'"
-msgstr "ne peut pas trouver ou crer `%s'"
+msgstr ""
#: paper-stream.cc:55
-#, fuzzy
msgid "Error syncing file (disk full?)"
-msgstr ")"
+msgstr ""
#.
#. We could change the current translator's id, but that would make
@@ -850,22 +818,20 @@
msgstr ""
#: percent-repeat-engraver.cc:117
-#, fuzzy
msgid "Don't know how to handle a percent repeat of this length."
-msgstr "ne sait pas traiter les cls vides"
+msgstr ""
#: percent-repeat-iterator.cc:53
msgid "no one to print a percent"
msgstr ""
#: performance.cc:51
-#, fuzzy
msgid "Track ... "
-msgstr "Piste ... "
+msgstr ""
#: performance.cc:83
msgid "Creator: "
-msgstr "Auteur: "
+msgstr "Créateur: "
#: performance.cc:113
#, c-format
@@ -875,23 +841,21 @@
#: performance.cc:168
#, c-format
msgid "MIDI output to `%s'..."
-msgstr ""
+msgstr "Sortie MIDI vers `%s'..."
#: phrasing-slur-engraver.cc:119
-#, fuzzy
msgid "unterminated phrasing slur"
-msgstr "Barre non termine"
+msgstr ""
#: phrasing-slur-engraver.cc:134
-#, fuzzy
msgid "can't find start of phrasing slur"
-msgstr "impossible de trouver le caractres numro %d"
+msgstr ""
#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154
#: piano-pedal-performer.cc:87
-#, fuzzy, c-format
+#, c-format
msgid "can't find start of piano pedal: `%s'"
-msgstr "ne peut pas trouver le fichier: `%s'"
+msgstr ""
#: pitch.cc:25
msgid "Pitch arguments out of range"
@@ -905,9 +869,9 @@
msgstr ""
#: property-engraver.cc:145
-#, fuzzy, c-format
+#, c-format
msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
-msgstr "Mauvais type pour la valeur de la proprit"
+msgstr ""
#: rest-collision.cc:194
msgid "too many colliding rests"
@@ -918,14 +882,13 @@
msgstr ""
#: scm-option.cc:63
-#, fuzzy
msgid "Scheme options:"
-msgstr "Options: "
+msgstr ""
#: score-engraver.cc:188
-#, fuzzy, c-format
+#, c-format
msgid "unbound spanner `%s'"
-msgstr "traducteur inconnu `%s'"
+msgstr ""
#: score.cc:78
msgid "Interpreting music..."
@@ -941,18 +904,18 @@
msgstr ""
#: score.cc:112
-#, fuzzy, c-format
+#, c-format
msgid "elapsed time: %.2f seconds"
-msgstr "temps ecoul: %.2f secondes"
+msgstr ""
#: scores.cc:106
msgid "Score contains errors; will not process it"
msgstr ""
#: scores.cc:152
-#, fuzzy, c-format
+#, c-format
msgid "Now processing: `%s'"
-msgstr "chane d'chappement inconnue: `\\%s'"
+msgstr ""
#: script-engraver.cc:66
#, c-format
@@ -971,9 +934,8 @@
#. How to shut up this warning, when Voice_devnull_engraver has
#. eaten start request?
#: slur-engraver.cc:144
-#, fuzzy
msgid "can't find start of slur"
-msgstr "impossible de trouver le caractres numro %d"
+msgstr ""
#: slur.cc:48
msgid "Putting slur over rest. Ignoring."
@@ -989,24 +951,20 @@
msgstr ""
#: stem.cc:116
-#, fuzzy
msgid "Weird stem size; check for narrow beams"
-msgstr "dcallage de barre bizarre, check your knees"
+msgstr ""
#: text-spanner-engraver.cc:94
-#, fuzzy
msgid "can't find start of text spanner"
-msgstr "impossible de trouver le caractres numro %d"
+msgstr ""
#: text-spanner-engraver.cc:114
-#, fuzzy
msgid "already have a text spanner"
-msgstr "Il y a dj une barre"
+msgstr ""
#: text-spanner-engraver.cc:169
-#, fuzzy
msgid "unterminated text spanner"
-msgstr "Barre non termine"
+msgstr ""
#: text-spanner.cc:121
msgid "Text_spanner too small"
@@ -1023,19 +981,19 @@
msgstr ""
#: tfm.cc:77
-#, fuzzy, c-format
+#, c-format
msgid "can't find ascii character: %d"
-msgstr "ne peut pas trouver le caractre ascii `%d'"
+msgstr ""
#. How to shut up this warning, when no notes appeared because
#. they were suicided by Thread_devnull_engraver?
#: tie-engraver.cc:220 tie-performer.cc:173
msgid "No ties were created!"
-msgstr "Aucune liaison n'a t cre"
+msgstr ""
#: tie-engraver.cc:240
msgid "lonely tie"
-msgstr "liaison solitaire"
+msgstr ""
#: time-scaled-music-iterator.cc:25
msgid "no one to print a tuplet start bracket"
@@ -1047,44 +1005,42 @@
msgstr ""
#: translator-ctors.cc:40
-#, fuzzy, c-format
+#, c-format
msgid "unknown translator: `%s'"
-msgstr "traducteur inconnu `%s'"
+msgstr "traducteur inconnu: `%s'"
#: translator-def.cc:99
msgid "Program has no such type"
msgstr ""
#: translator-def.cc:105
-#, fuzzy, c-format
+#, c-format
msgid "Already contains: `%s'"
-msgstr "Contient dj un `%s'"
+msgstr "Contient déjà: `%s'"
#: translator-def.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "Not adding translator: `%s'"
-msgstr "traducteur inconnu `%s'"
+msgstr ""
#: translator-def.cc:224
-#, fuzzy, c-format
+#, c-format
msgid "can't find: `%s'"
-msgstr "ne peut pas trouver `%s'"
+msgstr ""
#: translator-group.cc:146
#, c-format
msgid "can't find or create `%s' called `%s'"
-msgstr "ne peut pas trouver ou crer `%s' nomm `%s'"
+msgstr ""
#: translator-group.cc:231
-#, fuzzy, c-format
+#, c-format
msgid "can't find or create: `%s'"
-msgstr "ne peut pas trouver ou crer `%s'"
+msgstr ""
#: translator-group.cc:414
#, c-format
-msgid ""
-"Can't find property type-check for `%s'. Perhaps you made a typing error? "
-"Doing assignment anyway."
+msgid "Can't find property type-check for `%s'. Perhaps you made a typing error? Doing assignment anyway."
msgstr ""
#: translator-group.cc:428
@@ -1112,7 +1068,7 @@
#: parser.yy:121
#, c-format
msgid "Expecting %d arguments"
-msgstr ""
+msgstr "%d arguements attendus"
#: parser.yy:423
msgid "Identifier should have alphabetic characters only"
@@ -1143,29 +1099,25 @@
msgstr ""
#: parser.yy:1409
-#, fuzzy
msgid "Must have duration object"
-msgstr "Positionne la plus petite dure (?)"
+msgstr ""
#: parser.yy:1418 parser.yy:1426
-#, fuzzy
msgid "Have to be in Lyric mode for lyrics"
-msgstr "il fayt tre en mode Parole pour les paroles"
+msgstr ""
#: parser.yy:1579 parser.yy:1636
#, c-format
msgid "not a duration: %d"
-msgstr "pas une dure: %d"
+msgstr ""
#: parser.yy:1645
-#, fuzzy
msgid "Have to be in Note mode for notes"
-msgstr "il faut tre en mode Note pour les notes"
+msgstr ""
#: parser.yy:1731
-#, fuzzy
msgid "Have to be in Chord mode for chords"
-msgstr "il faut tre en mode Accord pour les accords"
+msgstr ""
#: parser.yy:1911
msgid "need integer number arg"
@@ -1173,16 +1125,16 @@
#: lexer.ll:174
msgid "EOF found inside a comment"
-msgstr "EOF trouv dans un commentaire"
+msgstr ""
#: lexer.ll:188
msgid "\\maininput disallowed outside init files"
msgstr ""
#: lexer.ll:212
-#, fuzzy, c-format
+#, c-format
msgid "wrong or undefined identifier: `%s'"
-msgstr "indentifiant non dfini: `%s'"
+msgstr ""
#. backup rule
#: lexer.ll:221
@@ -1192,7 +1144,7 @@
#. backup rule
#: lexer.ll:243 lexer.ll:247
msgid "white expected"
-msgstr "blanche attendue"
+msgstr ""
#: lexer.ll:256
msgid "Can't evaluate Scheme in safe mode"
@@ -1203,24 +1155,24 @@
msgstr ""
#: lexer.ll:457
-#, fuzzy, c-format
+#, c-format
msgid "invalid character: `%c'"
-msgstr "caractres illgal: `%c'"
+msgstr ""
#: lexer.ll:538
#, c-format
msgid "unknown escaped string: `\\%s'"
-msgstr "chane d'chappement inconnue: `\\%s'"
+msgstr ""
#: lexer.ll:617
#, c-format
msgid "Oldest supported input version: %s"
-msgstr "Plus ancienne version supporte: %s"
+msgstr ""
#: lexer.ll:629
-#, fuzzy, c-format
+#, c-format
msgid "incorrect lilypond version: %s (%s, %s)"
-msgstr "version de mudela incorrecte: %s (%s, %s)"
+msgstr "version de lilypond incorrecte: %s (%s, %s)"
#: lexer.ll:630
msgid "Consider converting the input with the convert-ly script"
@@ -1232,14 +1184,14 @@
msgstr ""
#: lilypond-score.cc:108
-#, fuzzy, c-format
+#, c-format
msgid "LY output to `%s'..."
-msgstr "Sortie de Lily vers %s..."
+msgstr ""
#: lilypond-score.cc:119
-#, fuzzy, c-format
+#, c-format
msgid "track %d:"
-msgstr "piste "
+msgstr "piste %d:"
#: lilypond-score.cc:155
msgid "Processing..."
@@ -1247,7 +1199,7 @@
#: lilypond-score.cc:164
msgid "Creating voices..."
-msgstr "Cration des voix..."
+msgstr "Création des voies..."
#: lilypond-score.cc:168
msgid "track "
@@ -1255,15 +1207,15 @@
#: lilypond-score.cc:177
msgid "NOT Filtering tempo..."
-msgstr "PAS de filtrage du tempo..."
+msgstr ""
#: lilypond-score.cc:186
msgid "NOT Quantifying columns..."
-msgstr "PAS de quantification des colonnes..."
+msgstr ""
#: lilypond-score.cc:190
msgid "Quantifying columns..."
-msgstr "Quantification des colonnes..."
+msgstr ""
#: lilypond-score.cc:223
msgid "Settling columns..."
@@ -1274,28 +1226,27 @@
msgstr ""
#: lilypond-staff.cc:210
-#, fuzzy
msgid "% MIDI instrument:"
-msgstr "Pas d'instrument tel: `%s'"
+msgstr ""
#: lilypond-stream.cc:37
#, c-format
msgid "lily indent level: %d"
-msgstr "Niveau d'indentation de lily: %d"
+msgstr ""
#. Maybe better not to translate these?
#: lilypond-stream.cc:83
msgid "% Creator: "
-msgstr "% Auteur: "
+msgstr ""
#: lilypond-stream.cc:88
msgid "% Automatically generated"
-msgstr "% Gnr automatiquement"
+msgstr "% automatiquement généré"
#: lilypond-stream.cc:97
#, c-format
msgid "% from input file: "
-msgstr "% dal file di input: "
+msgstr ""
#: main.cc:94
msgid "write exact durations, e.g.: a4*385/384"
@@ -1303,7 +1254,7 @@
#: main.cc:95
msgid "enable debugging output"
-msgstr ""
+msgstr "autoriser la mise au point de sortie"
#: main.cc:97
msgid "ACC[:MINOR]"
@@ -1318,9 +1269,8 @@
msgstr ""
#: main.cc:99
-#, fuzzy
msgid "set FILE as default output"
-msgstr " -o, --output=FILE set FILE come output di default\n"
+msgstr ""
#: main.cc:100
msgid "don't output tuplets"
@@ -1328,7 +1278,7 @@
#: main.cc:101
msgid "be quiet"
-msgstr "mode silencieux"
+msgstr ""
#: main.cc:102
msgid "don't output rests or skips"
@@ -1339,9 +1289,8 @@
msgstr ""
#: main.cc:103
-#, fuzzy
msgid "set smallest duration"
-msgstr "Positionne la plus petite dure (?)"
+msgstr ""
#: main.cc:104
msgid "don't timestamp the output"
@@ -1358,12 +1307,11 @@
#: main.cc:115
#, c-format
msgid "Usage: %s [OPTION]... [FILE]"
-msgstr "Usage: %s [OPTION... [FICHIER]"
+msgstr "Usage: %s [OPTION]... [FICHIER]"
#: main.cc:117
-#, fuzzy
msgid "Translate MIDI-file to lilypond"
-msgstr "Traduction du fichier MIDI en mudela"
+msgstr "Traduire un fichier-MIDI en format lilypond"
#: main.cc:131
#, c-format
@@ -1392,31 +1340,27 @@
#: midi-parser.cc:64
msgid "zero length string encountered"
-msgstr "chane de taille vide rencontre"
+msgstr ""
#: midi-score-parser.cc:44
msgid "MIDI header expected"
-msgstr "entte MIDI attendue"
+msgstr "En-tête MIDI attendue"
#: midi-score-parser.cc:49
-#, fuzzy
msgid "invalid header length"
-msgstr "Taille d'entte invalide"
+msgstr "longueur invalide d'en-tête"
#: midi-score-parser.cc:52
-#, fuzzy
msgid "invalid MIDI format"
-msgstr "vnement MIDI invalide"
+msgstr "format MIDI invalide"
#: midi-score-parser.cc:55
-#, fuzzy
msgid "invalid number of tracks"
-msgstr "Nombre de pistes invalide"
+msgstr "nombre invalide de pistes"
#: midi-score-parser.cc:58
-#, fuzzy
msgid "can't handle non-metrical time"
-msgstr "temps non mtrique"
+msgstr ""
#: midi-track-parser.cc:68
#, c-format
@@ -1425,15 +1369,15 @@
#: midi-track-parser.cc:124
msgid "invalid running status"
-msgstr ""
+msgstr "état d'exécution invalide"
#: midi-track-parser.cc:328
msgid "unimplemented MIDI meta-event"
-msgstr "meta-vnement MIDI non implment"
+msgstr "méta-événement MIDI non implanté"
#: midi-track-parser.cc:333
msgid "invalid MIDI event"
-msgstr "vnement MIDI invalide"
+msgstr "événement MIDI invalide"
#: midi-track-parser.cc:348
msgid "MIDI track expected"
@@ -1441,275 +1385,4 @@
#: midi-track-parser.cc:353
msgid "invalid track length"
-msgstr "taille de piste invalide"
-
-#, fuzzy
-#~ msgid "Fetching `%'s..."
-#~ msgstr "Cration des voix..."
-
-#, fuzzy
-#~ msgid "Lily output to %s..."
-#~ msgstr "Sortie de Lily vers %s..."
-
-#~ msgid "Wrong type for property value"
-#~ msgstr "Mauvais type pour la valeur de la proprit"
-
-#, fuzzy
-#~ msgid "not enough fields in Dstream init"
-#~ msgstr "Pas assez de champs dans l'initialisation de Dstream."
-
-#, fuzzy
-#~ msgid "floating point exception"
-#~ msgstr "Exceptions de virgule flottante"
-
-#, fuzzy
-#~ msgid "can't set mem-checking!"
-#~ msgstr "impossible de positionner mem-checking"
-
-#, fuzzy
-#~ msgid "Dependency file left in `%s'"
-#~ msgstr "impossible d'ouvrir le fichier: `%s'"
-
-#, fuzzy
-#~ msgid "Report bugs to bug-gnu-music@gnu.org"
-#~ msgstr "Rapporter les bugs "
-
-#, fuzzy
-#~ msgid "Usage: ly2dvi [OPTION]... FILE\n"
-#~ msgstr "Usage: %s [OPTION... [FICHIER]"
-
-#, fuzzy
-#~ msgid "wrong identifier type, expected: `%s'"
-#~ msgstr "Mauvais type d'indentifiant: "
-
-#~ msgid "Automatically generated"
-#~ msgstr "Gnr automatiquement"
-
-#, fuzzy
-#~ msgid "Wrong type for property"
-#~ msgstr "Mauvais type pour la valeur de la proprit"
-
-#, fuzzy
-#~ msgid "unknown clef type"
-#~ msgstr "type de cl inconnu"
-
-#~ msgid "Aborting"
-#~ msgstr "Annulation"
-
-#, fuzzy
-#~ msgid "lost in time:"
-#~ msgstr "perdu dans le temps"
-
-#, fuzzy
-#~ msgid "No key name, assuming `C'"
-#~ msgstr "Pas de nom de cl: Do assum"
-
-#, fuzzy
-#~ msgid "out of tune:"
-#~ msgstr "hors de la tonalit"
-
-#~ msgid "unknown paper variable: `%s'"
-#~ msgstr "variable papier inconnue: `%s'"
-
-#~ msgid "not a real variable"
-#~ msgstr "pas une vrai variable"
-
-#~ msgid "Debug output disabled. Compiled with NPRINT."
-#~ msgstr "Messages de deboggage dsactivs. Compil avec NPRINT."
-
-#~ msgid "No Beam to end"
-#~ msgstr "Pas de barre la fin (No beam to end)"
-
-#~ msgid "No beam to end"
-#~ msgstr "Pas de barre la fin (No beam to end)"
-
-#~ msgid "0 lines"
-#~ msgstr "0 ligne"
-
-#~ msgid "1 line (of %.0f columns)"
-#~ msgstr "1 ligne (de %.0f colonnes)"
-
-#~ msgid "%d lines (with an average of %.1f columns)"
-#~ msgstr "%d lignes (avec une moyenne de %.f colonnes)"
-
-#~ msgid "score does not have any columns"
-#~ msgstr "la partition n'a aucune colonne"
-
-#, fuzzy
-#~ msgid "approximated %s"
-#~ msgstr "approximativement %s"
-
-#, fuzzy
-#~ msgid "calculated %s exactly"
-#~ msgstr "calcul %s exactement"
-
-#~ msgid "No abbreviation beam to end"
-#~ msgstr "Pas de barre d'abrviation la fin"
-
-#~ msgid "Already have an abbreviation beam"
-#~ msgstr "Il y a dj une barre d'abrviation"
-
-#~ msgid "Unfinished abbreviation beam"
-#~ msgstr "Barre d'abrviation non termine"
-
-#~ msgid "Too many crescendi here"
-#~ msgstr "Trop de crescendi ici"
-
-#~ msgid "%s expected"
-#~ msgstr "%s attendu"
-
-#~ msgid "Can not find file `%s'"
-#~ msgstr "Ne peut pas trouver le fichier `%s'"
-
-#~ msgid "can't find"
-#~ msgstr "pas trouv"
-
-#~ msgid "Can't open `%s'\n"
-#~ msgstr "Ne peut pas ouvrir `%s'\n"
-
-#~ msgid "Search path %s\n"
-#~ msgstr "Chemin de recherche %s\n"
-
-#~ msgid " elements. "
-#~ msgstr " lments. "
-
-#~ msgid "time: %.2f seconds"
-#~ msgstr "dure: %.2f secondes"
-
-#~ msgid "cadenza"
-#~ msgstr "cadence"
-
-#~ msgid "partial measure must be non-negative"
-#~ msgstr "mesure partielle ne peut pas tre ngative"
-
-#~ msgid "partial measure too large"
-#~ msgstr "mesure partielle trop grande"
-
-#~ msgid "Will ignore \\relative for transposed music"
-#~ msgstr "\\relative sera ignor pour la musique transpose"
-
-#~ msgid "ugh, this measure is too long"
-#~ msgstr "oops, cette mesure est trop longue"
-
-#~ msgid "breakpoint: %d"
-#~ msgstr "point d'arrt: %d"
-
-#~ msgid "generating stupido solution"
-#~ msgstr "gnration de solutions stupides"
-
-#~ msgid "More than one music block"
-#~ msgstr "Plus d'un bloc de musique"
-
-#~ msgid "can't abbreviate"
-#~ msgstr "ne peut pas abrger"
-
-#~ msgid "Invalid midi format"
-#~ msgstr "Format MIDI invalide"
-
-#~ msgid "can't handle %s"
-#~ msgstr "ne peut pas traiter %s"
-
-#~ msgid "Parsing...\n"
-#~ msgstr "Analyse...\n"
-
-#, fuzzy
-#~ msgid "enable debugging output "
-#~ msgstr " -D, --debug abilita l'output di debugging\n"
-
-#, fuzzy
-#~ msgid "don't timestamp the output "
-#~ msgstr ""
-#~ " -T, --no-timestamps non inserisce marcatori temporali nell'output\n"
-
-#~ msgid " -a, --about about LilyPond\n"
-#~ msgstr " -a, --about cos' LilyPond\n"
-
-#~ msgid " -h, --help this help\n"
-#~ msgstr " -h, --help questo help\n"
-
-#~ msgid " -f, --output-format=X use output format X\n"
-#~ msgstr " -f, --output-format=X usa il formato dell'ouput X\n"
-
-#~ msgid " -o, --output=FILE set FILE as default output base\n"
-#~ msgstr ""
-#~ " -o, --output=FILE indica FILE come base di default per l'output\n"
-
-#~ msgid " -V, --ignore-version ignore mudela version\n"
-#~ msgstr " -V, --ignore-version ignora la versione di mudela\n"
-
-#~ msgid "GNU LilyPond is Free software, see --warranty"
-#~ msgstr "GNU LilyPond Free software, vedi --warranty"
-
-#~ msgid " -D, --debug enable debugging output\n"
-#~ msgstr " -D, --debug abilita l'output di debugging\n"
-
-#, fuzzy
-#~ msgid " -p, --no-tuplets assume no tuplets\n"
-#~ msgstr " -p, --no-plets assume che non ci siano gruppetti\n"
-
-#~ msgid " -q, --quiet be quiet\n"
-#~ msgstr " -q, --quiet sii silenzioso\n"
-
-#~ msgid ""
-#~ " -s, --smallest=N assume no shorter (reciprocal) durations than N\n"
-#~ msgstr ""
-#~ " -s, --smallest=N assume che non ci siano durate (reciproche) "
-#~ "inferiori a N\n"
-
-#~ msgid " -v, --verbose be verbose\n"
-#~ msgstr " -v, --verbose sii loquace\n"
-
-#, fuzzy
-#~ msgid "Midi2ly, translate midi to mudela"
-#~ msgstr "Mi2mu, tradice midi in mudela"
-
-#~ msgid "of"
-#~ msgstr "de"
-
-#~ msgid "please fix me"
-#~ msgstr "corrigez moi, s'il vous plait"
-
-#~ msgid "stem at %s doesn't fit in beam"
-#~ msgstr "Queue %s ne rentre pas dans la barre"
-
-#~ msgid "No stem direction set. Ignoring column in clash."
-#~ msgstr "."
-
-#~ msgid "\\relative mode changed here, old value: "
-#~ msgstr "\\mode relatif chang ici, valeur prcdante: "
-
-#~ msgid "ignoring zero duration added to column at %s"
-#~ msgstr "dure nulle ajoute la colonne %s ignore"
-
-#~ msgid "script needs stem direction"
-#~ msgstr "scipt a besoin de direction de la queue"
-
-#~ msgid "unconnected column: %d"
-#~ msgstr "colonne non connecte: %d"
-
-#~ msgid ""
-#~ "Staff_side::get_position_f(): somebody forgot to set my direction, "
-#~ "returning -20"
-#~ msgstr ""
-#~ "taff_side::get_position_f(): quelqu'un a oubli de positionner ma "
-#~ "direction, je retourne -20"
-
-#~ msgid "have to be in Note mode for @chords"
-#~ msgstr "il faut tre en mode Note pour @chords"
-
-#~ msgid ""
-#~ "LilyPond is the GNU Project music typesetter. This program can print\n"
-#~ "beautiful sheet music from a music definition file. It can also play\n"
-#~ "mechanical performances to a MIDI file. Features include multiple\n"
-#~ "staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,\n"
-#~ "beams, slurs, triplets, named chords, transposing, formatting scores, \n"
-#~ "part extraction. It includes a nice font of musical symbols.\n"
-#~ msgstr ""
-#~ "Lilypond est le formateur de musique du projet GNU. Ce programme peut\n"
-#~ "imprimer de belles partitions de musiques partir d'un fichier de\n"
-#~ "dfinition de musique. Il peut aussi jouer automaiquement le morceau\n"
-#~ "vers un fichier midi. Ses caractristiques incluent plusieurs portes,\n"
-#~ "mtre, cls, tonalits, paroles, language d'entre polyvalent, cadences,\n"
-#~ "barres, liaison, triplets, accords nomms, transposition, formattage des\n"
-#~ "paritions, extraction de parties. Il inclue une jolie police de symbol\n"
-#~ "musicaux.\n"
+msgstr "longueur de piste invalide"
diff -urN ../lilypond-1.4.9/scm/grob-description.scm ./scm/grob-description.scm
--- ../lilypond-1.4.9/scm/grob-description.scm Sun Nov 18 17:51:04 2001
+++ ./scm/grob-description.scm Mon Dec 3 13:04:04 2001
@@ -115,10 +115,13 @@
(BreathingSign . (
(break-align-symbol . Breathing_sign)
(breakable . #t )
- (molecule-callback . ,Breathing_sign::brew_molecule)
+ (molecule-callback . ,Text_item::brew_molecule)
+ (lookup . name)
+ (font-family . music)
+ (text . "scripts-rcomma")
(Y-offset-callbacks . (,Breathing_sign::offset_callback))
(visibility-lambda . ,begin-of-line-invisible)
- (meta . ,(grob-description "BreathingSign" break-aligned-interface))
+ (meta . ,(grob-description "BreathingSign" break-aligned-interface text-interface font-interface))
))
(Clef . (
diff -urN ../lilypond-1.4.9/scm/translator-property-description.scm ./scm/translator-property-description.scm
--- ../lilypond-1.4.9/scm/translator-property-description.scm Fri May 4 01:31:43 2001
+++ ./scm/translator-property-description.scm Mon Dec 3 13:04:04 2001
@@ -291,7 +291,7 @@
(translator-property-description 'squashedPosition integer? " Vertical position of
squashing for Pitch_squash_engraver.")
(translator-property-description 'staffsFound list? "list of all staff-symbols found.")
-(translator-property-description 'stanza string? "Stanza `number' to print at start of a verse. Use in LyricsVoice context.")
+(translator-property-description 'stanza markup? "Stanza `number' to print at start of a verse. Use in LyricsVoice context.")
(translator-property-description 'stemLeftBeamCount integer? "
@@ -300,7 +300,7 @@
is erased.
.")
(translator-property-description 'stemRightBeamCount integer? "idem, for the right side.")
-(translator-property-description 'stz string? "Abbreviated form for a stanza, see also Stanza property.")
+(translator-property-description 'stz markup? "Abbreviated form for a stanza, see also Stanza property.")
(translator-property-description 'textNonEmpty boolean? " If set
to true then text placed above or below the staff is not assumed to
have zero width. @code{\fatText} and @code{\emptyText} are predefined
diff -urN ../lilypond-1.4.9/scripts/abc2ly.py ./scripts/abc2ly.py
--- ../lilypond-1.4.9/scripts/abc2ly.py Sun Nov 18 01:08:53 2001
+++ ./scripts/abc2ly.py Sat Dec 29 23:54:03 2001
@@ -1271,7 +1271,7 @@
http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) To LilyPond input.
-Report bugs to bug-gnu-music@gnu.org
+Report bugs to bug-lilypond@gnu.org
Written by Han-Wen Nienhuys , Laura Conrad
, Roy Rankin
diff -urN ../lilypond-1.4.9/scripts/etf2ly.py ./scripts/etf2ly.py
--- ../lilypond-1.4.9/scripts/etf2ly.py Sun Nov 18 01:08:53 2001
+++ ./scripts/etf2ly.py Sat Dec 29 23:54:03 2001
@@ -1101,7 +1101,7 @@
Finale product. This program will convert a subset of ETF to a
ready-to-use lilypond file.
-Report bugs to bug-gnu-music@gnu.org
+Report bugs to bug-lilypond@gnu.org
Written by Han-Wen Nienhuys
""")
diff -urN ../lilypond-1.4.9/scripts/lilypond-book.py ./scripts/lilypond-book.py
--- ../lilypond-1.4.9/scripts/lilypond-book.py Tue Nov 20 18:21:13 2001
+++ ./scripts/lilypond-book.py Sat Dec 29 23:54:03 2001
@@ -51,13 +51,22 @@
if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
program_version = '1.4.9'
-#
+# if set, LILYPONDPREFIX must take prevalence
+# if datadir is not set, we're doing a build and LILYPONDPREFIX
+datadir = '@datadir@'
+
+if os.environ.has_key ('LILYPONDPREFIX') :
+ datadir = os.environ['LILYPONDPREFIX']
+else:
+ datadir = '@datadir@'
+
+while datadir[-1] == os.sep:
+ datadir= datadir[:-1]
+
# Try to cater for bad installations of LilyPond, that have
# broken TeX setup. Just hope this doesn't hurt good TeX
# setups. Maybe we should check if kpsewhich can find
# feta16.{afm,mf,tex,tfm}, and only set env upon failure.
-#
-datadir = '@datadir@'
environment = {
'MFINPUTS' : datadir + '/mf:',
'TEXINPUTS': datadir + '/tex:' + datadir + '/ps:.:',
@@ -66,6 +75,13 @@
'GS_LIB' : datadir + '/ps',
}
+# tex needs lots of memory, more than it gets by default on Debian
+non_path_environment = {
+ 'extra_mem_top' : '1000000',
+ 'extra_mem_bottom' : '1000000',
+ 'pool_size' : '250000',
+}
+
def setup_environment ():
for key in environment.keys ():
val = environment[key]
@@ -73,7 +89,10 @@
val = val + os.pathsep + os.environ[key]
os.environ[key] = val
-
+ for key in non_path_environment.keys ():
+ val = non_path_environment[key]
+ print '%s=%s' % (key,val)
+ os.environ[key] = val
include_path = [os.getcwd()]
@@ -132,6 +151,16 @@
self.m_geo_x_marginparsep = None
self.__body = None
def set_geo_option(self, name, value):
+
+ if type(value) == type(""):
+ m = re.match ("([0-9.]+)(cm|in|pt|mm|em|ex)",value)
+ if m:
+ unit = m.group (2)
+ num = string.atof(m.group (1))
+ conv = dimension_conversion_dict[m.group(2)]
+
+ value = conv(num)
+
if name == 'body' or name == 'text':
if type(value) == type(""):
self.m_geo_textwidth = value
@@ -194,9 +223,9 @@
elif name[-5:] == 'paper':
self.m_papersize = name
else:
- pass
+ pass
# what is _set_dimen ?? /MB
- #self._set_dimen('m_geo_'+name, value)
+ #self._set_dimen('m_geo_'+name, value)
def __setattr__(self, name, value):
if type(value) == type("") and \
dimension_conversion_dict.has_key (value[-2:]):
@@ -307,6 +336,7 @@
dimension_conversion_dict ={
'mm': mm2pt,
+ 'cm': lambda x: mm2pt(10*x),
'in': in2pt,
'em': em2pt,
'ex': ex2pt,
@@ -371,9 +401,9 @@
'output-verbatim': "\\begin{verbatim}%s\\end{verbatim}",
'output-default-post': "\\def\postLilypondExample{}\n",
'output-default-pre': "\\def\preLilypondExample{}\n",
- 'usepackage-graphics': '\\usepackage{graphicx}\n',
- 'output-eps': '\\noindent\\parbox{\\lilypondepswidth{%(fn)s.eps}}{\includegraphics[width=\\lilypondepswidth{%(fn)s.eps}]{%(fn)s.eps}}',
- 'output-tex': '\\preLilypondExample \\input %(fn)s.tex \\postLilypondExample\n',
+ 'usepackage-graphics': '\\usepackage{graphics}\n',
+ 'output-eps': '\\noindent\\parbox{\\lilypondepswidth{%(fn)s.eps}}{\includegraphics{%(fn)s.eps}}',
+ 'output-tex': '{\\preLilypondExample \\input %(fn)s.tex \\postLilypondExample\n}',
'pagebreak': r'\pagebreak',
},
'texi' : {'output-lilypond': """@lilypond[%s]
@@ -426,15 +456,15 @@
re_dict = {
'latex': {'input': r'(?m)^[^%\n]*?(?P\\mbinput{?([^}\t \n}]*))',
'include': r'(?m)^[^%\n]*?(?P\\mbinclude{(?P[^}]+)})',
- 'option-sep' : ', *',
+ 'option-sep' : ',\s*',
'header': r"\\documentclass\s*(\[.*?\])?",
'geometry': r"^(?m)[^%\n]*?\\usepackage\s*(\[(?P.*)\])?\s*{geometry}",
'preamble-end': r'(?P\\begin{document})',
'verbatim': r"(?s)(?P\\begin{verbatim}.*?\\end{verbatim})",
'verb': r"(?P\\verb(?P.).*?(?P=del))",
- 'lilypond-file': r'(?m)^[^%\n]*?(?P\\lilypondfile(\[(?P.*?)\])?\{(?P.+)})',
- 'lilypond' : r'(?m)^[^%\n]*?(?P\\lilypond(\[(?P.*?)\])?{(?P.*?)})',
- 'lilypond-block': r"(?sm)^[^%\n]*?(?P\\begin(\[(?P.*?)\])?{lilypond}(?P.*?)\\end{lilypond})",
+ 'lilypond-file': r'(?m)^[^%\n]*?(?P\\lilypondfile\s*(\[(?P.*?)\])?\s*\{(?P.+)})',
+ 'lilypond' : r'(?m)^[^%\n]*?(?P\\lilypond\s*(\[(?P.*?)\])?\s*{(?P.*?)})',
+ 'lilypond-block': r"(?sm)^[^%\n]*?(?P\\begin\s*(\[(?P.*?)\])?\s*{lilypond}(?P.*?)\\end{lilypond})",
'def-post-re': r"\\def\\postLilypondExample",
'def-pre-re': r"\\def\\preLilypondExample",
'usepackage-graphics': r"\usepackage{graphics}",
@@ -456,8 +486,12 @@
'verb': r"""(?P@code{.*?})""",
'lilypond-file': '(?m)^(?!@c)(?P@lilypondfile(\[(?P.*?)\])?{(?P[^}]+)})',
'lilypond' : '(?m)^(?!@c)(?P@lilypond(\[(?P.*?)\])?{(?P.*?)})',
+# pyton2.2b2 barfs on this
'lilypond-block': r"""(?m)^(?!@c)(?P(?s)(?P@lilypond(\[(?P.*?)\])?\s(?P.*?)@end lilypond\s))""",
- 'option-sep' : ', *',
+
+# 1.5.2 barfs on this.
+# 'lilypond-block': r"""(?m)^(?!@c)(?P@lilypond(\[(?P.*?)\])?\s(?P.*?)@end lilypond\s)""",
+ 'option-sep' : ',\s*',
'intertext': r',?\s*intertext=\".*?\"',
'multiline-comment': r"(?sm)^\s*(?!@c\s+)(?P@ignore\s.*?@end ignore)\s",
'singleline-comment': r"(?m)^.*?(?P(?P@c.*$\n+))",
@@ -500,8 +534,8 @@
str = fd.read ()
s = re.search('%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', str)
if s:
- return (int(s.group(3))-int(s.group(1)),
- int(s.group(4))-int(s.group(2)))
+ return (int (s.group (3) - s.group (1) + 0.5),
+ int (s.group (4) - s.group (2) + 0.5))
else:
return (0,0)
@@ -614,7 +648,7 @@
idx = idx + 1
continue
m = get_re ('header').match(chunks[idx][1])
- if m.group (1):
+ if m <> None and m.group (1):
options = re.split (',[\n \t]*', m.group(1)[1:-1])
else:
options = []
@@ -628,8 +662,8 @@
m = re.match("(\d\d)pt", o)
if m:
paperguru.m_fontsize = int(m.group(1))
-
break
+
while chunks[idx][0] != 'preamble-end':
if chunks[idx] == 'ignore':
idx = idx + 1
diff -urN ../lilypond-1.4.9/scripts/ly2dvi.py ./scripts/ly2dvi.py
--- ../lilypond-1.4.9/scripts/ly2dvi.py Tue Nov 20 18:35:52 2001
+++ ./scripts/ly2dvi.py Thu Dec 13 13:19:13 2001
@@ -110,7 +110,11 @@
def warning (s):
progress (_ ("warning: ") + s)
-
+
+def user_error (s, e=1):
+ errorport.write (program_name + ":" + _ ("error: ") + s + '\n')
+ sys.exit (e)
+
def error (s):
@@ -438,7 +442,7 @@
# search only the first 10k
s = s[:10240]
- for x in ('textheight', 'linewidth', 'papersize', 'orientation'):
+ for x in extra_fields:
m = re.search (r'\\def\\lilypondpaper%s{([^}]*)}'%x, s)
if m:
set_setting (extra, x, m.group (1))
@@ -780,7 +784,7 @@
if files and files[0] != '-':
-
+
# Ugh, maybe make a setup () function
files = map (lambda x: strip_extension (x, '.ly'), files)
@@ -802,6 +806,10 @@
outbase = strip_extension (outbase, i)
files = map (abspath, files)
+ for i in files[:] + [output_name]:
+ if string.find (i, ' ') >= 0:
+ user_error (_ ("filename should not contain spaces: `%s'") % i)
+
if os.path.dirname (output_name) != '.':
dep_prefix = os.path.dirname (output_name)
else:
@@ -889,8 +897,7 @@
else:
# FIXME: read from stdin when files[0] = '-'
help ()
- errorport.write (program_name + ":" + _ ("error: ") + _ ("no files specified on command line.") + '\n')
- sys.exit (2)
+ user_error (_ ("no files specified on command line."), 2)
|