From 2ffc80cdcfa0198aa8749c1b6ec3f3617b489814 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 29 Jan 2002 23:09:51 +0100 Subject: [PATCH] patch::: 1.4.10.jcn1 1.4.10.jcn1 =========== * po: regenerate. * lilypond-1.4.10/midi2ly/lilypond-stream.cc (header): Add xgettext helper comment. * stepmake/bin: backport from 1.5 * Documentation/windows/installing.texi: * Documentation/windows/compiling.texi: Update for Cygwin's teTeX. * Documentation/windows/gs-profile.sh: previously lily-gs.sh 1.4.10 ====== --- CHANGES | 17 + Documentation/windows/compiling.texi | 31 +- Documentation/windows/cygwin-installer.patch | 392 +++++++++---------- Documentation/windows/gs-profile.sh | 10 +- Documentation/windows/installing.texi | 16 +- Documentation/windows/lily-gs.sh | 43 -- Documentation/windows/registry.in | 60 --- VERSION | 2 +- lilypond-font-lock.el | 33 +- lilypond-mode.el | 88 ++++- make/lilypond-vars.make | 4 + midi2ly/lilypond-stream.cc | 1 + po/da.po | 329 +++++++++------- po/de.po | 145 +++---- po/fr.po | 156 ++++---- po/it.po | 145 +++---- po/ja.po | 145 +++---- po/lilypond.pot | 143 +++---- po/nl.po | 150 +++---- po/ru.po | 145 +++---- po/sv.po | 172 ++++---- stepmake/bin/add-html-footer.py | 65 ++- stepmake/bin/package-diff.py | 38 +- stepmake/stepmake/c++-rules.make | 25 +- stepmake/stepmake/c-rules.make | 22 +- 25 files changed, 1262 insertions(+), 1115 deletions(-) diff --git a/CHANGES b/CHANGES index 569457d2e5..493a53f692 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,20 @@ +1.4.10.jcn1 +=========== + +* po: regenerate. + +* lilypond-1.4.10/midi2ly/lilypond-stream.cc (header): Add xgettext +helper comment. + +* stepmake/bin: backport from 1.5 + +* Documentation/windows/installing.texi: +* Documentation/windows/compiling.texi: Update for Cygwin's teTeX. + +* Documentation/windows/gs-profile.sh: previously lily-gs.sh + +1.4.10 +====== 1.4.9.uu2 ========= diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi index 992e2f9cf3..52fdc7581f 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -16,7 +16,7 @@ ftp://ftp.lilypond.org/pub/LilyPond/}. You need the following packages to compile Lilypond on Windows. @table @code -@item The GNU + Cygnus tools, 1.3.2 or newer. +@item The GNU + Cygnus tools, 1.3.6 or newer. 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}. @@ -55,22 +55,18 @@ Apply this patch to the @file{cinstall} directory of @file{winsup-src/cinstall}, to get the LilyPond installer. Compiling @file{setup.exe} has been complicated a bit with the -introduction of the non-feature bzip2. Here's how I did it: +introduction of the bzip2 feature. Here's how I did it: @quotation @example - mkdir cygwin-20011208 && cd cygwin-20011208 + mkdir cygwin-20020129 && cd cygwin-20020129 export CVSROOT=:pserver:anoncvs@@anoncvs.cygnus.com:/cvs/src touch $HOME/.cvspass cvs login - cvs -z3 co -D20011208 winsup + cvs -z3 co -D20020129 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 + (cd ../bz2lib; ./configure; make) + ./configure 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 . @@ -84,21 +80,20 @@ introduction of the non-feature bzip2. Here's how I did it: The standard binary installation installs LilyPond into its own prefix. 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. +Add @file{.exe} to binary executables. @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. +A post installation script that updates a symlink. @item @file{/etc/profile.d/} A number of login profile scripts set environment vars, every time you start the LilyPond/Cygwin shell (or Bash, for that matter). @end table -These scripts and tricks are known to work in some cases, but are -woefully incomplete. If you find a bug, please send us your fix. +These scripts and tricks are known to work, but may be incomplete. If +you find a bug, please send us your fix. Windows users have indicated that a DOS style login (as supposed to the LilyPond/Cygwin shell), would be useful. We don't enjoy DOS scripting, and think users should try the bash shell, which is better suited for -typing in commands. However, if you have written useful DOS login -scripts, please send us your code. - +typing in commands. It really helps a lot and pays off to read some +introduction to this Bash shell. However, if you have written useful +DOS login scripts, please send us your code. diff --git a/Documentation/windows/cygwin-installer.patch b/Documentation/windows/cygwin-installer.patch index dde4332cf3..9a17b9c069 100644 --- a/Documentation/windows/cygwin-installer.patch +++ b/Documentation/windows/cygwin-installer.patch @@ -1,16 +1,14 @@ 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 +--- ../cinstall.orig/ChangeLog Tue Jan 29 21:50:51 2002 ++++ ./ChangeLog Tue Jan 29 22:29:56 2002 +@@ -1,3 +1,20 @@ ++2002-01-29 Jan Nieuwenhuizen + -+ * configure.in (CXXFLAGS): Bugfix. ++ * site.cc (OnMessageCmd): Bugfix: don't try to add NULL url. + -+ * mklink2.c: Compile fix. -+ -+ * Forward port patch to cvs -D20011208. ++ * Forward port patch to cvs -D20020129. + -+ * Makefile.in: Fix realclean target. ++ * mklink2.c: Compile fix. + + * desktop.cc: Remove spurious line breaks from etc_profile. + (make_lily_bat): New function. @@ -21,54 +19,20 @@ diff -purN --exclude=*~ ../cinstall.orig/ChangeLog ./ChangeLog + + * ini.cc (fprintf): Cygwin -> GNU LilyPond + - 2001-12-06 Robert Collins + 2002-01-29 Christopher Faylor - * README: Wishlist updates. -@@ -2458,4 +2477,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa + * configure: Regenerate. +@@ -3288,4 +3305,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 version.c -+ rm -f config.cache config.log config.status -+ $(MAKE) -C zlib realclean - - install: all - $(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir) -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 + %%% $Id: ChangeLog,v 2.189 2002/01/29 14:43:57 cgf Exp $ +-$Revision: 2.189 $ ++$Revision: 2.189.jcn1 $ +Binary files ../cinstall.orig/LilyPond.ico and ./LilyPond.ico differ 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[] = { +--- ../cinstall.orig/desktop.cc Tue Jan 29 10:24:32 2002 ++++ ./desktop.cc Tue Jan 29 10:33:01 2002 +@@ -83,9 +83,7 @@ static const char *etc_profile[] = { "done", "", "export MAKE_MODE=unix", @@ -78,7 +42,7 @@ diff -purN --exclude=*~ ../cinstall.orig/desktop.cc ./desktop.cc + "export PS1='\\[\\033]0;\\w\\007\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]$ '", "", "cd \"$HOME\"", - "", + 0 @@ -204,6 +202,35 @@ make_cygwin_bat () } @@ -168,9 +132,9 @@ diff -purN --exclude=*~ ../cinstall.orig/desktop.cc ./desktop.cc } 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, ...) +--- ../cinstall.orig/ini.cc Tue Jan 29 10:24:34 2002 ++++ ./ini.cc Tue Jan 29 10:33:01 2002 +@@ -282,7 +282,7 @@ fprintf (FILE * f, const char *fmt, ...) { *nl = 0; /*OutputDebugString (stderrbuf); */ @@ -179,136 +143,123 @@ diff -purN --exclude=*~ ../cinstall.orig/ini.cc ./ini.cc stderrbuf[0] = 0; } -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 +--- ../cinstall.orig/msg.cc Sun Dec 23 13:13:29 2001 ++++ ./msg.cc Tue Jan 29 11:10:03 2002 +@@ -47,7 +47,7 @@ mbox (HWND owner, const char *name, int 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 Setup", type | MB_TOPMOST); +- return MessageBox (owner, buf, "Cygwin Setup", type); ++ return MessageBox (owner, buf, "GNU LilyPond Setup", type); } void 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 +--- ../cinstall.orig/res.rc Tue Jan 29 10:24:34 2002 ++++ ./res.rc Tue Jan 29 22:26:51 2002 +@@ -30,7 +30,7 @@ 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 + IDD_SOURCE DIALOG DISCARDABLE 0, 0, 317, 179 + STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU -CAPTION "Cygwin Setup" +CAPTION "GNU LilyPond Setup" FONT 8, "MS Sans Serif" BEGIN -- ICON IDI_CYGWIN,-1,5,5,20,20 -+ ICON IDI_LILYPOND,-1,5,5,20,20 CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button", - 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 +@@ -39,7 +39,7 @@ BEGIN + BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10 + CONTROL "Install from &Local Directory",IDC_SOURCE_CWD,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,101,99,115,10 +- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20 ++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20 + CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "Choose A Download Source",IDC_STATIC_HEADER_TITLE,7,0, +@@ -50,13 +50,13 @@ END + + IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 317, 179 + STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | 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 - 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 @@ END - - IDD_ROOT DIALOG DISCARDABLE 0, 0, 215, 95 - STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU + EDITTEXT IDC_LOCAL_DIR,58,83,165,15,ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,223,83,34,14 + GROUPBOX "Local Package Directory",IDC_STATIC,53,67,210,45 +- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20 ++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20 + CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "Select a directory where you want Setup to store the installation files it dowmloads. The directory will be created if it does not already exist.", +@@ -67,7 +67,7 @@ END + + IDD_ROOT DIALOG DISCARDABLE 0, 0, 317, 179 + STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | 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 - 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 @@ END - - IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206 - 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 "Select Download &Sites",IDC_STATIC,55,5,135,11 - LISTBOX IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT | - 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 + GROUPBOX "Root Directory",IDC_STATIC,5,50,305,40,WS_TABSTOP +@@ -83,7 +83,7 @@ BEGIN + WS_GROUP | WS_TABSTOP,170,120,90,8 + CONTROL "&Unix",IDC_ROOT_BINARY,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,170,135,90,8 +- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20 ++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20 + CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "Select the directory where you want to install Cygwin. Also choose a few installation parameters.", +@@ -96,10 +96,10 @@ IDD_SITE DIALOG DISCARDABLE 0, 0, 317, 1 + STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU + EXSTYLE WS_EX_CONTROLPARENT -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 &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 @@ END - - IDD_NET DIALOGEX 0, 0, 215, 95 - STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20 ++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20 + LISTBOX IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP | + WS_TABSTOP +@@ -119,7 +119,7 @@ END + + IDD_NET DIALOG DISCARDABLE 0, 0, 317, 179 + STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | 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 CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button", - 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 --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 - 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 @@ END - IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95 - STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | - WS_CAPTION | WS_SYSMENU +@@ -137,7 +137,7 @@ BEGIN + NOT WS_GROUP + RTEXT "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT + WS_GROUP +- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20 ++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20 + CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "Setup needs to know how you want it to connect to the internet. Choose the appropriate settings below.", +@@ -149,7 +149,7 @@ END + IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 317, 179 + STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | 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 - 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 @@ END + LTEXT "Installing...",IDC_INS_ACTION,45,55,205,8,NOT WS_GROUP +@@ -164,7 +164,7 @@ BEGIN + LTEXT "Package:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP + LTEXT "Total:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP + LTEXT "Disk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP +- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20 ++ ICON IDI_LILYPOND,IDC_STATIC,290,0,20,20 + CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "This page displays the progress of the download or installation.", +@@ -175,10 +175,10 @@ END IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -321,7 +272,7 @@ diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc 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 @@ END +@@ -192,10 +192,10 @@ END IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -334,59 +285,73 @@ diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc 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,17 +212,14 @@ END - - IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95 - STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +@@ -210,27 +210,26 @@ END + IDD_SPLASH DIALOG DISCARDABLE 0, 0, 317, 179 + STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | + 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 -- LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114, -- 8 -- LTEXT "Version (unknown)",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 +- ICON IDI_CYGWIN,IDC_STATIC,113,112,21,20,WS_GROUP ++ ICON IDI_LILYPOND,IDC_STATIC,113,100,21,20,WS_GROUP + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178 +- LTEXT "Version (unknown)",IDC_VERSION,115,137,195,10 +- LTEXT "Cygwin Net Release Setup Program", ++ LTEXT "Version (1.4.10)",IDC_VERSION,115,137,195,10 ++ LTEXT "GNU LilyPond Setup Program", + IDC_STATIC_WELCOME_TITLE,115,1,195,24 +- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,115,150, +- 195,8 +- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,115,162, +- 195,8 +- LTEXT "This wizard will guide you through the installation and updating of the Cygwin environment and a plethora of GNU packages.", +- IDC_STATIC,115,33,195,54 ++ LTEXT "Copyright (C) 2000-2002 Red Hat Inc.", ++ IDC_STATIC,115,138,195,8 ++ LTEXT " (C) 2001 Jan Nieuwenhuizen ",IDC_STATIC,115,150,195,8 ++ LTEXT "http://www.lilypond.org/cygwin/",IDC_STATIC,115,162,195,8 ++ LTEXT "This wizard will guide you through the installation and updating LilyPond and all other necessary Cygwin packages.",IDC_STATIC,115,33,195,54 END -@@ -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 + + IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 430, 266 + STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU + EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Cygwin Setup" +CAPTION "GNU LilyPond Setup" FONT 8, "MS Sans Serif" BEGIN -- ICON IDI_CYGWIN,IDC_STATIC,0,2,21,20 -+ ICON IDI_LILYPOND,IDC_STATIC,0,2,21,20 + DEFPUSHBUTTON "&Next -->",IDOK,311,242,45,15,WS_GROUP +@@ -243,7 +242,7 @@ BEGIN + CONTROL "E&xp",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON,323,5, + 25,10 + PUSHBUTTON "&View",IDC_CHOOSE_VIEW,353,5,20,10,WS_GROUP +- ICON IDI_CYGWIN,IDC_STATIC,0,2,20,20 ++ ICON IDI_LILYPOND,IDC_STATIC,0,2,20,20 LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,125,5, 99,8 CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT -@@ -256,10 +253,10 @@ END - - IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95 - STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +@@ -257,14 +256,14 @@ END + IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 317, 179 + STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | + 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 - CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button", - BS_AUTOCHECKBOX,55,25,100,8 - CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button", -@@ -271,10 +268,10 @@ END - - IDD_FTP_AUTH DIALOGEX 0, 0, 215, 95 + CONTROL "Create icon on &Desktop",IDC_ROOT_DESKTOP,"Button", + BS_AUTOCHECKBOX,108,78,100,8 + CONTROL "Add icon to &Start Menu",IDC_ROOT_MENU,"Button", + BS_AUTOCHECKBOX,108,93,100,8 +- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20 ++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20 + CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, + 317,1 + LTEXT "Tell setup if you want it to create a few icons for convenient access to the Cygwin environment.", +@@ -275,10 +274,10 @@ END + + IDD_FTP_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Cygwin Setup" +CAPTION "GNU LilyPond Setup" @@ -397,7 +362,16 @@ diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc 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 +@@ -293,7 +292,7 @@ END + IDD_CHOOSER DIALOG DISCARDABLE 0, 0, 247, 116 + STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +-CAPTION "Cygwin Setup" ++CAPTION "GNU LilyPond Setup" + FONT 8, "MS Sans Serif" + BEGIN + CTEXT "This space intentionally left blank",IDC_STATIC,57,45, +@@ -336,6 +335,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. @@ -405,7 +379,7 @@ diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc IDI_CYGWIN ICON DISCARDABLE "cygwin.ico" ///////////////////////////////////////////////////////////////////////////// -@@ -329,6 +327,7 @@ IDI_CYGWIN ICON DISCARDA +@@ -343,6 +343,7 @@ IDI_CYGWIN ICON DISCARDA // FILE // @@ -413,31 +387,28 @@ diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc CYGWIN.ICON FILE DISCARDABLE "cygwin.ico" ///////////////////////////////////////////////////////////////////////////// -@@ -383,7 +382,9 @@ STRINGTABLE DISCARDABLE +@@ -452,7 +453,7 @@ 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/testing/mirrors.lst" ++ IDS_MIRROR_LST "http://www.lilypond.org/cygwin/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)" -@@ -392,7 +393,8 @@ BEGIN +@@ -461,7 +462,7 @@ 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." ++ IDS_INSTALL_COMPLETE "Installation Complete. See http://www.lilypond.org/cygwin/ for support." + IDS_REBOOT_REQUIRED "In-use files have been replaced. You need to reboot as soon as possible to activate the new versions. Cygwin may operate incorrectly until you reboot." 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 @@ +--- ../cinstall.orig/resource.h Tue Jan 29 10:24:34 2002 ++++ ./resource.h Tue Jan 29 10:34:12 2002 +@@ -48,13 +48,14 @@ #define IDB_SPIN 118 #define IDB_RTARROW 119 #define IDI_SPIN 120 @@ -448,7 +419,20 @@ diff -purN --exclude=*~ ../cinstall.orig/resource.h ./resource.h #define IDB_CHECK_NO 124 #define IDB_CHECK_NA 125 #define IDD_FTP_AUTH 126 -+#define IDI_CYGWIN 127 + #define IDD_CHOOSER 127 ++#define IDI_CYGWIN 128 #define IDC_SOURCE_DOWNLOAD 1000 #define IDC_SOURCE_NETINST 1001 #define IDC_SOURCE_CWD 1002 +diff -purN --exclude=*~ ../cinstall.orig/site.cc ./site.cc +--- ../cinstall.orig/site.cc Tue Jan 29 10:24:34 2002 ++++ ./site.cc Tue Jan 29 22:17:13 2002 +@@ -415,6 +415,8 @@ bool SitePage::OnMessageCmd (int id, HWN + { + // User pushed the Add button. + other_url = eget (GetHWND (), IDC_EDIT_USER_URL, other_url); ++ if (!other_url) ++ break; + site_list_type * + newsite = + new diff --git a/Documentation/windows/gs-profile.sh b/Documentation/windows/gs-profile.sh index b3342f8baa..3e533b1f71 100644 --- a/Documentation/windows/gs-profile.sh +++ b/Documentation/windows/gs-profile.sh @@ -2,17 +2,21 @@ # /etc/profile.d/gs-profile.sh -- Check for GhostScript gs550="/usr/windows/gstools/gs5.50" -gs650="/usr/windows/gs/gs6.50/bin" +gs650="/usr/windows/gs/gs6.50" # Maybe read registry, but that may be hairy? # # $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\ # "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="$gs550/lib:"${GS_LIB:=""} fi -if [ -e "$gs650/gswin32.exe" ]; then - PATH="$gs650:$PATH" +if [ -e "$gs650/bin/gswin32.exe" ]; then + PATH="$gs650/bin:$PATH" + GS_LIB="$gs650/lib:"${GS_LIB:=""} fi diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi index daf83226b1..ecaac57d2d 100644 --- a/Documentation/windows/installing.texi +++ b/Documentation/windows/installing.texi @@ -6,10 +6,6 @@ @end html -@html - -@end html - @node Top @top @@ -28,7 +24,7 @@ All the software you need is installed by downloading and running 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 +This installs LilyPond, and Cygwin, GUILE, Python, teTeX and GSView. If you already have some of that software under @file{c:/cygwin}, then don't worry: nothing will be installed twice. @@ -159,10 +155,12 @@ These software packages are included in the LilyPond installation: @table @asis @item A full TeX installation. -Currently, only MikTeX is supported. Download and install -@uref{http://downloads.sourceforge.net/miktex/miktex-2.0-lvl-1.zip,MikTeX}, -or visit @uref{http://www.miktex.org,www.miktex.org}. -@c See @file{/usr/doc/cygwin/tetex-beta-20001218.README} for details. +As of LilyPond versions 1.4.11 (and 1.5.29), only Cygwin's teTeX +installation is supported (packages tetex-beta and texmf-base). It is +part of Cygwin and much more robust for use with LilyPond than MiKTeX. +See @file{/usr/doc/Cygwin/tetex-beta-20001218.README} and +@file{/usr/doc/Cygwin/texmf-20000804-2.README} for details. + @item Ghostview. diff --git a/Documentation/windows/lily-gs.sh b/Documentation/windows/lily-gs.sh index c8c9bd4ad6..e69de29bb2 100644 --- a/Documentation/windows/lily-gs.sh +++ b/Documentation/windows/lily-gs.sh @@ -1,43 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/lily-gs.sh -- Check for GhostScript and GSView - - -gs550="/usr/windows/gstools/gs5.50" -gs650="/usr/windows/gs/gs6.50/bin" - -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" - - - -## 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 - PATH="$gsview26:$PATH" -fi - -if [ -e "$gsview36/gsview32.exe" ]; then - PATH="$gsview36:$PATH" -fi - - - - -export GS_LIB -export PATH diff --git a/Documentation/windows/registry.in b/Documentation/windows/registry.in index b89115b6d2..e69de29bb2 100644 --- a/Documentation/windows/registry.in +++ b/Documentation/windows/registry.in @@ -1,60 +0,0 @@ -regtool -v list HKLM\Software\ -Microsoft\ () -CLASSES\ () -Clients\ () -Description\ () -INTEL\ () -SmartDownload\ () -Netscape\ () -ODBC\ () -LTD\ () -Novell\ () -KasperskyLab\ () -Nico Mak Computing\ () -Avance\ () -Cygnus Solutions\ () -Adobe\ () -TRADOS\ () -RAINBOW TECHNOLOGIES\ () -GNU\ () -Aladdin Ghostscript\ () -Lilypond 1.3.119\ () -MiK\ () -Ghostgum\ () -Python\ () -AFPL Ghostscript\ () - -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\MiK\MiKTeX\CurrentVersion\MiKTeX -TEXMF Root Directories = "C:\cygwin\windows\miktex\spool\texmf;C:\cygwin\windows\MiKTeX" -Install Root = "C:\cygwin\windows\MiKTeX" - -regtool -v list HKLM\Software\Ghostgum\GSview -3.6 = "C:\cygwin\windows\Ghostgum" - -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\ - = "" - -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 --git a/VERSION b/VERSION index 90f3301b7f..7b1f3fb583 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 PATCH_LEVEL=10 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el index 166db820be..dbaf18ca96 100644 --- a/lilypond-font-lock.el +++ b/lilypond-font-lock.el @@ -24,9 +24,7 @@ ;; ;; TODO: -;; - should handle block comments too. ;; - handle lexer modes (\header, \melodic, \lyric) etc. -;; - indentation (defconst LilyPond-font-lock-keywords (let* ((keywords '( ; need special order due to over[lapping] of words @@ -131,7 +129,13 @@ ;; highlight keywords (cons (concat "\\([_^]?\\(" kwregex "\\)\\)+\\($\\|[] \t(~{}>\\\\]\\)") '(0 font-lock-keyword-face t)) - '("\\([][><}{]\\)" 0 font-lock-warning-face t) +;; highlight bracketing constructs + '("\\([][}{]\\)" 0 font-lock-warning-face t) +;; these regexps allow angle-brackets to be highlighted, +;; but leave accented notes, e.g. a b c->, alone + '("[^\\]\\(<\\)" 1 font-lock-warning-face t) + '("[_^-]\\s-*[-^]\\s-*\\(>\\)" 1 font-lock-warning-face t) + '("[^\\t\\n _^-]\\s-*\\(>\\)" 1 font-lock-warning-face t) '("\\([(~)]\\|\\\\<\\|\\\\!\\|\\\\>\\)" 0 font-lock-builtin-face t) @@ -158,24 +162,21 @@ (mapcar (function (lambda (x) (modify-syntax-entry (car x) (cdr x) LilyPond-mode-syntax-table))) - '(( ?\( . "()" ) ( ?\) . ")(" ) ; need matching parens for inline lisp - ( ?\[ . "." ) ( ?\] . "." ) - ( ?\{ . "(}" ) ( ?\} . "){" ) - ( ?\< . "(>" )( ?\> . ")>") + '(( ?\( . "." ) ( ?\) . "." ) + ( ?\[ . "." ) ( ?\] . "." ) + ( ?\{ . "(}2b" ) + ( ?\} . "){4b" ) + ( ?\< . "." )( ?\> . ".") ( ?\$ . "." ) ( ?\% . "." ) ( ?\& . "." ) - ( ?\* . "." ) ( ?\+ . "." ) ( ?\- . "." ) + ( ?\* . "." ) ( ?\+ . "." ) ( ?\/ . "." ) ( ?\= . "." ) ( ?\| . "." ) (?\\ . "\\" ) - ( ?\_ . "." ) + ( ?\- . "." ) ( ?\_ . "." ) ( ?\^ . "." ) ( ?\' . "w") ( ?\" . "\"" ) - ( ?\% . "<") + ( ?\% . ". 1b3b" ) ( ?\n . ">") - -; FIXME -; ( ?% . ". 124b" ) -; ( ?{ . ". 23" ) + ( ?\r . ">") )) - - ) + ) diff --git a/lilypond-mode.el b/lilypond-mode.el index 60e1a9c2cf..91d86d0a91 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -20,14 +20,15 @@ ;;; (load-library "lilypond-font-lock") +(load-library "lilypond-indent") (require 'easymenu) (require 'compile) -(defconst LilyPond-version "1.3.143" +(defconst LilyPond-version "1.4.10" "`LilyPond-mode' version number.") -(defconst LilyPond-help-address "bug-gnu-music@gnu.org" +(defconst LilyPond-help-address "bug-lilypond@gnu.org" "Address accepting submission of bug reports.") (defvar LilyPond-mode-hook nil @@ -85,6 +86,11 @@ in LilyPond-include-path." (and process (eq (process-status process) 'run)))) +(defun Midi-running () + (let ((process (get-process "midi"))) + (and process + (eq (process-status process) 'run)))) + (defun LilyPond-kill-job () "Kill the currently running LilyPond job." (interactive) @@ -143,6 +149,12 @@ in LilyPond-include-path." :group 'LilyPond :type 'string) +(defcustom LilyPond-gv-command "gv -watch" + "Command used to display PS files." + + :group 'LilyPond + :type 'string) + (defcustom LilyPond-midi-command "timidity" "Command used to play MIDI files." @@ -275,6 +287,12 @@ Must be the car of an entry in `LilyPond-command-alist'." (LilyPond-command (LilyPond-command-query (LilyPond-master-file)) 'LilyPond-master-file)) +(defun LilyPond-command-lilypond () + "Run lilypond for the current document." + (interactive) + (LilyPond-command (LilyPond-command-menu "LilyPond") 'LilyPond-master-file) +) + (defun LilyPond-command-formatdvi () "Format the dvi output of the current document." (interactive) @@ -306,11 +324,48 @@ Must be the car of an entry in `LilyPond-command-alist'." ) (defun LilyPond-command-midi () - "View the ps output of current document." + "Play midi corresponding to the current document." (interactive) (LilyPond-command (LilyPond-command-menu "Midi") 'LilyPond-master-file) ) +(defun count-rexp (start end rexp) + "Print number of found regular expressions in the region." + (interactive "r") + (save-excursion + (save-restriction + (narrow-to-region start end) + (goto-char (point-min)) + (count-matches rexp)))) + +(defun count-midi-words () + "Print number of scores before the curser." + (interactive) + (count-rexp (point-min) (point-max) "\\\\midi")) + +(defun count-midi-words-backwards () + "Print number of scores before the curser." + (interactive) + (count-rexp (point-min) (point) "\\\\midi")) + +(defun LilyPond-command-next-midi () + "Play next midi score of the current document." + (interactive) + (if (Midi-running) + (quit-process (get-process "midi") t) + (LilyPond-compile-file + (let ((fname (LilyPond-master-file)) + (allcount (string-to-number (substring (count-midi-words) 0 -12))) + (count (string-to-number (substring (count-midi-words-backwards) 0 -12)))) + (concat LilyPond-midi-command " " + (substring fname 0 -3) ; suppose ".ly" + (if (and (> allcount 1) (> count 0)) ; not first score + (if (eq count allcount) ; last score + (concat "-" (number-to-string (+ count -1))) + (concat "-" (number-to-string count)))) + ".midi")) + "Midi"))) + ;; FIXME, this is broken (defun LilyPond-region-file (begin end) (let ( @@ -416,6 +471,7 @@ command." (if LilyPond-mode-map () (setq LilyPond-mode-map (make-sparse-keymap)) + (define-key LilyPond-mode-map "\C-c\C-l" 'LilyPond-command-lilypond) (define-key LilyPond-mode-map "\C-c\C-r" 'LilyPond-command-region) (define-key LilyPond-mode-map "\C-c\C-b" 'LilyPond-command-buffer) (define-key LilyPond-mode-map "\C-c\C-k" 'LilyPond-kill-job) @@ -425,15 +481,15 @@ command." (define-key LilyPond-mode-map "\C-c\C-s" 'LilyPond-command-smartview) (define-key LilyPond-mode-map "\C-c\C-v" 'LilyPond-command-view) (define-key LilyPond-mode-map "\C-c\C-p" 'LilyPond-command-viewps) - (define-key LilyPond-mode-map "\C-c\C-m" 'LilyPond-command-midi) - (define-key LilyPond-mode-map "\C-cn" 'lilypond-notes) - (define-key LilyPond-mode-map "\C-cs" 'lilypond-score) + (define-key LilyPond-mode-map "\C-c\C-m" 'LilyPond-command-next-midi) + (define-key LilyPond-mode-map "\C-cn" 'LilyPond-insert-tag-notes) + (define-key LilyPond-mode-map "\C-cs" 'LilyPond-insert-tag-score) ) ;;; Menu Support -(define-skeleton lilypond-notes - "Lilypond notes tag." +(define-skeleton LilyPond-insert-tag-notes + "LilyPond notes tag." nil ; (if (bolp) nil ?\n) "\\notes" @@ -441,8 +497,8 @@ command." (concat " \\relative " (skeleton-read "Relative: " "" str))) " { " _ " }") -(define-skeleton lilypond-score - "Lilypond score tag." +(define-skeleton LilyPond-insert-tag-score + "LilyPond score tag." nil (if (bolp) nil ?\n) "\\score {\n" @@ -489,15 +545,15 @@ command." :keys "C-c C-r" :style radio :selected (eq LilyPond-command-current 'LilyPond-command-region) ])) '(("Insert" - [ "\\notes..." lilypond-notes + [ "\\notes..." LilyPond-insert-tag-notes :keys "C-c n" ] - [ "\\score..." lilypond-score + [ "\\score..." LilyPond-insert-tag-score :keys "C-c s" ] )) ; (let ((file 'LilyPond-command-on-current)) ; (mapcar 'LilyPond-command-menu-entry LilyPond-command-alist)) ;;; Some kind of mapping which includes :keys might be more elegant - '([ "LilyPond" (LilyPond-command (LilyPond-command-menu "ViewPS") 'LilyPond-master-file) ]) + '([ "LilyPond" (LilyPond-command (LilyPond-command-menu "LilyPond") 'LilyPond-master-file) :keys "C-c C-l"]) '([ "TeX" (LilyPond-command (LilyPond-command-menu "TeX") 'LilyPond-master-file) ]) '([ "2Dvi" (LilyPond-command (LilyPond-command-menu "2Dvi") 'LilyPond-master-file) :keys "C-c C-d"]) '([ "2PS" (LilyPond-command (LilyPond-command-menu "2PS") 'LilyPond-master-file) :keys "C-c C-f"]) @@ -506,7 +562,7 @@ command." '([ "SmartView" (LilyPond-command (LilyPond-command-menu "SmartView") 'LilyPond-master-file) :keys "C-c C-s"]) '([ "View" (LilyPond-command (LilyPond-command-menu "View") 'LilyPond-master-file) :keys "C-c C-v"]) '([ "ViewPS" (LilyPond-command (LilyPond-command-menu "ViewPS") 'LilyPond-master-file) :keys "C-c C-p"]) - '([ "Midi" (LilyPond-command (LilyPond-command-menu "Midi") 'LilyPond-master-file) :keys "C-c C-m"]) + '([ "Midi (off)" (LilyPond-command-next-midi) :keys "C-c C-m"]) )) (defconst LilyPond-imenu-generic-re "^\\([a-zA-Z_][a-zA-Z0-9_]*\\) *=" @@ -578,8 +634,8 @@ LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous" (setq block-comment-end "%}") (make-local-variable 'indent-line-function) - (setq indent-line-function 'indent-relative-maybe) - + (setq indent-line-function 'LilyPond-indent-line) + (set-syntax-table LilyPond-mode-syntax-table) (setq major-mode 'LilyPond-mode) (setq mode-name "LilyPond") diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 4e03962016..01f6ec105e 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -5,6 +5,10 @@ export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS):: export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd):: export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE) export TFMFONTS:=$(topdir)/mf/out: +export extra_mem_top=1000000 +export extra_mem_bottom=1000000 +export pool_size=250000 + ifdef DEB_BUILD export PKFONTS := $(topdir)/mf/out diff --git a/midi2ly/lilypond-stream.cc b/midi2ly/lilypond-stream.cc index 1f476649a6..e9002be72c 100644 --- a/midi2ly/lilypond-stream.cc +++ b/midi2ly/lilypond-stream.cc @@ -94,6 +94,7 @@ Lilypond_stream::header() time_t t (time (0)); *os_p_ << ctime (&t) << "%\n"; } + /* xgettext:no-c-format */ *os_p_ << _ ("% from input file: "); // *os_p_ << midi_parser_l_g->filename_str_; // ugh diff --git a/po/da.po b/po/da.po index 2089c55f3d..7725594a7b 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.6\n" -"POT-Creation-Date: 2001-06-14 13:22+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "PO-Revision-Date: 2001-09-28 21:00+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -14,169 +14,189 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: ly2dvi.py:105 -msgid "Generate .dvi with LaTeX for LilyPond" -msgstr "Generér .dvi med LaTeX for LilyPond" - -#: data-file.cc:118 input.cc:85 ly2dvi.py:190 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "advarsel: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 -#: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 +#: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 +#: warn.cc:17 msgid "error: " msgstr "fejl: " -#: ly2dvi.py:206 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "Afslutter... " -#: ly2dvi.py:264 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Brug: %s [FLAG]... FIL" -#: ly2dvi.py:268 main.cc:120 main.cc:148 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Flag:" -#: ly2dvi.py:272 main.cc:124 main.cc:171 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" "Rapportér programfejl til %s\n" "Rapportér fejl i oversættelsen til " -#: ly2dvi.py:305 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "Starter \"%s\"" -#: ly2dvi.py:309 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "kommandoen afsluttede med værdi %d" -#: ly2dvi.py:311 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "(ignoreret)" # hær er det spørg om rensning af en temporærkatalog -#: ly2dvi.py:321 +#: ly2dvi.py:242 #, c-format msgid "Cleaning %s..." msgstr "Renser %s..." -#: ly2dvi.py:336 mup2ly.py:214 update-lily.py:237 -#, c-format -msgid "no such setting: %s" -msgstr "indstillingen findes ikke: %s" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "Generér .dvi med LaTeX for LilyPond" -#: ly2dvi.py:349 main.cc:112 +#: ly2dvi.py:305 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "skriv Makefile-afhængigheder for hver inddatafil" # forklaring af flag -h -#: ly2dvi.py:350 main.cc:96 main.cc:108 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "denne hjælp" -#: ly2dvi.py:351 main.cc:110 main.cc:115 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "KATALOG" -#: ly2dvi.py:351 +#: ly2dvi.py:307 msgid "add DIR to LilyPond's search path" msgstr "tilføj KATALOG til LilyPonds søgesti" # %s er programmets navn -#: ly2dvi.py:352 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "behold al uddata, og navngiv kataloget %s.dir" -#: ly2dvi.py:353 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "kør ikke LilyPond" -#: ly2dvi.py:354 main.cc:113 +#: ly2dvi.py:310 main.cc:114 msgid "produce MIDI output only" msgstr "lav kun MIDI-uddata" -#: ly2dvi.py:355 main.cc:99 main.cc:111 main.cc:114 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "FIL" -#: ly2dvi.py:355 +#: ly2dvi.py:311 msgid "write ouput to FILE" msgstr "skriv uddata til FIL" -#: ly2dvi.py:357 +#: ly2dvi.py:312 +msgid "find pfa fonts used in FILE" +msgstr "" + +#: ly2dvi.py:314 msgid "generate PostScript output" msgstr "lav PostScript-uddata" -#: ly2dvi.py:358 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "NØGLE=VÆRDI" -#: ly2dvi.py:358 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "ændr global indstilling NØGLE til VÆRDI" # Førklaring til --verbose (borde være længre) -#: ly2dvi.py:359 main.cc:118 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "udførlig uddata" -#: ly2dvi.py:360 main.cc:105 main.cc:117 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "vis versionsnummer" -#: ly2dvi.py:361 main.cc:107 main.cc:119 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "vis garanti og copyright" -#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, c-format +msgid "no such setting: %s" +msgstr "indstillingen findes ikke: %s" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, c-format msgid "Running %s..." msgstr "Kør %s..." -#: ly2dvi.py:396 +#: ly2dvi.py:440 #, c-format msgid "Analyzing %s..." msgstr "Analyserer %s..." -#: ly2dvi.py:452 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "ingen lilyponduddata fundet for %s" -#: ly2dvi.py:494 +#: ly2dvi.py:538 #, c-format msgid "invalid value: %s" msgstr "ugyldigt værdi: %s" +#: ly2dvi.py:682 +#, fuzzy, c-format +msgid "not a PostScript file: `%s'" +msgstr "kan ikke åbne fil: \"%s\"" + +#: ly2dvi.py:700 +#, c-format +msgid "getopt says: `%s'" +msgstr "" + +#: ly2dvi.py:811 +#, fuzzy, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "Indholder allerede: \"%s\"" + # hær er det spørg om skrivning til en fil -#: ly2dvi.py:781 scores.cc:44 +#: ly2dvi.py:876 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "afhængigheder udskrevet til \"%s\"..." # hær er det spørg om skrivning til en fil (første parametern er t.ex # DVI, LATEX, MIDI, TEX) -#: ly2dvi.py:791 +#: ly2dvi.py:887 #, c-format msgid "%s output to `%s'..." msgstr "%s udskrevet til \"%s\"..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "kan ikke finde fil: \"%s\"" -#: ly2dvi.py:804 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "ingen filer angivne på kommandolinjen." @@ -203,7 +223,7 @@ msgstr "fejls msgid "define macro NAME [optional expansion EXP]" msgstr "definér makro NAVN [valfri makroudvidelse EXP]" -#: main.cc:114 mup2ly.py:1118 +#: main.cc:115 mup2ly.py:1118 msgid "write output to FILE" msgstr "skriv uddata til FIL" @@ -340,7 +360,7 @@ msgstr "ukendt position" msgid "can't map file" msgstr "kan ikke lave \"mmap\" på filen" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 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'" @@ -389,8 +409,12 @@ msgid "does not match: `%s'" msgstr "matcher ikke: \"%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." -msgstr " Genopbyg alle .afm-filer, og fjern alle .pk- og .tfm-filer. Kør igen med -V for at vise skrifttypesøgestier." +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +msgstr "" +" Genopbyg alle .afm-filer, og fjern alle .pk- og .tfm-filer. Kør igen med -V " +"for at vise skrifttypesøgestier." #: all-font-metrics.cc:167 #, c-format @@ -420,13 +444,10 @@ msgstr "Giver op" msgid "Can't switch translators, I'm there already" msgstr "Kan ikke skifte oversætter, jeg er her allerede" -#: beam.cc:86 -msgid "beam has less than two stems" -msgstr "bjælke har mindre end to nodehalse" - -#: beam.cc:637 -msgid "weird beam vertical offset" -msgstr "underlig lodret afstand for bjælke" +#: bar-check-iterator.cc:53 +#, c-format +msgid "barcheck failed at: %s" +msgstr "taktkontrol mislykkedes ved: %s" #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" @@ -452,6 +473,14 @@ msgstr "nodehalsen passer ikke i bj msgid "beam was started here" msgstr "bjælken startede her" +#: beam.cc:86 +msgid "beam has less than two stems" +msgstr "bjælke har mindre end to nodehalse" + +#: beam.cc:637 +msgid "weird beam vertical offset" +msgstr "underlig lodret afstand for bjælke" + #: break-align-item.cc:136 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -476,26 +505,26 @@ msgstr "Jeg er selv msgid "none of these in my family" msgstr "ingen af disse i min familie" -#: chord.cc:369 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 +msgid "unterminated chord tremolo" +msgstr "ikke-afsluttet akkordtremolo" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "der er ingen som kan skrive en tremolo" + +#: chord.cc:376 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ugyldig subtraktion: ikke del af akkord: %s" # "pitch" hær skal alltså være en ton i et akkord -#: chord.cc:398 +#: chord.cc:405 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "ugyldig tone for inversion: ikke del af en akkord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 -msgid "unterminated chord tremolo" -msgstr "ikke-afsluttet akkordtremolo" - -#: chord-tremolo-iterator.cc:48 -msgid "no one to print a tremolos" -msgstr "der er ingen som kan skrive en tremolo" - -#: collision.cc:127 +#: collision.cc:286 msgid "Too many clashing notecolumns. Ignoring them." msgstr "For mange overlappende nodekolonner. Ignorerer dem." @@ -525,7 +554,9 @@ msgstr "uafsluttet udvider" #: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." -msgstr "Der er ingenting at forbinde udvideren mod til venstre. Ignorerer ønsket om udvider" +msgstr "" +"Der er ingenting at forbinde udvideren mod til venstre. Ignorerer ønsket om " +"udvider" #: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" @@ -561,7 +592,9 @@ msgstr "uafsluttet bindestreg" #: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." -msgstr "Der er ingenting at forbinde bindestregen med til venstre. Ignorerer bindestregsforespørgslen." +msgstr "" +"Der er ingenting at forbinde bindestregen med til venstre. Ignorerer " +"bindestregsforespørgslen." #: key-engraver.cc:99 msgid "Conflicting key signatures found." @@ -602,61 +635,62 @@ msgstr "tekst fundet uden noget tilh msgid "Huh? Melismatic note found to have associated lyrics." msgstr "Øh? Melismatisk node har tilhørende tekst." -#: main.cc:104 +#. print example usage: lilypond -e "(set-lily-option 'help 0)" ? +#: main.cc:105 msgid "EXPR" msgstr "UDTR" -#: main.cc:104 +#: main.cc:105 msgid "evalute EXPR as Scheme after .scm init is read" msgstr "evaluér UDTR som Scheme efter .scm-init er læst" #. another bug in option parser: --output=foe is taken as an abbreviation #. for --output-format -#: main.cc:107 +#: main.cc:108 msgid "EXT" msgstr "FMT" -#: main.cc:107 +#: main.cc:108 msgid "use output format EXT (scm, ps, tex or as)" msgstr "brug uddataformat FMT (scm, ps, tex eller as)" -#: main.cc:109 +#: main.cc:110 msgid "FIELD" msgstr "FELT" -#: main.cc:109 +#: main.cc:110 msgid "write header field to BASENAME.FIELD" msgstr "skriv rubrikfelt til BASENAVN.FELT" -#: main.cc:110 +#: main.cc:111 msgid "add DIR to search path" msgstr "tilføj KATALOG til søgestien" -#: main.cc:111 +#: main.cc:112 msgid "use FILE as init file" msgstr "brug FIL som init-fil" -#: main.cc:115 +#: main.cc:116 msgid "prepend DIR to dependencies" msgstr "tilføj KATALOG efter afhængigheder" -#: main.cc:116 +#: main.cc:117 msgid "inhibit file output naming and exporting" msgstr "hindr navngivning af filuddata og eksportering" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:136 +#: main.cc:137 #, c-format msgid "Usage: %s [OPTION]... FILE..." msgstr "Brug: %s [FLAG]... FIL..." -#: main.cc:138 +#: main.cc:139 msgid "Typeset music and or play MIDI from FILE" msgstr "Typesæt musik og/eller afspil MIDI fra FIL" -#: main.cc:142 +#: main.cc:143 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" @@ -666,11 +700,11 @@ msgstr "" "højniveaubeskrivning af musikken i en fil. LilyPond er en del af\n" "GNU-projektet.\n" -#: main.cc:152 +#: main.cc:153 msgid "This binary was compiled with the following options:" msgstr "Dette program blev oversat med følgende flag:" -#: main.cc:56 main.cc:179 +#: main.cc:56 main.cc:180 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -681,16 +715,16 @@ msgstr "" "og du må ændre og/eller distribuere kopier af det under visse\n" "betingelser. Kør \"%s --warranty\" for mere information.\n" -#: main.cc:63 main.cc:186 main.cc:198 +#: main.cc:63 main.cc:187 main.cc:199 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright © %s af" -#: main.cc:196 +#: main.cc:197 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU Lilypond -- Musiktypesætteren" -#: main.cc:72 main.cc:204 +#: main.cc:72 main.cc:205 msgid "" " This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License version 2\n" @@ -732,10 +766,10 @@ msgstr "t msgid "silly pitch" msgstr "tåbelig tone" -#: musical-request.cc:28 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponering med %s medfører løst fortegn større end to" +msgid "can't find `%s' context" +msgstr "kan ikke finde omgivelsen \"%s\"" #: music.cc:232 msgid "ly_get_mus_property (): Not a Music" @@ -757,10 +791,10 @@ msgstr "ly_make_music (): Ikke en streng" msgid "ly_music_name (): Not a music expression" msgstr "ly_music_name (): Ikke et musikudtryk" -#: music-output-def.cc:115 +#: musical-request.cc:28 #, c-format -msgid "can't find `%s' context" -msgstr "kan ikke finde omgivelsen \"%s\"" +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponering med %s medfører løst fortegn større end to" #: my-lily-lexer.cc:139 #, c-format @@ -794,7 +828,7 @@ msgstr "papirsuddata til \"%s\"..." msgid ", at " msgstr ", ved " -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, c-format msgid "writing header field `%s' to `%s'..." msgstr "skriver rubrikfelt \"%s\" til \"%s\"..." @@ -834,7 +868,9 @@ msgstr "ingen af disse i min familie: \"%s\"" #: percent-repeat-engraver.cc:117 msgid "Don't know how to handle a percent repeat of this length." -msgstr "Véd ikke hvordan en procenttegnsgentagelse (percent) af denne længde skal håndteres." +msgstr "" +"Véd ikke hvordan en procenttegnsgentagelse (percent) af denne længde skal " +"håndteres." #: percent-repeat-iterator.cc:53 msgid "no one to print a percent" @@ -867,7 +903,7 @@ msgid "can't find start of phrasing slur" msgstr "kan ikke finde start på fraseringsbue" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, c-format msgid "can't find start of piano pedal: `%s'" msgstr "kan ikke finde start på pianopedal: \"%s\"" @@ -898,10 +934,15 @@ msgstr "for mange kolliderende pauser" msgid "too many notes for rest collision" msgstr "for mange noder for pausesammenstød" -#: scm-option.cc:59 +#: scm-option.cc:63 msgid "Scheme options:" msgstr "Scheme-flag:" +#: score-engraver.cc:188 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ubunden bro \"%s\"" + #: score.cc:78 msgid "Interpreting music..." msgstr "Tolker musik..." @@ -920,11 +961,6 @@ msgstr "Fejl fundne/*, behandler ikke partitur*/" msgid "elapsed time: %.2f seconds" msgstr "tidsforbrug: %.2f sekunder" -#: score-engraver.cc:188 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ubunden bro \"%s\"" - #: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "Partitur indholder fejl; vil ikke behandle det" @@ -944,14 +980,6 @@ msgstr "Kan ikke tolke artikulering \"%s\"" msgid "Separation_item: I've been drinking too much" msgstr "Separation_item: Jeg har drukket for meget" -#: slur.cc:48 -msgid "Putting slur over rest. Ignoring." -msgstr "Sætter legatobue over pause. Ignorerer." - -#: slur.cc:383 -msgid "Slur over rest?" -msgstr "Legatobue over pause?" - #: slur-engraver.cc:127 msgid "unterminated slur" msgstr "uafsluttet legatobue" @@ -962,18 +990,22 @@ msgstr "uafsluttet legatobue" msgid "can't find start of slur" msgstr "kan ikke finde start på legatobue" -#: stem.cc:116 -msgid "Weird stem size; check for narrow beams" -msgstr "Mærkelig nodehalsstørrelse; tjek for smalle bjælker" +#: slur.cc:48 +msgid "Putting slur over rest. Ignoring." +msgstr "Sætter legatobue over pause. Ignorerer." + +#: slur.cc:383 +msgid "Slur over rest?" +msgstr "Legatobue over pause?" #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Tilføjer nodehoved til inkompatibel nodehals (type = %d)" -#: text-spanner.cc:121 -msgid "Text_spanner too small" -msgstr "Tekst_bro for lille" +#: stem.cc:101 +msgid "Weird stem size; check for narrow beams" +msgstr "Mærkelig nodehalsstørrelse; tjek for smalle bjælker" #: text-spanner-engraver.cc:94 msgid "can't find start of text spanner" @@ -987,10 +1019,9 @@ msgstr "har allerede en tekstbro" msgid "unterminated text spanner" msgstr "uafsluttet tekstbro" -#: tfm.cc:77 -#, c-format -msgid "can't find ascii character: %d" -msgstr "kan ikke finde ASCII-tegn: %d" +#: text-spanner.cc:121 +msgid "Text_spanner too small" +msgstr "Tekst_bro for lille" #: tfm-reader.cc:106 #, c-format @@ -1000,7 +1031,13 @@ msgstr "TFM-rubrik i \"%s\" har kun %u ord" #: tfm-reader.cc:140 #, c-format msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" -msgstr "%s: TFM-fil har %u parametre, hvilket er mere end de %u jeg kan håndtere" +msgstr "" +"%s: TFM-fil har %u parametre, hvilket er mere end de %u jeg kan håndtere" + +#: tfm.cc:77 +#, c-format +msgid "can't find ascii character: %d" +msgstr "kan ikke finde ASCII-tegn: %d" #. How to shut up this warning, when no notes appeared because #. they were suicided by Thread_devnull_engraver? @@ -1016,11 +1053,6 @@ msgstr "ensom bindebue" msgid "no one to print a tuplet start bracket" msgstr "der findes ingen som kan skrive en startklamme for tuppel" -#: timing-translator.cc:38 -#, c-format -msgid "barcheck failed at: %s" -msgstr "taktkontrol mislykkedes ved: %s" - #: translator-ctors.cc:40 #, c-format msgid "unknown translator: `%s'" @@ -1057,13 +1089,18 @@ msgstr "kan ikke finde eller oprette: \"%s\"" #: translator-group.cc:414 #, c-format -msgid "Can't find property type-check for `%s'. Perhaps you made a typing error? Doing assignment anyway." -msgstr "Kan ikke finde egenskabstypekontrol for \"%s\". Måske har du lavet en tastefejl? Laver tildeling alligevel." +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error? " +"Doing assignment anyway." +msgstr "" +"Kan ikke finde egenskabstypekontrol for \"%s\". Måske har du lavet en " +"tastefejl? Laver tildeling alligevel." #: translator-group.cc:428 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" -msgstr "Typekontrol for \"%s\" mislykkedes; værdi \"%s\" skal have typen \"%s\"" +msgstr "" +"Typekontrol for \"%s\" mislykkedes; værdi \"%s\" skal have typen \"%s\"" #. programming_error? #: translator-group.cc:447 @@ -1093,7 +1130,8 @@ msgstr "Identificerer m #: parser.yy:697 msgid "More alternatives than repeats. Junking excess alternatives." -msgstr "Flere alternativer end gentagelser. Stryger tiloversblevne alternativer." +msgstr "" +"Flere alternativer end gentagelser. Stryger tiloversblevne alternativer." #: parser.yy:761 msgid "Second argument must be a symbol" @@ -1103,32 +1141,32 @@ msgstr "Andet argument skal v msgid "First argument must be a procedure taking 1 argument" msgstr "Første argument skal være en procedure som tager 1 argument" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "Forventer streng som skriptdefinition" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "Kan ikke angive retning for denne forespørgsel" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "Forventer nodeværdi" -#: parser.yy:1409 +#: parser.yy:1412 msgid "Must have duration object" msgstr "Skal have tidslængdeobjekt" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 msgid "Have to be in Lyric mode for lyrics" msgstr "Skal være i teksttilstand (Lyric mode) for tekst" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "ikke en tidslængde: %d" -#: parser.yy:1645 +#: parser.yy:1648 msgid "Have to be in Note mode for notes" msgstr "Skal være i nodetilstand (Note mode) for noder" @@ -1136,7 +1174,7 @@ msgstr "Skal v msgid "Have to be in Chord mode for chords" msgstr "Skal være i akkordtilstand (Chord mode) for akkord" -#: parser.yy:1910 +#: parser.yy:1911 msgid "need integer number arg" msgstr "behøver heltalsargument" @@ -1238,11 +1276,11 @@ msgstr "Kvantificerer kolonner..." msgid "Settling columns..." msgstr "Bestemmer kolonner..." -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 msgid "% MIDI copyright:" msgstr "% MIDI-copyright:" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 msgid "% MIDI instrument:" msgstr "% MIDI-instrument:" @@ -1262,8 +1300,8 @@ msgstr "% Kreat msgid "% Automatically generated" msgstr "% Automatgenereret" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "% fra inddatafil: " @@ -1280,7 +1318,8 @@ msgid "ACC[:MINOR]" msgstr "TONE[:MOL]" #: main.cc:97 -msgid "set key: ACC +sharps/-flads; :1 minor" +#, fuzzy +msgid "set key: ACC +sharps/-flats; :1 minor" msgstr "sæt toneart: TONE +forhøjelser/-sænkninger; :1 mol" #: main.cc:98 @@ -1390,18 +1429,18 @@ msgstr "Stryger nodeslutsh msgid "invalid running status" msgstr "ugyldig kørselstatus" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "uimplementeret MIDI-metahændelse" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "ugyldig MIDI-hændelse" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "forventede MIDI-spor" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "ugyldig sporlængde" diff --git a/po/de.po b/po/de.po index e40f655d1c..d60dbe8c4b 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -13,181 +13,186 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:106 -msgid "Generate .dvi with LaTeX for LilyPond" -msgstr "" - -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "Warnung: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 #: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 #: warn.cc:17 msgid "error: " msgstr "Fehler: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 #, fuzzy msgid "Exiting ... " msgstr "Linie ... " -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Verwendung: %s [OPTIONEN] ... [DATEI]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Optionen:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:242 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "Kein solches instrument: `%s'" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:305 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "Diese Hilfe" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:352 +#: ly2dvi.py:307 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "Hänge DIR an den Suchpfad an" -#: ly2dvi.py:353 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:310 main.cc:114 #, fuzzy msgid "produce MIDI output only" msgstr "Nur Midiausgabe" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "DATEI" -#: ly2dvi.py:356 +#: ly2dvi.py:311 #, fuzzy msgid "write ouput to FILE" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" -#: ly2dvi.py:357 +#: ly2dvi.py:312 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:359 +#: ly2dvi.py:314 #, fuzzy msgid "generate PostScript output" msgstr "Degenerierte Zwangsbedingungen" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "Kein solches instrument: `%s'" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, fuzzy, c-format msgid "Running %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:398 +#: ly2dvi.py:440 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Uralt-Bitte: `%s'" -#: ly2dvi.py:454 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:538 #, fuzzy, c-format msgid "invalid value: %s" msgstr "Ungültiger Buchstabe `%c'" -#: ly2dvi.py:639 +#: ly2dvi.py:682 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "Kann die Datei %s nicht öffnen" -#: ly2dvi.py:657 +#: ly2dvi.py:700 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:811 +#, fuzzy, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "Enthält schon ein `%s'" + +#: ly2dvi.py:876 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Ausgabe auf Papier auf %s..." -#: ly2dvi.py:835 +#: ly2dvi.py:887 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "MIDI-Ausgabe nach %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" -#: ly2dvi.py:848 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "" @@ -352,7 +357,7 @@ msgstr "Position unbekannt" msgid "can't map file" msgstr "Kann die Datei nicht mappen" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 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'" @@ -437,6 +442,11 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" +#: bar-check-iterator.cc:53 +#, fuzzy, c-format +msgid "barcheck failed at: %s" +msgstr "Überprüfung der Takte is fehlgeschlagen bei: %s" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -518,7 +528,7 @@ msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" -#: collision.cc:127 +#: collision.cc:286 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." @@ -835,7 +845,7 @@ msgstr "Ausgabe auf Papier auf %s..." msgid ", at " msgstr ", bei " -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, fuzzy, c-format msgid "writing header field `%s' to `%s'..." msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." @@ -914,7 +924,7 @@ msgid "can't find start of phrasing slur" msgstr "Kann nicht beide Enden von %s finden" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, fuzzy, c-format msgid "can't find start of piano pedal: `%s'" msgstr "Kann keine kürzeste Note bei %s finden" @@ -1021,7 +1031,7 @@ msgstr "Bindebogen msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: stem.cc:116 +#: stem.cc:101 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "" @@ -1076,11 +1086,6 @@ msgstr "Einsamer Haltebogen" msgid "no one to print a tuplet start bracket" msgstr "Niemand schreibt eine mehrfahce Anfangsklammer" -#: timing-translator.cc:38 -#, fuzzy, c-format -msgid "barcheck failed at: %s" -msgstr "Überprüfung der Takte is fehlgeschlagen bei: %s" - #: translator-ctors.cc:40 #, fuzzy, c-format msgid "unknown translator: `%s'" @@ -1165,34 +1170,34 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1409 +#: parser.yy:1412 #, fuzzy msgid "Must have duration object" msgstr "Setze kürzeste Dauer (?)" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "Um Text zu verarbeiten, muß ich im Text-(Lyrics)-Modus sein" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "Keine Dauer: %d" -#: parser.yy:1645 +#: parser.yy:1648 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "Für Noten muß ich im Noten-(Note)-Modus sein" @@ -1306,12 +1311,12 @@ msgstr "Quantifiziere Spalten..." msgid "Settling columns..." msgstr "Erledige Spalten..." -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 #, fuzzy msgid "% MIDI copyright:" msgstr "% Midi Urheberrecht:" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 #, fuzzy msgid "% MIDI instrument:" msgstr "% Instrument:" @@ -1330,8 +1335,8 @@ msgstr "% erstellt von: " msgid "% Automatically generated" msgstr "% Automatisch generiert" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "% aus Eingabedatei: " @@ -1467,19 +1472,19 @@ msgstr "Ich vernachl msgid "invalid running status" msgstr "Ungültiger Laufzeit-Status" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "MIDI Meta-event nicht implementiert" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "Ungültiges MIDI evant" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "Erwarte MIDI-Stück" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "Unzulässige Länge für ein Stück" diff --git a/po/fr.po b/po/fr.po index 6c4ca25b63..0d1b1dcef7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.9\n" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "PO-Revision-Date: 2001-11-30 12:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -13,175 +13,180 @@ msgstr "" "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 "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 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "AVERTISSEMENT: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 #: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 #: warn.cc:17 msgid "error: " msgstr "Erreur: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "Fin d'exécution... " -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Usage: %s [OPTION]... FICHIER" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Options:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "Rapporter toutes anomalies à %s" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "Invocation de `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "fin de la commande avec l'état %d" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "(ignoré)" -#: ly2dvi.py:322 +#: ly2dvi.py:242 #, c-format msgid "Cleaning %s..." msgstr "Nettoyage de %s..." -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 -#, c-format -msgid "no such setting: %s" -msgstr "" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "Générer un fichier .dvi à l'aide de LaTeX pour LilyPond" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:305 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "cette aide" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "RÉP" -#: ly2dvi.py:352 +#: ly2dvi.py:307 msgid "add DIR to LilyPond's search path" msgstr "ajouter le RÉPERTOIRE au chemin de recherche de LilyPond" -#: ly2dvi.py:353 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "conserver toutes les sortie et nommer le répertoire %s.dir" -#: ly2dvi.py:354 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "ne pas exécuter LilyPond" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:310 main.cc:114 msgid "produce MIDI output only" msgstr "produire une sortie MIDI seulement" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "FICHIER" -#: ly2dvi.py:356 +#: ly2dvi.py:311 msgid "write ouput to FILE" msgstr "produire la sortie dans le FICHIER" -#: ly2dvi.py:357 +#: ly2dvi.py:312 msgid "find pfa fonts used in FILE" msgstr "repérer les fontes pfa utilisées dans le FICHIER" -#: ly2dvi.py:359 +#: ly2dvi.py:314 msgid "generate PostScript output" msgstr "générer une sortie PostScript" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "CLÉ=VALEUR" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "modifier le paramètre globale de la CLÉ à VAL" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "afficher le numéro de version" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 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 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, c-format +msgid "no such setting: %s" +msgstr "" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, c-format msgid "Running %s..." msgstr "Exécution de %s..." -#: ly2dvi.py:398 +#: ly2dvi.py:440 #, c-format msgid "Analyzing %s..." msgstr "Analyse de %s..." -#: ly2dvi.py:454 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "aucune sortie n'a été trouvée pour %s" -#: ly2dvi.py:496 +#: ly2dvi.py:538 #, c-format msgid "invalid value: %s" msgstr "valeur invalide: %s" -#: ly2dvi.py:639 +#: ly2dvi.py:682 #, c-format msgid "not a PostScript file: `%s'" msgstr "n'est pas un fichier PostScript: `%s'" -#: ly2dvi.py:657 +#: ly2dvi.py:700 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:811 +#, fuzzy, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "Contient déjà: `%s'" + +#: ly2dvi.py:876 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "" -#: ly2dvi.py:835 +#: ly2dvi.py:887 #, c-format msgid "%s output to `%s'..." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ne peut repérer le fichier: `%s'" -#: ly2dvi.py:848 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "aucun fichier spéficié sur la ligne de commande." @@ -192,7 +197,8 @@ msgstr "Conversion de mup vers ly" #: mup2ly.py:166 #, c-format msgid "%s is far from completed. Not all constructs are recognised." -msgstr "%s est loin d'être complet. Tous les construits n'ont pas été reconnus." +msgstr "" +"%s est loin d'être complet. Tous les construits n'ont pas été reconnus." #: mup2ly.py:964 #, c-format @@ -343,7 +349,7 @@ msgstr "position inconnue" msgid "can't map file" msgstr "" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 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'" @@ -392,7 +398,9 @@ msgid "does not match: `%s'" 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 @@ -423,6 +431,11 @@ msgstr "Abandon" msgid "Can't switch translators, I'm there already" msgstr "" +#: bar-check-iterator.cc:53 +#, c-format +msgid "barcheck failed at: %s" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -497,7 +510,7 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: collision.cc:127 +#: collision.cc:286 msgid "Too many clashing notecolumns. Ignoring them." msgstr "" @@ -779,7 +792,7 @@ msgstr "" msgid ", at " msgstr ", à " -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, c-format msgid "writing header field `%s' to `%s'..." msgstr "" @@ -852,7 +865,7 @@ msgid "can't find start of phrasing slur" msgstr "" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, c-format msgid "can't find start of piano pedal: `%s'" msgstr "" @@ -950,7 +963,7 @@ msgstr "" msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 +#: stem.cc:101 msgid "Weird stem size; check for narrow beams" msgstr "" @@ -999,11 +1012,6 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: timing-translator.cc:38 -#, c-format -msgid "barcheck failed at: %s" -msgstr "" - #: translator-ctors.cc:40 #, c-format msgid "unknown translator: `%s'" @@ -1040,7 +1048,9 @@ 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 @@ -1086,32 +1096,32 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1409 +#: parser.yy:1412 msgid "Must have duration object" msgstr "" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1645 +#: parser.yy:1648 msgid "Have to be in Note mode for notes" msgstr "" @@ -1221,11 +1231,11 @@ msgstr "" msgid "Settling columns..." msgstr "" -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 msgid "% MIDI copyright:" msgstr "" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 msgid "% MIDI instrument:" msgstr "" @@ -1243,8 +1253,8 @@ msgstr "" msgid "% Automatically generated" msgstr "% automatiquement généré" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "" @@ -1371,18 +1381,18 @@ msgstr "" msgid "invalid running status" msgstr "état d'exécution invalide" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "méta-événement MIDI non implanté" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "événement MIDI invalide" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "piste MIDI attendue" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "longueur de piste invalide" diff --git a/po/it.po b/po/it.po index af424e7b1e..61405f994f 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -13,182 +13,187 @@ msgstr "" "out --add-comments --keyword=_ --keyword=_f\n" "Files: bow.cc int.cc\n" -#: ly2dvi.py:106 -msgid "Generate .dvi with LaTeX for LilyPond" -msgstr "" - -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "attenzione: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 #: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 #: warn.cc:17 msgid "error: " msgstr "errore: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Uso: %s [OPZIONE... [FILE]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Opzioni: " -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:242 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Genero le voci..." -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "% strumento:" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:305 main.cc:113 #, fuzzy msgid "write Makefile dependencies for every input file" msgstr "" " -d, --dependencies scrive le dependenze del Makefile per ogni file di " "input\n" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "" -#: ly2dvi.py:352 +#: ly2dvi.py:307 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: ly2dvi.py:353 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:310 main.cc:114 #, fuzzy msgid "produce MIDI output only" msgstr " -M, --no-paper produce solo output midi\n" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "" -#: ly2dvi.py:356 +#: ly2dvi.py:311 msgid "write ouput to FILE" msgstr "" -#: ly2dvi.py:357 +#: ly2dvi.py:312 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:359 +#: ly2dvi.py:314 #, fuzzy msgid "generate PostScript output" msgstr "vincoli degenerati" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "% strumento:" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, fuzzy, c-format msgid "Running %s..." msgstr "Genero le voci..." -#: ly2dvi.py:398 +#: ly2dvi.py:440 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Genero le voci..." -#: ly2dvi.py:454 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:538 #, fuzzy, c-format msgid "invalid value: %s" msgstr "carattere illegale: `%c'" -#: ly2dvi.py:639 +#: ly2dvi.py:682 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "non posso aprire il file: `%s'" -#: ly2dvi.py:657 +#: ly2dvi.py:700 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:811 +#, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "" + +#: ly2dvi.py:876 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "L'output stampato è inviato a %s..." -#: ly2dvi.py:835 +#: ly2dvi.py:887 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "L'output MIDI è inviato a %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" -#: ly2dvi.py:848 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "" @@ -352,7 +357,7 @@ msgstr "posizione sconosciuta" msgid "can't map file" msgstr "non posso mappare il documento" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 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'" @@ -434,6 +439,11 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" +#: bar-check-iterator.cc:53 +#, fuzzy, c-format +msgid "barcheck failed at: %s" +msgstr "controllo del battute fallito: %s" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -513,7 +523,7 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: collision.cc:127 +#: collision.cc:286 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Troppe collisioni tra colonne di note. Le ignoro." @@ -827,7 +837,7 @@ msgstr "L'output stampato msgid ", at " msgstr ", a " -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, fuzzy, c-format msgid "writing header field `%s' to `%s'..." msgstr "scrivo il file delle dipendenze: `%s'..." @@ -906,7 +916,7 @@ msgid "can't find start of phrasing slur" msgstr "non trovo le estremità di %s" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, fuzzy, c-format msgid "can't find start of piano pedal: `%s'" msgstr "non risco a trovare una ruling note a %s" @@ -1012,7 +1022,7 @@ msgstr "Metto uno slur sulla pausa." msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 +#: stem.cc:101 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "dimensione del gambo poco ortodossa; check for narrow beams" @@ -1065,11 +1075,6 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: timing-translator.cc:38 -#, fuzzy, c-format -msgid "barcheck failed at: %s" -msgstr "controllo del battute fallito: %s" - #: translator-ctors.cc:40 #, fuzzy, c-format msgid "unknown translator: `%s'" @@ -1154,34 +1159,34 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1409 +#: parser.yy:1412 #, fuzzy msgid "Must have duration object" msgstr "indicazione durata priva di senso" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "bisogna essere in Lyric mode per i testi" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "non è una durata: %d" -#: parser.yy:1645 +#: parser.yy:1648 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "bisogna essere in Note mode per le note" @@ -1294,11 +1299,11 @@ msgstr "Quantifico le colonne..." msgid "Settling columns..." msgstr "Sistemo le colonne..." -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 msgid "% MIDI copyright:" msgstr "" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 #, fuzzy msgid "% MIDI instrument:" msgstr "% strumento:" @@ -1317,8 +1322,8 @@ msgstr "% Autore: " msgid "% Automatically generated" msgstr "% Generato automaticamente" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "% dal file di input: " @@ -1463,19 +1468,19 @@ msgstr "" msgid "invalid running status" msgstr "stato di eseguzione non valido" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "meta-evento MIDI non implementato" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "evento MIDI non valido" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "mi spettavo una traccia MIDI" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "lunghezza della traccia non valida" diff --git a/po/ja.po b/po/ja.po index c62e927173..7d90132108 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.2.17\n" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -13,180 +13,185 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: ly2dvi.py:106 -msgid "Generate .dvi with LaTeX for LilyPond" -msgstr "" - -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "·Ù¹ð: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 #: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 #: warn.cc:17 msgid "error: " msgstr "¥¨¥é¡¼: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 #, fuzzy msgid "Exiting ... " msgstr "¹Ô ..." -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:242 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:305 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:352 +#: ly2dvi.py:307 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: ly2dvi.py:353 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:310 main.cc:114 msgid "produce MIDI output only" msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "FILE" -#: ly2dvi.py:356 +#: ly2dvi.py:311 #, fuzzy msgid "write ouput to FILE" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" -#: ly2dvi.py:357 +#: ly2dvi.py:312 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:359 +#: ly2dvi.py:314 #, fuzzy msgid "generate PostScript output" msgstr "À©¸Â¤ò´ËÏÂ" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 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 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, fuzzy, c-format msgid "Running %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:398 +#: ly2dvi.py:440 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: ly2dvi.py:454 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:538 #, fuzzy, c-format msgid "invalid value: %s" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: ly2dvi.py:639 +#: ly2dvi.py:682 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:657 +#: ly2dvi.py:700 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:811 +#, fuzzy, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "´û¤Ë´Þ¤ó¤Ç¤¤¤Þ¤¹: `%s'" + +#: ly2dvi.py:876 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: ly2dvi.py:835 +#: ly2dvi.py:887 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, fuzzy, c-format msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:848 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "" @@ -352,7 +357,7 @@ msgstr " msgid "can't map file" msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 mapped-file-storage.cc:87 paper-stream.cc:45 #: scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23 #, fuzzy, c-format msgid "can't open file: `%s'" @@ -434,6 +439,11 @@ msgstr " msgid "Can't switch translators, I'm there already" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" +#: bar-check-iterator.cc:53 +#, c-format +msgid "barcheck failed at: %s" +msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -516,7 +526,7 @@ msgstr "̵ msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: collision.cc:127 +#: collision.cc:286 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" @@ -847,7 +857,7 @@ msgstr "%s msgid ", at " msgstr ", at " -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, fuzzy, c-format msgid "writing header field `%s' to `%s'..." msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." @@ -924,7 +934,7 @@ msgid "can't find start of phrasing slur" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, fuzzy, c-format msgid "can't find start of piano pedal: `%s'" msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" @@ -1025,7 +1035,7 @@ msgstr " msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: stem.cc:116 +#: stem.cc:101 msgid "Weird stem size; check for narrow beams" msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" @@ -1077,11 +1087,6 @@ msgstr " msgid "no one to print a tuplet start bracket" msgstr "¥¿¥×¥ì¥Ã¥È³«»Ï¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: timing-translator.cc:38 -#, c-format -msgid "barcheck failed at: %s" -msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s" - #: translator-ctors.cc:40 #, c-format msgid "unknown translator: `%s'" @@ -1166,33 +1171,33 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1409 +#: parser.yy:1412 #, fuzzy msgid "Must have duration object" msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 msgid "Have to be in Lyric mode for lyrics" msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d" -#: parser.yy:1645 +#: parser.yy:1648 msgid "Have to be in Note mode for notes" msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" @@ -1302,11 +1307,11 @@ msgstr " msgid "Settling columns..." msgstr "¥«¥é¥à¤ò·èÄꤷ¤Þ¤¹..." -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 msgid "% MIDI copyright:" msgstr "% MIDI copyright:" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 msgid "% MIDI instrument:" msgstr "% MIDI instrument:" @@ -1324,8 +1329,8 @@ msgstr "%s Creator: " msgid "% Automatically generated" msgstr "% Automatically generated" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "% from input file: " @@ -1455,19 +1460,19 @@ msgstr " msgid "invalid running status" msgstr "̵¸ú¤ÊÆ°ºî¾õÂÖ" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "̤¼ÂÁõ¤Î MIDI ¥á¥¿¥¤¥Ù¥ó¥È" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "̵¸ú¤Ê MIDI ¥¤¥Ù¥ó¥È" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "MIDI ¥È¥é¥Ã¥¯¤¬É¬ÍפǤ¹" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "̵¸ú¤Ê¥È¥é¥Ã¥¯Ä¹¤Ç¤¹" diff --git a/po/lilypond.pot b/po/lilypond.pot index 6f6e3e2a1e..07351171a7 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,175 +14,180 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ly2dvi.py:106 -msgid "Generate .dvi with LaTeX for LilyPond" -msgstr "" - -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "" -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 #: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 #: warn.cc:17 msgid "error: " msgstr "" -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:242 #, c-format msgid "Cleaning %s..." msgstr "" -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 -#, c-format -msgid "no such setting: %s" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" msgstr "" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:305 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "" -#: ly2dvi.py:352 +#: ly2dvi.py:307 msgid "add DIR to LilyPond's search path" msgstr "" -#: ly2dvi.py:353 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:310 main.cc:114 msgid "produce MIDI output only" msgstr "" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "" -#: ly2dvi.py:356 +#: ly2dvi.py:311 msgid "write ouput to FILE" msgstr "" -#: ly2dvi.py:357 +#: ly2dvi.py:312 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:359 +#: ly2dvi.py:314 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 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 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, c-format +msgid "no such setting: %s" +msgstr "" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, c-format msgid "Running %s..." msgstr "" -#: ly2dvi.py:398 +#: ly2dvi.py:440 #, c-format msgid "Analyzing %s..." msgstr "" -#: ly2dvi.py:454 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:538 #, c-format msgid "invalid value: %s" msgstr "" -#: ly2dvi.py:639 +#: ly2dvi.py:682 #, c-format msgid "not a PostScript file: `%s'" msgstr "" -#: ly2dvi.py:657 +#: ly2dvi.py:700 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:811 +#, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "" + +#: ly2dvi.py:876 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "" -#: ly2dvi.py:835 +#: ly2dvi.py:887 #, c-format msgid "%s output to `%s'..." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "" -#: ly2dvi.py:848 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "" @@ -344,7 +349,7 @@ msgstr "" msgid "can't map file" msgstr "" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 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'" @@ -426,6 +431,11 @@ msgstr "" msgid "Can't switch translators, I'm there already" msgstr "" +#: bar-check-iterator.cc:53 +#, c-format +msgid "barcheck failed at: %s" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -500,7 +510,7 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: collision.cc:127 +#: collision.cc:286 msgid "Too many clashing notecolumns. Ignoring them." msgstr "" @@ -782,7 +792,7 @@ msgstr "" msgid ", at " msgstr "" -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, c-format msgid "writing header field `%s' to `%s'..." msgstr "" @@ -855,7 +865,7 @@ msgid "can't find start of phrasing slur" msgstr "" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, c-format msgid "can't find start of piano pedal: `%s'" msgstr "" @@ -953,7 +963,7 @@ msgstr "" msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:116 +#: stem.cc:101 msgid "Weird stem size; check for narrow beams" msgstr "" @@ -1002,11 +1012,6 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: timing-translator.cc:38 -#, c-format -msgid "barcheck failed at: %s" -msgstr "" - #: translator-ctors.cc:40 #, c-format msgid "unknown translator: `%s'" @@ -1091,32 +1096,32 @@ msgstr "" msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1409 +#: parser.yy:1412 msgid "Must have duration object" msgstr "" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1645 +#: parser.yy:1648 msgid "Have to be in Note mode for notes" msgstr "" @@ -1226,11 +1231,11 @@ msgstr "" msgid "Settling columns..." msgstr "" -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 msgid "% MIDI copyright:" msgstr "" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 msgid "% MIDI instrument:" msgstr "" @@ -1248,8 +1253,8 @@ msgstr "" msgid "% Automatically generated" msgstr "" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "" @@ -1376,18 +1381,18 @@ msgstr "" msgid "invalid running status" msgstr "" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "" diff --git a/po/nl.po b/po/nl.po index a979126749..543b4cee3d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.6\n" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "PO-Revision-Date: 2001-09-09 17:34+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -19,180 +19,186 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Date: 2001-05-09 23:29+0200\n" "From: \n" -"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po --add-comments --keyword=_\n" +"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po " +"--add-comments --keyword=_\n" "Files: bow.cc int.cc\n" -#: ly2dvi.py:106 -msgid "Generate .dvi with LaTeX for LilyPond" -msgstr "Genereer .dvi met LaTeX voor LilyPond" - -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "waarschuwing: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 #: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 #: warn.cc:17 msgid "error: " msgstr "fout: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "Beëindigen ..." -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" -msgstr "" +msgstr "Gebruik: %s [OPTIE]... BESTAND" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Opties:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" "Meld luizen in het programma aan %s;\n" "meld onjuistheden in de vertaling aan of " -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "Uitvoeren `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "opdracht eindigde met waarde %d" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "(genegeerd)" -#: ly2dvi.py:322 +#: ly2dvi.py:242 #, c-format msgid "Cleaning %s..." msgstr "Schoonmaken %s..." -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 -#, c-format -msgid "no such setting: %s" -msgstr "geen dergelijke instelling: %s" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "Genereer .dvi met LaTeX voor LilyPond" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:305 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "deze hulp" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "DIR" -#: ly2dvi.py:352 +#: ly2dvi.py:307 msgid "add DIR to LilyPond's search path" msgstr "voeg DIR toe aan LilyPonds zoekpad" -#: ly2dvi.py:353 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "bewaar alle uitvoer, en noem de directory %s.dir" -#: ly2dvi.py:354 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "draai LilyPond niet" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:310 main.cc:114 msgid "produce MIDI output only" msgstr "produceer alleen MIDI uitvoer" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "BESTAND" -#: ly2dvi.py:356 +#: ly2dvi.py:311 msgid "write ouput to FILE" msgstr "schrijf uitvoer naar BESTAND" -#: ly2dvi.py:357 +#: ly2dvi.py:312 msgid "find pfa fonts used in FILE" msgstr "zoek pfa fonts gebruikt in BESTAND" -#: ly2dvi.py:359 +#: ly2dvi.py:314 msgid "generate PostScript output" msgstr "genereer PostScipt uitvoer" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "SEUTEL=WAARDE" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "verander globale instelling SLEUTEL in WAARDE" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "breedsprakig" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "druk versienummer af" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, c-format +msgid "no such setting: %s" +msgstr "geen dergelijke instelling: %s" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, c-format msgid "Running %s..." msgstr "Uitvoeren %s..." -#: ly2dvi.py:398 +#: ly2dvi.py:440 #, c-format msgid "Analyzing %s..." msgstr "Analyseer %s..." -#: ly2dvi.py:454 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "geen lilypond uitvoer gevonden voor %s" -#: ly2dvi.py:496 +#: ly2dvi.py:538 #, c-format msgid "invalid value: %s" msgstr "ongeldige waarde: %s" -#: ly2dvi.py:639 +#: ly2dvi.py:682 #, c-format msgid "not a PostScript file: `%s'" msgstr "geen PostScript bestand: `%s'" -#: ly2dvi.py:657 +#: ly2dvi.py:700 #, c-format msgid "getopt says: `%s'" msgstr "getopt zegt: `%s'" -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:811 +#, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "bestandsnaam moet geen spaties bevatten: `%s'" + +#: ly2dvi.py:876 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "afhankelijkheden uitvoer naar `%s'..." -#: ly2dvi.py:835 +#: ly2dvi.py:887 #, c-format msgid "%s output to `%s'..." msgstr "%s uitvoer naar `%s'..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" -#: ly2dvi.py:848 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "geen bestanden gespecificeerd op de commandoregel." @@ -354,7 +360,7 @@ msgstr "positie onbekend" msgid "can't map file" msgstr "kan bestand niet inkaarten" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 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'" @@ -438,6 +444,11 @@ msgstr "Geef op" msgid "Can't switch translators, I'm there already" msgstr "Kan niet wisselen van vertaler, ben al hier" +#: bar-check-iterator.cc:53 +#, c-format +msgid "barcheck failed at: %s" +msgstr "maatstreep controle gefaald op: %s" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "kan start van waardestreep niet vinden" @@ -512,7 +523,7 @@ msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" -#: collision.cc:127 +#: collision.cc:286 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." @@ -816,7 +827,7 @@ msgstr "papier uitvoer naar %s..." msgid ", at " msgstr ", bij " -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, c-format msgid "writing header field `%s' to `%s'..." msgstr "Schijven van kop veld %s naar bestand %s..." @@ -889,7 +900,7 @@ msgid "can't find start of phrasing slur" msgstr "kan start van fraseringsboog niet vinden" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, c-format msgid "can't find start of piano pedal: `%s'" msgstr "kan start van piano pedaal niet vinden: `%s'" @@ -989,7 +1000,7 @@ msgstr "Boogje over rust?" msgid "Adding note head to incompatible stem (type = %d)" msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)" -#: stem.cc:116 +#: stem.cc:101 msgid "Weird stem size; check for narrow beams" msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" @@ -1039,11 +1050,6 @@ msgstr "eenzame overbinding" msgid "no one to print a tuplet start bracket" msgstr "niemand om een x-ool start haak af te drukken" -#: timing-translator.cc:38 -#, c-format -msgid "barcheck failed at: %s" -msgstr "maatstreep controle gefaald op: %s" - #: translator-ctors.cc:40 #, c-format msgid "unknown translator: `%s'" @@ -1130,32 +1136,32 @@ msgstr "Tweede argument moet een symbool zijn" msgid "First argument must be a procedure taking 1 argument" msgstr "Eerste argument moet een procedure zijn met 1 argument" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "Verwacht string voor script definitie" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "Kan richting voor dit verzoek niet specificeren" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "Verwacht musical-pitch waarde" -#: parser.yy:1409 +#: parser.yy:1412 msgid "Must have duration object" msgstr "Moet duur object hebben" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 msgid "Have to be in Lyric mode for lyrics" msgstr "Moet in Lyric modus zijn voor liedteksten" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "geen duur: %d" -#: parser.yy:1645 +#: parser.yy:1648 msgid "Have to be in Note mode for notes" msgstr "Moet in Note modus zijn voor noten" @@ -1265,11 +1271,11 @@ msgstr "Kwantificeren van kolommen..." msgid "Settling columns..." msgstr "Zetten van kolommen..." -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 msgid "% MIDI copyright:" msgstr "% MIDI copyright:" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 msgid "% MIDI instrument:" msgstr "% MIDI instrument:" @@ -1287,8 +1293,8 @@ msgstr "% Schepper: " msgid "% Automatically generated" msgstr "% Automatisch gegenereerd" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "% van invoerbestand: " @@ -1415,18 +1421,18 @@ msgstr "Schroot noot-eind gebeurtenis: kanaal = %d, toonhoogte = %d" msgid "invalid running status" msgstr "ongeldige lopende status" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "MIDI meta-gebeurtenis niet geïmplementeerd" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "ongeldige MIDI gebeurtenis" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "MIDI spoor verwacht" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "ongeldige spoorlengte" diff --git a/po/ru.po b/po/ru.po index a1b406243f..6898c44a20 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -14,178 +14,183 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: ENCODING\n" -#: ly2dvi.py:106 -msgid "Generate .dvi with LaTeX for LilyPond" -msgstr "" - -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 #: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 #: warn.cc:17 msgid "error: " msgstr "ÏÛÉÂËÁ: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "" -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, fuzzy, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "ïÐÃÉÉ:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, fuzzy, c-format msgid "Invoking `%s'" msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "" -#: ly2dvi.py:322 +#: ly2dvi.py:242 #, fuzzy, c-format msgid "Cleaning %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 -#, fuzzy, c-format -msgid "no such setting: %s" -msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:305 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "ëáô" -#: ly2dvi.py:352 +#: ly2dvi.py:307 #, fuzzy msgid "add DIR to LilyPond's search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: ly2dvi.py:353 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "" -#: ly2dvi.py:354 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:310 main.cc:114 msgid "produce MIDI output only" msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "æáêì" -#: ly2dvi.py:356 +#: ly2dvi.py:311 #, fuzzy msgid "write ouput to FILE" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" -#: ly2dvi.py:357 +#: ly2dvi.py:312 msgid "find pfa fonts used in FILE" msgstr "" -#: ly2dvi.py:359 +#: ly2dvi.py:314 msgid "generate PostScript output" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "" -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, fuzzy, c-format +msgid "no such setting: %s" +msgstr "ÎÅÔ ÔÁËÏÇÏ ÉÎÓÔÒÕÍÅÎÔÁ: `%s'" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, fuzzy, c-format msgid "Running %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:398 +#: ly2dvi.py:440 #, fuzzy, c-format msgid "Analyzing %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" -#: ly2dvi.py:454 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "" -#: ly2dvi.py:496 +#: ly2dvi.py:538 #, fuzzy, c-format msgid "invalid value: %s" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: ly2dvi.py:639 +#: ly2dvi.py:682 #, fuzzy, c-format msgid "not a PostScript file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'" -#: ly2dvi.py:657 +#: ly2dvi.py:700 #, c-format msgid "getopt says: `%s'" msgstr "" -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:811 +#, fuzzy, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "õÖÅ ÓÏÄÅÒÖÉÔ: `%s'" + +#: ly2dvi.py:876 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: ly2dvi.py:835 +#: ly2dvi.py:887 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" -#: ly2dvi.py:848 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "" @@ -349,7 +354,7 @@ msgstr " msgid "can't map file" msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 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'" @@ -431,6 +436,11 @@ msgstr " msgid "Can't switch translators, I'm there already" msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ" +#: bar-check-iterator.cc:53 +#, c-format +msgid "barcheck failed at: %s" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" @@ -506,7 +516,7 @@ msgstr " msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: collision.cc:127 +#: collision.cc:286 msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." @@ -799,7 +809,7 @@ msgstr "\" msgid ", at " msgstr ", ×" -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, fuzzy, c-format msgid "writing header field `%s' to `%s'..." msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." @@ -876,7 +886,7 @@ msgid "can't find start of phrasing slur" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, fuzzy, c-format msgid "can't find start of piano pedal: `%s'" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" @@ -977,7 +987,7 @@ msgstr " msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: stem.cc:116 +#: stem.cc:101 msgid "Weird stem size; check for narrow beams" msgstr "" @@ -1029,11 +1039,6 @@ msgstr "" msgid "no one to print a tuplet start bracket" msgstr "" -#: timing-translator.cc:38 -#, c-format -msgid "barcheck failed at: %s" -msgstr "" - #: translator-ctors.cc:40 #, c-format msgid "unknown translator: `%s'" @@ -1118,33 +1123,33 @@ msgstr " msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1409 +#: parser.yy:1412 #, fuzzy msgid "Must have duration object" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 msgid "Have to be in Lyric mode for lyrics" msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d" -#: parser.yy:1645 +#: parser.yy:1648 msgid "Have to be in Note mode for notes" msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ" @@ -1254,11 +1259,11 @@ msgstr "" msgid "Settling columns..." msgstr "" -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 msgid "% MIDI copyright:" msgstr "% MIDI copyright:" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 msgid "% MIDI instrument:" msgstr "% MIDI ÉÎÓÔÒÕÍÅÎÔ:" @@ -1276,8 +1281,8 @@ msgstr "% msgid "% Automatically generated" msgstr "% á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: " @@ -1406,19 +1411,19 @@ msgstr "" msgid "invalid running status" msgstr "ÎÅ×ÅÒÎÙÊ ÓÔÁÔÕÓ ×ÙÐÏÌÎÅÎÉÑ" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÏÅ ÍÅÔÁ-ÓÏÂÙÔÉÅ MIDI" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÂÙÔÉÅ MIDI" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "ÏÖÉÄÁÌÁÓØ MIDI ÄÏÒÏÖËÁ" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "ÎÅ×ÅÒÎÁÑ ÄÌÉÎÁ ÄÏÒÏÖËÉ" diff --git a/po/sv.po b/po/sv.po index 1c33f80049..cae3b4e40a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.8\n" -"POT-Creation-Date: 2001-09-09 17:30+0200\n" +"POT-Creation-Date: 2002-01-29 23:12+0100\n" "PO-Revision-Date: 2001-09-29 11:20+0200\n" "Last-Translator: Martin Norbäck \n" "Language-Team: Swedish \n" @@ -13,184 +13,189 @@ msgstr "" "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 "Generera .dvi med LaTeX för LilyPond" - -#: data-file.cc:118 input.cc:85 ly2dvi.py:191 midi-parser.cc:100 mup2ly.py:93 +#: data-file.cc:118 input.cc:85 ly2dvi.py:112 midi-parser.cc:100 mup2ly.py:93 #: update-lily.py:118 warn.cc:23 msgid "warning: " msgstr "varning: " -#: input.cc:90 ly2dvi.py:206 ly2dvi.py:639 ly2dvi.py:657 ly2dvi.py:848 +#: input.cc:90 ly2dvi.py:115 ly2dvi.py:131 ly2dvi.py:682 ly2dvi.py:700 #: mup2ly.py:98 mup2ly.py:188 update-lily.py:123 update-lily.py:211 warn.cc:9 #: warn.cc:17 msgid "error: " msgstr "fel: " -#: ly2dvi.py:207 mup2ly.py:100 update-lily.py:125 +#: ly2dvi.py:132 mup2ly.py:100 update-lily.py:125 msgid "Exiting ... " msgstr "Avslutar... " -#: ly2dvi.py:265 mup2ly.py:158 update-lily.py:183 +#: ly2dvi.py:190 mup2ly.py:158 update-lily.py:183 #, c-format msgid "Usage: %s [OPTION]... FILE" msgstr "Användning: %s [FLAGGA]... FIL" -#: ly2dvi.py:269 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 +#: ly2dvi.py:194 main.cc:120 main.cc:149 mup2ly.py:162 update-lily.py:187 msgid "Options:" msgstr "Flaggor:" -#: ly2dvi.py:273 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 +#: ly2dvi.py:198 main.cc:124 main.cc:172 mup2ly.py:168 update-lily.py:191 #, c-format msgid "Report bugs to %s" msgstr "" "Rapportera programfel till %s\n" "Rapportera fel i översättningen till " -#: ly2dvi.py:306 mup2ly.py:185 update-lily.py:208 +#: ly2dvi.py:226 mup2ly.py:185 update-lily.py:208 #, c-format msgid "Invoking `%s'" msgstr "Startar \"%s\"" -#: ly2dvi.py:310 mup2ly.py:188 update-lily.py:211 +#: ly2dvi.py:230 mup2ly.py:188 update-lily.py:211 #, c-format msgid "command exited with value %d" msgstr "kommandot avslutade med värde %d" -#: ly2dvi.py:312 mup2ly.py:190 update-lily.py:213 +#: ly2dvi.py:232 mup2ly.py:190 update-lily.py:213 msgid "(ignored)" msgstr "(ignorerat)" # här är det fråga om rensning av en temporärkatalog -#: ly2dvi.py:322 +#: ly2dvi.py:242 #, c-format msgid "Cleaning %s..." msgstr "Rensar %s..." -#: ly2dvi.py:337 mup2ly.py:214 update-lily.py:237 -#, c-format -msgid "no such setting: %s" -msgstr "inställningen finns inte: %s" +#: ly2dvi.py:302 +msgid "Generate .dvi with LaTeX for LilyPond" +msgstr "Generera .dvi med LaTeX för LilyPond" -#: ly2dvi.py:350 main.cc:113 +#: ly2dvi.py:305 main.cc:113 msgid "write Makefile dependencies for every input file" msgstr "skriv Makefile-beroenden för varje indatafil" # förklaring av flaggan -h -#: ly2dvi.py:351 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 +#: ly2dvi.py:306 main.cc:96 main.cc:109 mup2ly.py:1117 update-lily.py:251 msgid "this help" msgstr "denna hjälp" -#: ly2dvi.py:352 main.cc:111 main.cc:116 +#: ly2dvi.py:307 main.cc:111 main.cc:116 msgid "DIR" msgstr "KATALOG" -#: ly2dvi.py:352 +#: ly2dvi.py:307 msgid "add DIR to LilyPond's search path" msgstr "lägg till KATALOG till LilyPonds sökväg" # %s är programmets namn -#: ly2dvi.py:353 +#: ly2dvi.py:308 #, c-format msgid "keep all output, and name the directory %s.dir" msgstr "behåll all utdata, och namnge katalogen %s.dir" -#: ly2dvi.py:354 +#: ly2dvi.py:309 msgid "don't run LilyPond" msgstr "kör inte LilyPond" -#: ly2dvi.py:355 main.cc:114 +#: ly2dvi.py:310 main.cc:114 msgid "produce MIDI output only" msgstr "skapa enbart MIDI-utdata" -#: ly2dvi.py:356 ly2dvi.py:357 main.cc:99 main.cc:112 main.cc:115 +#: ly2dvi.py:311 ly2dvi.py:312 main.cc:99 main.cc:112 main.cc:115 msgid "FILE" msgstr "FIL" -#: ly2dvi.py:356 +#: ly2dvi.py:311 msgid "write ouput to FILE" msgstr "skriv utdata till FIL" -#: ly2dvi.py:357 +#: ly2dvi.py:312 msgid "find pfa fonts used in FILE" msgstr "hitta pfa-typsnitt som används i FIL" -#: ly2dvi.py:359 +#: ly2dvi.py:314 msgid "generate PostScript output" msgstr "skapa PostScript-utdata" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "KEY=VAL" msgstr "NYCKEL=VÄRDE" -#: ly2dvi.py:360 +#: ly2dvi.py:315 msgid "change global setting KEY to VAL" msgstr "ändra global inställning NYCKEL till VÄRDE" # Förklaring till --verbose (borde vara längre) -#: ly2dvi.py:361 main.cc:119 mup2ly.py:1120 update-lily.py:255 +#: ly2dvi.py:316 main.cc:119 mup2ly.py:1120 update-lily.py:255 msgid "verbose" msgstr "utförlig utdata" -#: ly2dvi.py:362 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 +#: ly2dvi.py:317 main.cc:105 main.cc:118 mup2ly.py:1121 update-lily.py:256 msgid "print version number" msgstr "visa versionsnummer" -#: ly2dvi.py:363 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 +#: ly2dvi.py:318 main.cc:107 main.cc:120 mup2ly.py:1122 update-lily.py:258 msgid "show warranty and copyright" msgstr "visa garanti och copyright" -#: ly2dvi.py:385 ly2dvi.py:580 ly2dvi.py:605 +#: ly2dvi.py:397 mup2ly.py:214 update-lily.py:237 +#, c-format +msgid "no such setting: %s" +msgstr "inställningen finns inte: %s" + +#: ly2dvi.py:425 ly2dvi.py:623 ly2dvi.py:648 #, c-format msgid "Running %s..." msgstr "Kör %s..." -#: ly2dvi.py:398 +#: ly2dvi.py:440 #, c-format msgid "Analyzing %s..." msgstr "Analyserar %s..." -#: ly2dvi.py:454 +#: ly2dvi.py:496 #, c-format msgid "no lilypond output found for %s" msgstr "ingen lilypondutdata funnen för %s" -#: ly2dvi.py:496 +#: ly2dvi.py:538 #, c-format msgid "invalid value: %s" msgstr "ogiltigt värde: %s" -#: ly2dvi.py:639 +#: ly2dvi.py:682 #, c-format msgid "not a PostScript file: `%s'" msgstr "inte en PostScript-fil: \"%s\"" -#: ly2dvi.py:657 +#: ly2dvi.py:700 #, c-format msgid "getopt says: `%s'" msgstr "getopt säger: \"%s\"" +#: ly2dvi.py:811 +#, fuzzy, c-format +msgid "filename should not contain spaces: `%s'" +msgstr "Innehåller redan: \"%s\"" + # här är det fråga om skrivning till en fil -#: ly2dvi.py:824 scores.cc:44 +#: ly2dvi.py:876 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "beroenden skrivna till \"%s\"..." # här är det fråga om skrivning till en fil (första parametern är t.ex # DVI, LATEX, MIDI, TEX) -#: ly2dvi.py:835 +#: ly2dvi.py:887 #, c-format msgid "%s output to `%s'..." msgstr "%s skrivet till \"%s\"..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:837 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:889 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "kan inte hitta fil: \"%s\"" -#: ly2dvi.py:848 +#: ly2dvi.py:900 msgid "no files specified on command line." msgstr "inga filer angivna på kommandoraden." @@ -354,7 +359,7 @@ msgstr "ok msgid "can't map file" msgstr "kan inte göra \"mmap\" på filen" -#: lilypond-stream.cc:111 mapped-file-storage.cc:87 paper-stream.cc:45 +#: lilypond-stream.cc:112 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'" @@ -403,8 +408,12 @@ msgid "does not match: `%s'" msgstr "matchar inte: \"%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." -msgstr " Bygg om alla .afm-filer, och ta bort alla .pk- och .tfm-filer. Kör igen med -V för att visa typsnittssökvägar." +msgid "" +" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " +"to show font paths." +msgstr "" +" Bygg om alla .afm-filer, och ta bort alla .pk- och .tfm-filer. Kör igen med " +"-V för att visa typsnittssökvägar." #: all-font-metrics.cc:167 #, c-format @@ -434,6 +443,11 @@ msgstr "Ger upp" msgid "Can't switch translators, I'm there already" msgstr "Kan inte byta översättare, jag är redan där" +#: bar-check-iterator.cc:53 +#, c-format +msgid "barcheck failed at: %s" +msgstr "taktkontroll misslyckades vid: %s" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "kan inte hitta start på balk" @@ -509,7 +523,7 @@ msgstr "ogiltig subtraktion: inte del av ackord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "ogiltig ton för inversion: inte del av ett ackord: %s" -#: collision.cc:127 +#: collision.cc:286 msgid "Too many clashing notecolumns. Ignoring them." msgstr "För många krockande notkolumner. Ignorerar dem." @@ -539,7 +553,9 @@ msgstr "oavslutad ut #: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." -msgstr "Det finns inget att koppla utökaren mot till vänster. Ignorerar utökarförfrågan" +msgstr "" +"Det finns inget att koppla utökaren mot till vänster. Ignorerar " +"utökarförfrågan" #: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" @@ -575,7 +591,9 @@ msgstr "oavslutat bindestreck" #: hyphen-engraver.cc:102 msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." -msgstr "Det finns inget att koppla bindestrecket mot till vänster. Ignorerar bindestrecksförfrågan." +msgstr "" +"Det finns inget att koppla bindestrecket mot till vänster. Ignorerar " +"bindestrecksförfrågan." #: key-engraver.cc:99 msgid "Conflicting key signatures found." @@ -810,7 +828,7 @@ msgstr "pappersutdata till \"%s\"..." msgid ", at " msgstr ", vid " -#: paper-outputter.cc:232 +#: paper-outputter.cc:233 #, c-format msgid "writing header field `%s' to `%s'..." msgstr "skriver rubrikfält \"%s\" till \"%s\"..." @@ -883,7 +901,7 @@ msgid "can't find start of phrasing slur" msgstr "kan inte hitta start på fraseringsbåge" #: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 -#: piano-pedal-performer.cc:87 +#: piano-pedal-performer.cc:86 #, c-format msgid "can't find start of piano pedal: `%s'" msgstr "kan inte hitta start på pianopedal: \"%s\"" @@ -983,7 +1001,7 @@ msgstr "B msgid "Adding note head to incompatible stem (type = %d)" msgstr "Lägger till nothuvud till inkompatibel båge (typ = %d)" -#: stem.cc:116 +#: stem.cc:101 msgid "Weird stem size; check for narrow beams" msgstr "Konstig skaftstorlek; kolla efter smala balkar" @@ -1032,11 +1050,6 @@ msgstr "ensam b msgid "no one to print a tuplet start bracket" msgstr "det finns ingen som kan skriva en starthake för tupel" -#: timing-translator.cc:38 -#, c-format -msgid "barcheck failed at: %s" -msgstr "taktkontroll misslyckades vid: %s" - #: translator-ctors.cc:40 #, c-format msgid "unknown translator: `%s'" @@ -1073,13 +1086,18 @@ msgstr "kan inte hitta eller skapa: \"%s\"" #: translator-group.cc:414 #, c-format -msgid "Can't find property type-check for `%s'. Perhaps you made a typing error? Doing assignment anyway." -msgstr "Kan inte hitta egenskapstypkontroll för \"%s\". Kanske har du gjort ett typfel? Gör tilldelning i alla fall." +msgid "" +"Can't find property type-check for `%s'. Perhaps you made a typing error? " +"Doing assignment anyway." +msgstr "" +"Kan inte hitta egenskapstypkontroll för \"%s\". Kanske har du gjort ett " +"typfel? Gör tilldelning i alla fall." #: translator-group.cc:428 #, c-format msgid "Type check for `%s' failed; value `%s' must be of type `%s'" -msgstr "Typkontroll för \"%s\" misslyckades. Värde \"%s\" måste ha typen \"%s\"" +msgstr "" +"Typkontroll för \"%s\" misslyckades. Värde \"%s\" måste ha typen \"%s\"" #. programming_error? #: translator-group.cc:447 @@ -1119,32 +1137,32 @@ msgstr "Andra argumentet m msgid "First argument must be a procedure taking 1 argument" msgstr "Första argumentet måste vara en procedur som tar 1 argument" -#: parser.yy:1263 +#: parser.yy:1266 msgid "Expecting string as script definition" msgstr "Väntade sträng som skriptdefinition" -#: parser.yy:1273 +#: parser.yy:1276 msgid "Can't specify direction for this request" msgstr "Kan inte ange riktning för denna förfrågan" -#: parser.yy:1398 +#: parser.yy:1401 msgid "Expecting musical-pitch value" msgstr "Väntade notvärde" -#: parser.yy:1409 +#: parser.yy:1412 msgid "Must have duration object" msgstr "Måste ha längdobjekt" -#: parser.yy:1418 parser.yy:1426 +#: parser.yy:1421 parser.yy:1429 msgid "Have to be in Lyric mode for lyrics" msgstr "Måste vara i textläge (Lyric mode) för text" -#: parser.yy:1579 parser.yy:1636 +#: parser.yy:1584 parser.yy:1637 #, c-format msgid "not a duration: %d" msgstr "inte en längd: %d" -#: parser.yy:1645 +#: parser.yy:1648 msgid "Have to be in Note mode for notes" msgstr "Måste vara i notläge (Note mode) för noter" @@ -1254,11 +1272,11 @@ msgstr "Kvantifierar kolumner..." msgid "Settling columns..." msgstr "Bestämmer kolumner..." -#: lilypond-staff.cc:209 +#: lilypond-staff.cc:141 msgid "% MIDI copyright:" msgstr "% MIDI-copyright:" -#: lilypond-staff.cc:210 +#: lilypond-staff.cc:142 msgid "% MIDI instrument:" msgstr "% MIDI-instrument:" @@ -1278,8 +1296,8 @@ msgstr "% Skapare: " msgid "% Automatically generated" msgstr "% Automatgenererad" -#: lilypond-stream.cc:97 -#, c-format +#: lilypond-stream.cc:98 +#, no-c-format msgid "% from input file: " msgstr "% från indatafil: " @@ -1406,18 +1424,18 @@ msgstr "Sl msgid "invalid running status" msgstr "ogiltig körstatus" -#: midi-track-parser.cc:328 +#: midi-track-parser.cc:324 msgid "unimplemented MIDI meta-event" msgstr "oimplementerad MIDI-metahändelse" -#: midi-track-parser.cc:333 +#: midi-track-parser.cc:329 msgid "invalid MIDI event" msgstr "ogiltig MIDI-händelse" -#: midi-track-parser.cc:348 +#: midi-track-parser.cc:344 msgid "MIDI track expected" msgstr "väntade MIDI-spår" -#: midi-track-parser.cc:353 +#: midi-track-parser.cc:349 msgid "invalid track length" msgstr "ogiltig spårlängd" diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index fbbfe3ecbd..fe15316b41 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -38,12 +38,11 @@ default_footer = r"""
Please take me back to the index of @PACKAGE_NAME@ """ - built = r"""

This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ (@BRANCH@) by
 -

@GCOS@ <@MAILADDRESS@>, +
@GCOS@ <@MAILADDRESS@>, @LOCALTIME@.
""" @@ -138,6 +137,49 @@ footer = compose (default_footer, footer_file) + built header_tag = '' footer_tag = '' +# Python < 1.5.2 compatibility +# +# On most platforms, this is equivalent to +#`normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2* +if os.path.__dict__.has_key ('abspath'): + abspath = os.path.abspath +else: + def abspath (path): + return os.path.normpath (os.path.join (os.getcwd (), path)) + + +def remove_self_ref (s): + self_url = abspath (os.getcwd () + '/' + f) + #sys.stderr.write ('url0: %s\n' % self_url) + + # self_url = re.sub ('.*?' + string.lower (package_name) + '[^/]*/', + # '', self_url) + # URG - this only works when source tree is unpacked in `src/' dir + # For some reason, .*? still eats away + # /home/fred/usr/src/lilypond-1.5.14/Documentation/user/out-www/lilypond/ + # instead of just + # + # /home/fred/usr/src/lilypond-1.5.14/ + # + # Tutorial.html + self_url = re.sub ('.*?src/' + string.lower (package_name) + '[^/]*/', + '', self_url) + + #sys.stderr.write ('url1: %s\n' % self_url) + + #urg, ugly lily-specific toplevel index hack + self_url = re.sub ('.*topdocs/out-www/index.html', 'index.html', self_url) + #sys.stderr.write ('url2: %s\n' % self_url) + + m = re.match ('.*?()([^<]*)()', + s, re.DOTALL) + while m: + #sys.stderr.write ('self: %s\n' % m.group (2)) + s = s[:m.start (1)] + m.group (2) + s[m.end (3):] + m = re.match ('.*?()([^<]*)()', + s, re.DOTALL) + return s + def do_file (f): s = gulp_file (f) @@ -176,6 +218,7 @@ def do_file (f): else: s = s + footer + #URUGRGOUSNGUOUNRIU index = index_url top = top_url @@ -204,6 +247,24 @@ def do_file (f): s = re.sub ('@LOCALTIME@', localtime, s) s = re.sub ('@MAILADDRESS@', mail_address, s) s = re.sub ('@BRANCH@', branch_str, s) + + m = re.match ('.*?', s, re.DOTALL) + while m: + at_var = m.group (1) + at_val = m.group (2) + #sys.stderr.write ('at: %s -> %s\n' % (at_var, at_val)) + s = re.sub (at_var, at_val, s) + m = re.match ('.*?', s, re.DOTALL) + + # urg + # maybe find first node? + fallback_web_title = '-- --' + m = re.match ('.*?\(.*?\)', s, re.DOTALL) + if m: + fallback_web_title = m.group (1) + s = re.sub ('@WEB-TITLE@', fallback_web_title, s) + + s = remove_self_ref (s) open (f, 'w').write (s) diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py index da16975bf0..357ab5046a 100644 --- a/stepmake/bin/package-diff.py +++ b/stepmake/bin/package-diff.py @@ -5,7 +5,7 @@ # -import find + import fnmatch import sys import os @@ -14,6 +14,32 @@ import string import getopt import pipes + +_debug = 0 + +_prune = ['(*)'] + +def find(pattern, dir = os.curdir): + list = [] + names = os.listdir(dir) + names.sort() + for name in names: + if name in (os.curdir, os.pardir): + continue + fullname = os.path.join(dir, name) + if fnmatch.fnmatch(name, pattern): + list.append(fullname) + if os.path.isdir(fullname) and not os.path.islink(fullname): + for p in _prune: + if fnmatch.fnmatch(name, p): + if _debug: print "skip", `fullname` + break + else: + if _debug: print "descend into", `fullname` + list = list + find(pattern, fullname) + return list + + topdir = '' def gulp_file(f): try: @@ -87,20 +113,20 @@ def remove_automatic (dirnames): for d in dirnames: try: for p in pats: - files = files + find.find (p, d) + files = files + find (p, d) except: sys.stderr.write ("Can't find dir: %s\n" % d) cleanup () sys.exit (1) - dirs = map (lambda d: find.find ('out*', d), dirnames) + dirs = map (lambda d: find ('out*', d), dirnames) dirs = reduce (lambda x,y: x + y, dirs) #print dirs for d in dirs: if os.path.isdir (d): - files = files + find.find ('*', d) + files = files + find ('*', d) for f in files: try: @@ -177,8 +203,8 @@ def makediff (fromdir, todir, patch_name): sys.stderr.write ('diffing to %s... ' % patch_name) os.system ('pwd') - print ('diff -urN %s . >> %s' % (fromdir, patch_name)) - os.system ('diff -urN %s . >> %s' % (fromdir, patch_name)) + print ('diff -purN %s . >> %s' % (fromdir, patch_name)) + os.system ('diff -purN %s . >> %s' % (fromdir, patch_name)) os.system ('gzip --quiet -9f %s' % patch_name) diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make index 83b54258e0..1696b2e0aa 100644 --- a/stepmake/stepmake/c++-rules.make +++ b/stepmake/stepmake/c++-rules.make @@ -1,24 +1,27 @@ -# title C++ rules -# file make/C++_rules.make +.SUFFIXES: .cc .dep .hh .ll .o .so .yy -.SUFFIXES: .cc .o .hh .yy .ll .dep - -# compile rules: -# $(outdir)/%.o: %.cc - $(DO_CXX_COMPILE) + $(DO_O_DEP) $(CXX) -c $(CXXFLAGS) -o $@ $< $(outdir)/%.o: $(outdir)/%.cc - $(DO_CXX_COMPILE) + $(DO_O_DEP) $(CXX) -c $(CXXFLAGS) -o $@ $< + +$(outdir)/%.lo: %.cc + $(DO_LO_DEP) $(CXX) -c $(CXXFLAGS) $(PIC_FLAGS) -o $@ $< + +$(outdir)/%.lo: $(outdir)/%.cc + $(DO_LO_DEP) $(CXX) -c $(CXXFLAGS) $(PIC_FLAGS) -o $@ $< $(outdir)/%.cc: %.yy $(BISON) $< - mv $<.tab.c $@ + @-mv -f $(*F).yy.tab.c $(*F).tab.cc # bison < 1.30 + mv $(*F).tab.cc $@ $(outdir)/%.hh: %.yy $(BISON) -d $< - mv $<.tab.h $@ - rm $<.tab.c # if this happens in the wrong order it triggers recompile of the .cc file + @-mv -f $(*F).yy.tab.h $(*F).tab.hh # bison < 1.30 + mv $(*F).tab.hh $@ + rm -f $(*F).tab.c $(*F).tab.cc # if this happens in the wrong order it triggers recompile of the .cc file $(outdir)/%.cc: %.ll $(FLEX) -Cfe -p -p -t $< > $@ diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make index a2bf496187..fa16d4f6ee 100644 --- a/stepmake/stepmake/c-rules.make +++ b/stepmake/stepmake/c-rules.make @@ -1,23 +1,25 @@ -# stepmake/C_rules.make - -.SUFFIXES: .c .o .h .y .l .dep +.SUFFIXES: .c .dep .h .l .lo .o .so .y $(outdir)/%.o: %.c - $(DO_C_COMPILE) + $(DO_O_DEP) $(CC) -c $(CFLAGS) -o $@ $< $(outdir)/%.o: $(outdir)/%.c - $(DO_C_COMPILE) + $(DO_O_DEP) $(CC) -c $(CFLAGS) -o $@ $< + +$(outdir)/%.lo: %.c + $(DO_LO_DEP) $(CC) -c $(CFLAGS) $(PIC_FLAGS) -o $@ $< + +$(outdir)/%.lo: %.c + $(DO_LO_DEP) $(CC) -c $(CFLAGS) $(PIC_FLAGS) -o $@ $< $(outdir)/%.c: %.y $(BISON) $< -# mv $<.tab.c $@ - mv parser.tab.c $@ + mv $(*F).tab.c $@ $(outdir)/%.h: %.y $(BISON) -d $< -# mv $<.tab.h $@ - mv parser.tab.h $@ - mv parser.tab.c $(basename $@).c + mv $(*F).tab.h $@ + rm -f $(*F).tab.c # if this happens in the wrong order it triggers recompile of the .cc file $(outdir)/%.c: %.l $(FLEX) -Cfe -p -p -t $< > $@ -- 2.39.5