patch::: 1.3.130.jcn5

1.3.130.jcn5
============

* Added some handy targets to example makefile: make/ly.make.

* Bugfix: file-path.cc; absolute directories start with directory separator.

diff --git a/CHANGES b/CHANGES
index 0733f2e73863df398111383207217eadfb5014bb..c4868b9668f4403fb49133f48300d93c5cf84fb7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,17 @@
+1.3.130.jcn5
+============
+
+* Added some handy targets to example makefile: make/ly.make.
+
+* Bugfix: file-path.cc; absolute directories start with directory separator.
+
 1.3.130.jcn4
 ============
 
 * Makefile template using dependencies: make/ly.make.  Needs some
 simple examples.
 
-* Depencies fixes for lilypond, ly2dvi and lilypond-book.
+* Depencies fixes for lilypond, ly2dvi (still kludged) and lilypond-book.
 
 1.3.130.jcn3
 ============

diff --git a/VERSION b/VERSION
index 8032bf8d0dc10ec7a86828194a29556ee4d926a4..bdebd239b69a84c4eb5c481d8d2cd8b3ae5f3829 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=130
-MY_PATCH_LEVEL=jcn4
+MY_PATCH_LEVEL=jcn5
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/flower/file-path.cc b/flower/file-path.cc
index 03ae895f939f0b8978f2fc94dc9fdbc380999c0c..d7d6d27c37195f9cb8b154047f6012fa867b8f7c 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -56,7 +56,7 @@ split_path (String path)
   if (i >= 0)
     {
       p.root = path.left_str (i);
-      path = path.right_str (path.length_i () - i - 1);
+      path = path.right_str (path.length_i () - i); // - 1);
     }
 
   i = path.index_last_i (DIRSEP);

diff --git a/make/ly.make b/make/ly.make
index 69802512487946cd6966a39d3708ce41b588d171..2d6631d223af24fb01125c563de6566098a8cdc6 100644 (file)
--- a/make/ly.make
+++ b/make/ly.make
@@ -9,18 +9,16 @@
 #
 # Magic: find and include LilyPond's StepMake rules
 #
-# First, try source tree
-# Second, try installed tree in $HOME
-# Third, try system installed tree
+# 0: follow LILYPONDPREFIX
+# 1: try source tree
+# 2: try installed tree in $HOME
+# 3: try system installed tree
 #
-#
-##For testing installed lily
-##make-root=$(wildcard $(HOME)/tmp/test/usr/share/lilypond/make)
-#
-#
-make-root=$(wildcard $(HOME)/usr/src/lilypond/make)
+make-root=$(wildcard $(LILYPONDPREFIX)/make)
+make-root?=$(wildcard $(HOME)/usr/src/lilypond/make)
 make-root?=$(wildcard /usr/share/lilypond/make)
 make-root?=$(wildcard /usr/share/lilypond/make)
+#make-root=<LilyPond's datadir>/make
 ifneq ($(make-root),)
 $(message running from $(make-root))
 depth=$(make-root)/..
@@ -37,7 +35,24 @@ endif
 # This needs some work.
 #
 
-parts=$(patsubst %.ly,%,$(wildcard *-part.ly))
+#
+# Name of mutopia project
+#
+name=book
 tarball=$(name)
-mutopia-examples=$(name)
+parts=$(patsubst %.ly,%,$(wildcard *-part.ly))
+mutopia-examples=$(name) $(parts)
+
+#
+# Timothy's booklet
+#
+$(outdir)/%-book.ps: $(outdir)/%.ps
+       psbook $< $<.tmp
+       pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.tmp $@
 
+#
+# Catch-all target: type `make foo' to make out/foo.ps,
+# or make `foo-book' to make out/foo-book.ps
+#
+%: $(outdir)/%.ps
+       @echo Making $@ from $<

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index 5c7011da3d8e43d3db48975237825d2d646288e2..994418db1008c2cc6cee01ac2ea4f3913c897fbc 100644 (file)
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -1,6 +1,8 @@
 
 .PHONY: mutopia png ps scores tar
 
+.PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
+
 all: $(OUT_FILES)
 
 local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
@@ -14,10 +16,20 @@ convert-ly: local-convert-ly
 local-convert-ly:
        $(PYTHON) $(CONVERT_LY) -e *ly
 
+#
+# Also clean hand-compiled stuff in cwd
+#
+localclean: local-auto-gen-clean
+
+local-auto-gen-clean:
+       rm -f `grep -l 'Generated automacially by'  *`
+       rm -f *.dvi *.png
+
 tar:
        mkdir -p $(outdir)/$(tarball)
        cp -p *.ly $(outdir)/$(tarball)
        cd $(outdir) && tar czf $(tarball).tar.gz $(tarball)
+       rm -rf $(outdir)/$(tarball)
 
 png: $(png_examples)
 
@@ -31,8 +43,33 @@ mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz)
 mutopia:
        $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
 
+#
+# <NAME> and -book targets only available through ly.make template makefile;
+# too scary to install in LilyPonds make yet.
+#
+#
+
+ifeq (0,1)
+#
+# Timothy's booklet
+#
+$(outdir)/%-book.ps: $(outdir)/%.ps
+       psbook $< $<.1
+       pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.1 $@
+       rm -f $<.1
+
+#
+# Catch-all target: type `make foo' to make out/foo.ps,
+# or make `foo-book' to make out/foo-book.ps
+#
+%: $(outdir)/%.ps
+       @echo Making $@ from $<
+endif
+
 local-help:
        @echo -e "\
+  <NAME>      update $(outdir)/<NAME>.ps\n\
+  <NAME>-book update booklet $(outdir)/<NAME>-book.ps\n\
   convert-ly  convert all LilyPond sources\n\
   mutopia     update PNGs, PostScript a4 and letter of all mutopia-examples\n\
   png         update PNGs of all examples\n\

diff --git a/po/de.po b/po/de.po
index 7f7e5eeeeafb05beb86fd49aec8f551a3edba883..c261683547287a0c8b218f2ef262a6a61a9c09c6 100644 (file)
--- 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-02-23 11:58+0100\n"
+"POT-Creation-Date: 2001-02-24 12:58+0100\n"
 "PO-Revision-Date: 1999-09-18 01:30+0200\n"
 "Last-Translator: Erwin Dieterich <bamse@gmx.de>\n"
 "Language-Team: LANGUAGE <de@li.org>\n"
@@ -64,7 +64,7 @@ msgid "can't map file"
 msgstr "Kann die Datei nicht mappen"
 
 #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
-#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23
+#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "Kann die Datei %s nicht öffnen"
@@ -134,7 +134,7 @@ msgstr "Kann die Schrift %s nicht finden, lade die Standardschrift."
 msgid "can't find default font: `%s'"
 msgstr "Kann Schrift `%s' nicht finden"
 
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114
+#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(Suchpfad: `%s')"
@@ -317,7 +317,7 @@ msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
 #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
-#: scores.cc:113 scores.cc:119
+#: scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "Kann Datei `%s' nicht finden"
@@ -353,98 +353,102 @@ msgstr ""
 msgid "Huh? Melismatic note found to have associated lyrics."
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "EXT"
 msgstr "EXT"
 
-#: main.cc:102
+#: main.cc:105
 #, fuzzy
 msgid "use output format EXT (scm, ps, tex or as)"
 msgstr "Benutze das Ausgabeformat EXT"
 
-#: main.cc:95 main.cc:103
+#: main.cc:95 main.cc:106
 msgid "this help"
 msgstr "Diese Hilfe"
 
-#: main.cc:104
+#: main.cc:107
 #, fuzzy
 msgid "FIELD"
 msgstr "DATEI"
 
-#: main.cc:104
+#: main.cc:107
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:108 main.cc:111
 msgid "DIR"
 msgstr "DIR"
 
-#: main.cc:105
+#: main.cc:108
 msgid "add DIR to search path"
 msgstr "Hänge DIR an den Suchpfad an"
 
-#: main.cc:98 main.cc:106
+#: main.cc:98 main.cc:109
 msgid "FILE"
 msgstr "DATEI"
 
-#: main.cc:106
+#: main.cc:109
 msgid "use FILE as init file"
 msgstr "Verwende FILE als Initialisierungsdatei"
 
-#: main.cc:107
+#: main.cc:110
 msgid "write Makefile dependencies for every input file"
 msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei"
 
-#: main.cc:108
+#: main.cc:111
+msgid "prepend DIR to dependencies"
+msgstr ""
+
+#: main.cc:112
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "Nur Midiausgabe"
 
-#: main.cc:109
+#: main.cc:113
 #, fuzzy
 msgid "NAME"
 msgstr "BASENAME"
 
-#: main.cc:109
+#: main.cc:113
 #, fuzzy
 msgid "write output to NAME"
 msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung"
 
-#: main.cc:110
+#: main.cc:114
 msgid "inhibit file output naming and exporting"
 msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export"
 
-#: main.cc:103 main.cc:111
+#: main.cc:103 main.cc:115
 msgid "don't timestamp the output"
 msgstr "Keine Datumsangabe auf der Ausgabe"
 
-#: main.cc:104 main.cc:112
+#: main.cc:104 main.cc:116
 msgid "print version number"
 msgstr "Zeige die Versionsnummer"
 
-#: main.cc:113
+#: main.cc:117
 #, fuzzy
 msgid "verbose"
 msgstr "Sei geschwätzig"
 
-#: main.cc:106 main.cc:114
+#: main.cc:106 main.cc:118
 msgid "show warranty and copyright"
 msgstr "Zeige Garantie und Urheberrechte"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:131
+#: main.cc:135
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..."
 
-#: main.cc:133
+#: main.cc:137
 #, fuzzy
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Setze Musik oder spiele MIDI von DATEI"
 
-#: main.cc:137
+#: main.cc:141
 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"
@@ -454,20 +458,20 @@ msgstr ""
 "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n"
 "lilyPond ist Teil des GNU-Projekts\n"
 
-#: main.cc:119 main.cc:143
+#: main.cc:119 main.cc:147
 msgid "Options:"
 msgstr "Optionen:"
 
-#: main.cc:147
+#: main.cc:151
 msgid "This binary was compiled with the following options:"
 msgstr "Diese Programm wurde mit den folgenden Optionen übersetzt:"
 
-#: main.cc:123 main.cc:166
+#: main.cc:123 main.cc:170
 #, fuzzy, c-format
 msgid "Report bugs to %s"
 msgstr "Melde Fehler an"
 
-#: main.cc:55 main.cc:174
+#: main.cc:55 main.cc:178
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -480,17 +484,17 @@ msgstr ""
 "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n"
 "Sie mehr Informationen.\n"
 
-#: main.cc:62 main.cc:181 main.cc:193
+#: main.cc:62 main.cc:185 main.cc:197
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Urheberrechte (Copyright) (c) %s bei"
 
-#: main.cc:191
+#: main.cc:195
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts"
 
-#: main.cc:71 main.cc:199
+#: main.cc:71 main.cc:203
 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"
@@ -718,17 +722,17 @@ msgstr "verstrichene Zeit %.2f Sekunden"
 msgid "unbound spanner `%s'"
 msgstr "Unbeschränkter Abstand `%s'"
 
-#: scores.cc:35
+#: scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to %s..."
 msgstr "Ausgabe auf Papier auf %s..."
 
-#: scores.cc:83
+#: scores.cc:106
 #, fuzzy
 msgid "Score contains errors; will not process it"
 msgstr "Partitur enthält Fehler; ich werde sie nicht weiterverarbeiten"
 
-#: scores.cc:129
+#: scores.cc:152
 #, fuzzy, c-format
 msgid "Now processing: `%s'"
 msgstr "Unbekannte Sonder-Zeichenkette"

diff --git a/po/fr.po b/po/fr.po
index f7c0f112e6297f8b6866ad089fef38f4b6a27c51..574266208dc3937ed60e930d28bc2bc732cd6139 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.3.18\n"
-"POT-Creation-Date: 2001-02-23 11:58+0100\n"
+"POT-Creation-Date: 2001-02-24 12:58+0100\n"
 "PO-Revision-Date: 1999-12-28 00:32 +1\n"
 "Last-Translator: Laurent Martelli <laurent@linuxfan.com>\n"
 "Language-Team: \n"
@@ -64,7 +64,7 @@ msgid "can't map file"
 msgstr "impossible de mapper le fichier"
 
 #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
-#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23
+#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "impossible d'ouvrir le fichier: `%s'"
@@ -134,7 +134,7 @@ msgstr "Impossible de trouver la police `%s', chargement la police par d
 msgid "can't find default font: `%s'"
 msgstr "Impossible de trouver la fonte par défaut `%s', abandon."
 
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114
+#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
 #, fuzzy, c-format
 msgid "(search path: `%s')"
 msgstr "chemin de recherche= %s"
@@ -313,7 +313,7 @@ msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
 #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
-#: scores.cc:113 scores.cc:119
+#: scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "ne peut pas trouver le fichier: `%s'"
@@ -349,95 +349,99 @@ msgstr ""
 msgid "Huh? Melismatic note found to have associated lyrics."
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "EXT"
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "use output format EXT (scm, ps, tex or as)"
 msgstr ""
 
-#: main.cc:95 main.cc:103
+#: main.cc:95 main.cc:106
 msgid "this help"
 msgstr "cette aide"
 
-#: main.cc:104
+#: main.cc:107
 #, fuzzy
 msgid "FIELD"
 msgstr "FICHIER"
 
-#: main.cc:104
+#: main.cc:107
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:108 main.cc:111
 msgid "DIR"
 msgstr "REP"
 
-#: main.cc:105
+#: main.cc:108
 #, fuzzy
 msgid "add DIR to search path"
 msgstr "ajoute REP au chemin de recherche"
 
-#: main.cc:98 main.cc:106
+#: main.cc:98 main.cc:109
 msgid "FILE"
 msgstr "FICHIER"
 
-#: main.cc:106
+#: main.cc:109
 #, fuzzy
 msgid "use FILE as init file"
 msgstr "utilise FICHIER comme fichier d'initialisation"
 
-#: main.cc:107
+#: main.cc:110
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 
-#: main.cc:108
+#: main.cc:111
+msgid "prepend DIR to dependencies"
+msgstr ""
+
+#: main.cc:112
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "produit seulement la sortie MIDI"
 
-#: main.cc:109
+#: main.cc:113
 msgid "NAME"
 msgstr ""
 
-#: main.cc:109
+#: main.cc:113
 msgid "write output to NAME"
 msgstr ""
 
-#: main.cc:110
+#: main.cc:114
 msgid "inhibit file output naming and exporting"
 msgstr ""
 
-#: main.cc:103 main.cc:111
+#: main.cc:103 main.cc:115
 msgid "don't timestamp the output"
 msgstr ""
 
-#: main.cc:104 main.cc:112
+#: main.cc:104 main.cc:116
 msgid "print version number"
 msgstr "afficher le numéro de version"
 
-#: main.cc:113
+#: main.cc:117
 msgid "verbose"
 msgstr ""
 
-#: main.cc:106 main.cc:114
+#: main.cc:106 main.cc:118
 msgid "show warranty and copyright"
 msgstr ""
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:131
+#: main.cc:135
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr "Usage: %s [OPTION]... [FICHIER]..."
 
-#: main.cc:133
+#: main.cc:137
 msgid "Typeset music and or play MIDI from FILE"
 msgstr ""
 
-#: main.cc:137
+#: main.cc:141
 #, fuzzy
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
@@ -448,21 +452,21 @@ msgstr ""
 "paritions à partir de description de gaut niveau en entrée. Lilypond\n"
 "fait partie du projet GNU.\n"
 
-#: main.cc:119 main.cc:143
+#: main.cc:119 main.cc:147
 msgid "Options:"
 msgstr "Options: "
 
-#: main.cc:147
+#: main.cc:151
 #, fuzzy
 msgid "This binary was compiled with the following options:"
 msgstr "Cet exécutable a été compilé avec les options suivantes:"
 
-#: main.cc:123 main.cc:166
+#: main.cc:123 main.cc:170
 #, fuzzy, c-format
 msgid "Report bugs to %s"
 msgstr "Rapporter les bugs à"
 
-#: main.cc:55 main.cc:174
+#: main.cc:55 main.cc:178
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -470,17 +474,17 @@ msgid ""
 "certain conditions.  Invoke as `%s --warranty' for more information.\n"
 msgstr ""
 
-#: main.cc:62 main.cc:181 main.cc:193
+#: main.cc:62 main.cc:185 main.cc:197
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s par"
 
-#: main.cc:191
+#: main.cc:195
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU"
 
-#: main.cc:71 main.cc:199
+#: main.cc:71 main.cc:203
 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"
@@ -690,16 +694,16 @@ msgstr "temps ecoul
 msgid "unbound spanner `%s'"
 msgstr "traducteur inconnu `%s'"
 
-#: scores.cc:35
+#: scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to %s..."
 msgstr "Sortie papier vers %s..."
 
-#: scores.cc:83
+#: scores.cc:106
 msgid "Score contains errors; will not process it"
 msgstr ""
 
-#: scores.cc:129
+#: scores.cc:152
 #, fuzzy, c-format
 msgid "Now processing: `%s'"
 msgstr "chaîne d'échappement inconnue: `\\%s'"

diff --git a/po/it.po b/po/it.po
index e8cecaa10ccd1fc1ac0cd4235b1b6f74e991cea4..30007b91f13da8356e2c4ae60cf210a710fb9f02 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-02-23 11:58+0100\n"
+"POT-Creation-Date: 2001-02-24 12:58+0100\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Date: 1998-05-30 00:17:12+0200\n"
 "From:  <jantien@xs4all.nl>\n"
@@ -64,7 +64,7 @@ msgid "can't map file"
 msgstr "non posso mappare il documento"
 
 #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
-#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23
+#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "non posso aprire il file: `%s'"
@@ -131,7 +131,7 @@ msgstr ""
 msgid "can't find default font: `%s'"
 msgstr "non trovo il file: `%s'"
 
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114
+#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
 #, fuzzy, c-format
 msgid "(search path: `%s')"
 msgstr "(Il path di caricamento è `%s'"
@@ -311,7 +311,7 @@ msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
 #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
-#: scores.cc:113 scores.cc:119
+#: scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "non trovo il file: `%s'"
@@ -347,86 +347,90 @@ msgstr ""
 msgid "Huh? Melismatic note found to have associated lyrics."
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "EXT"
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "use output format EXT (scm, ps, tex or as)"
 msgstr ""
 
-#: main.cc:95 main.cc:103
+#: main.cc:95 main.cc:106
 msgid "this help"
 msgstr ""
 
-#: main.cc:104
+#: main.cc:107
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:104
+#: main.cc:107
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:108 main.cc:111
 msgid "DIR"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:108
 #, fuzzy
 msgid "add DIR to search path"
 msgstr "  -I, --include=DIR      aggiunge DIR ai path di ricerca\n"
 
-#: main.cc:98 main.cc:106
+#: main.cc:98 main.cc:109
 msgid "FILE"
 msgstr ""
 
-#: main.cc:106
+#: main.cc:109
 #, fuzzy
 msgid "use FILE as init file"
 msgstr "  -i, --init=NOMEFILE    usa NOMEFILE come file iniziale\n"
 
-#: main.cc:107
+#: main.cc:110
 #, fuzzy
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 "  -d, --dependencies     scrive le dependenze del Makefile per ogni file di "
 "input\n"
 
-#: main.cc:108
+#: main.cc:111
+msgid "prepend DIR to dependencies"
+msgstr ""
+
+#: main.cc:112
 #, fuzzy
 msgid "produce MIDI output only"
 msgstr "  -M, --no-paper         produce solo output midi\n"
 
-#: main.cc:109
+#: main.cc:113
 msgid "NAME"
 msgstr ""
 
-#: main.cc:109
+#: main.cc:113
 msgid "write output to NAME"
 msgstr ""
 
-#: main.cc:110
+#: main.cc:114
 #, fuzzy
 msgid "inhibit file output naming and exporting"
 msgstr ""
 "  -s, --safe             inibisce la rinomina dei file di output e "
 "l'esportazione di macro di TeX\n"
 
-#: main.cc:103 main.cc:111
+#: main.cc:103 main.cc:115
 #, fuzzy
 msgid "don't timestamp the output"
 msgstr ""
 "  -T, --no-timestamps    non inserisce marcatori temporali nell'output\n"
 
-#: main.cc:104 main.cc:112
+#: main.cc:104 main.cc:116
 msgid "print version number"
 msgstr ""
 
-#: main.cc:113
+#: main.cc:117
 msgid "verbose"
 msgstr ""
 
-#: main.cc:106 main.cc:114
+#: main.cc:106 main.cc:118
 #, fuzzy
 msgid "show warranty and copyright"
 msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"
@@ -434,38 +438,38 @@ msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:131
+#: main.cc:135
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr "Uso: %s [OPZIONE]... [FILE]..."
 
-#: main.cc:133
+#: main.cc:137
 #, fuzzy
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Stampa partitura oppure suona una song MIDI da FILE o <stdin>"
 
-#: main.cc:137
+#: main.cc:141
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
 "the GNU Project.\n"
 msgstr ""
 
-#: main.cc:119 main.cc:143
+#: main.cc:119 main.cc:147
 msgid "Options:"
 msgstr "Opzioni: "
 
-#: main.cc:147
+#: main.cc:151
 #, fuzzy
 msgid "This binary was compiled with the following options:"
 msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:"
 
-#: main.cc:123 main.cc:166
+#: main.cc:123 main.cc:170
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 
-#: main.cc:55 main.cc:174
+#: main.cc:55 main.cc:178
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -473,17 +477,17 @@ msgid ""
 "certain conditions.  Invoke as `%s --warranty' for more information.\n"
 msgstr ""
 
-#: main.cc:62 main.cc:181 main.cc:193
+#: main.cc:62 main.cc:185 main.cc:197
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s di"
 
-#: main.cc:191
+#: main.cc:195
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU"
 
-#: main.cc:71 main.cc:199
+#: main.cc:71 main.cc:203
 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"
@@ -713,17 +717,17 @@ msgstr "durata: %.2f secondi"
 msgid "unbound spanner `%s'"
 msgstr "Spanner non legato `%s'"
 
-#: scores.cc:35
+#: scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to %s..."
 msgstr "L'output stampato è inviato a %s..."
 
-#: scores.cc:83
+#: scores.cc:106
 #, fuzzy
 msgid "Score contains errors; will not process it"
 msgstr "lo spartito contiene errori; non lo elaborerò"
 
-#: scores.cc:129
+#: scores.cc:152
 #, fuzzy, c-format
 msgid "Now processing: `%s'"
 msgstr "stringa di escape sconosciuta: `\\%s'"

diff --git a/po/ja.po b/po/ja.po
index 58f5e86b3429d74b2e69968dd83caab02cfa4c0e..2c692021635fef03df68d065e35e1602c243b3a1 100644 (file)
--- 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-02-23 11:58+0100\n"
+"POT-Creation-Date: 2001-02-24 12:58+0100\n"
 "PO-Revision-Date: 2000-03-29 20:50+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -64,7 +64,7 @@ msgid "can't map file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó"
 
 #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
-#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23
+#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
 #, fuzzy, c-format
 msgid "can't open file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
@@ -131,7 +131,7 @@ msgstr "
 msgid "can't find default font: `%s'"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114
+#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
@@ -310,7 +310,7 @@ msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr "º¸Â¦¤Ë·Ò¤²¤ë¥Ï¥¤¥Õ¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ï¥¤¥Õ¥ó¤ÎÍ×µá¤ò̵»ë¤·¤Þ¤¹"
 
 #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
-#: scores.cc:113 scores.cc:119
+#: scores.cc:136 scores.cc:142
 #, fuzzy, c-format
 msgid "can't find file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
@@ -346,96 +346,100 @@ msgstr ""
 msgid "Huh? Melismatic note found to have associated lyrics."
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "EXT"
 msgstr "EXT"
 
-#: main.cc:102
+#: main.cc:105
 #, fuzzy
 msgid "use output format EXT (scm, ps, tex or as)"
 msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦"
 
-#: main.cc:95 main.cc:103
+#: main.cc:95 main.cc:106
 msgid "this help"
 msgstr "¤³¤Î¥Ø¥ë¥×"
 
-#: main.cc:104
+#: main.cc:107
 #, fuzzy
 msgid "FIELD"
 msgstr "FILE"
 
-#: main.cc:104
+#: main.cc:107
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:108 main.cc:111
 msgid "DIR"
 msgstr "DIR"
 
-#: main.cc:105
+#: main.cc:108
 msgid "add DIR to search path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ"
 
-#: main.cc:98 main.cc:106
+#: main.cc:98 main.cc:109
 msgid "FILE"
 msgstr "FILE"
 
-#: main.cc:106
+#: main.cc:109
 msgid "use FILE as init file"
 msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ"
 
-#: main.cc:107
+#: main.cc:110
 msgid "write Makefile dependencies for every input file"
 msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à"
 
-#: main.cc:108
+#: main.cc:111
+msgid "prepend DIR to dependencies"
+msgstr ""
+
+#: main.cc:112
 msgid "produce MIDI output only"
 msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß"
 
-#: main.cc:109
+#: main.cc:113
 #, fuzzy
 msgid "NAME"
 msgstr "BASENAME"
 
-#: main.cc:109
+#: main.cc:113
 #, fuzzy
 msgid "write output to NAME"
 msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
 
-#: main.cc:110
+#: main.cc:114
 msgid "inhibit file output naming and exporting"
 msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë"
 
-#: main.cc:103 main.cc:111
+#: main.cc:103 main.cc:115
 msgid "don't timestamp the output"
 msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤"
 
-#: main.cc:104 main.cc:112
+#: main.cc:104 main.cc:116
 msgid "print version number"
 msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨"
 
-#: main.cc:113
+#: main.cc:117
 #, fuzzy
 msgid "verbose"
 msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: main.cc:106 main.cc:114
+#: main.cc:106 main.cc:118
 msgid "show warranty and copyright"
 msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:131
+#: main.cc:135
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
 
-#: main.cc:133
+#: main.cc:137
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë"
 
-#: main.cc:137
+#: main.cc:141
 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"
@@ -445,20 +449,20 @@ msgstr ""
 "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU "
 "¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n"
 
-#: main.cc:119 main.cc:143
+#: main.cc:119 main.cc:147
 msgid "Options:"
 msgstr "¥ª¥×¥·¥ç¥ó:"
 
-#: main.cc:147
+#: main.cc:151
 msgid "This binary was compiled with the following options:"
 msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿"
 
-#: main.cc:123 main.cc:166
+#: main.cc:123 main.cc:170
 #, c-format
 msgid "Report bugs to %s"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø"
 
-#: main.cc:55 main.cc:174
+#: main.cc:55 main.cc:178
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -474,17 +478,17 @@ msgstr ""
 "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n"
 "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
 
-#: main.cc:62 main.cc:181 main.cc:193
+#: main.cc:62 main.cc:185 main.cc:197
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s by"
 
-#: main.cc:191
+#: main.cc:195
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- The GNU Project music typesetter"
 
-#: main.cc:71 main.cc:199
+#: main.cc:71 main.cc:203
 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"
@@ -722,16 +726,16 @@ msgstr "
 msgid "unbound spanner `%s'"
 msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'"
 
-#: scores.cc:35
+#: scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to %s..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
-#: scores.cc:83
+#: scores.cc:106
 msgid "Score contains errors; will not process it"
 msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó"
 
-#: scores.cc:129
+#: scores.cc:152
 #, fuzzy, c-format
 msgid "Now processing: `%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 921a6cd58b08a24c22a78e017ec17d5179b1f22b..d2b4ff2d0f98c63d797eb69092acefa7dc24cafb 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-23 11:58+0100\n"
+"POT-Creation-Date: 2001-02-24 12:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,7 +63,7 @@ msgid "can't map file"
 msgstr ""
 
 #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
-#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23
+#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr ""
@@ -130,7 +130,7 @@ msgstr ""
 msgid "can't find default font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114
+#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
 #, c-format
 msgid "(search path: `%s')"
 msgstr ""
@@ -295,7 +295,7 @@ msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
 #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
-#: scores.cc:113 scores.cc:119
+#: scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr ""
@@ -331,111 +331,115 @@ msgstr ""
 msgid "Huh? Melismatic note found to have associated lyrics."
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "EXT"
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "use output format EXT (scm, ps, tex or as)"
 msgstr ""
 
-#: main.cc:95 main.cc:103
+#: main.cc:95 main.cc:106
 msgid "this help"
 msgstr ""
 
-#: main.cc:104
+#: main.cc:107
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:104
+#: main.cc:107
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:108 main.cc:111
 msgid "DIR"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:108
 msgid "add DIR to search path"
 msgstr ""
 
-#: main.cc:98 main.cc:106
+#: main.cc:98 main.cc:109
 msgid "FILE"
 msgstr ""
 
-#: main.cc:106
+#: main.cc:109
 msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:107
+#: main.cc:110
 msgid "write Makefile dependencies for every input file"
 msgstr ""
 
-#: main.cc:108
+#: main.cc:111
+msgid "prepend DIR to dependencies"
+msgstr ""
+
+#: main.cc:112
 msgid "produce MIDI output only"
 msgstr ""
 
-#: main.cc:109
+#: main.cc:113
 msgid "NAME"
 msgstr ""
 
-#: main.cc:109
+#: main.cc:113
 msgid "write output to NAME"
 msgstr ""
 
-#: main.cc:110
+#: main.cc:114
 msgid "inhibit file output naming and exporting"
 msgstr ""
 
-#: main.cc:103 main.cc:111
+#: main.cc:103 main.cc:115
 msgid "don't timestamp the output"
 msgstr ""
 
-#: main.cc:104 main.cc:112
+#: main.cc:104 main.cc:116
 msgid "print version number"
 msgstr ""
 
-#: main.cc:113
+#: main.cc:117
 msgid "verbose"
 msgstr ""
 
-#: main.cc:106 main.cc:114
+#: main.cc:106 main.cc:118
 msgid "show warranty and copyright"
 msgstr ""
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:131
+#: main.cc:135
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr ""
 
-#: main.cc:133
+#: main.cc:137
 msgid "Typeset music and or play MIDI from FILE"
 msgstr ""
 
-#: main.cc:137
+#: main.cc:141
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
 "the GNU Project.\n"
 msgstr ""
 
-#: main.cc:119 main.cc:143
+#: main.cc:119 main.cc:147
 msgid "Options:"
 msgstr ""
 
-#: main.cc:147
+#: main.cc:151
 msgid "This binary was compiled with the following options:"
 msgstr ""
 
-#: main.cc:123 main.cc:166
+#: main.cc:123 main.cc:170
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 
-#: main.cc:55 main.cc:174
+#: main.cc:55 main.cc:178
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -443,16 +447,16 @@ msgid ""
 "certain conditions.  Invoke as `%s --warranty' for more information.\n"
 msgstr ""
 
-#: main.cc:62 main.cc:181 main.cc:193
+#: main.cc:62 main.cc:185 main.cc:197
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr ""
 
-#: main.cc:191
+#: main.cc:195
 msgid "GNU LilyPond -- The music typesetter"
 msgstr ""
 
-#: main.cc:71 main.cc:199
+#: main.cc:71 main.cc:203
 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"
@@ -658,16 +662,16 @@ msgstr ""
 msgid "unbound spanner `%s'"
 msgstr ""
 
-#: scores.cc:35
+#: scores.cc:44
 #, c-format
 msgid "dependencies output to %s..."
 msgstr ""
 
-#: scores.cc:83
+#: scores.cc:106
 msgid "Score contains errors; will not process it"
 msgstr ""
 
-#: scores.cc:129
+#: scores.cc:152
 #, c-format
 msgid "Now processing: `%s'"
 msgstr ""

diff --git a/po/nl.po b/po/nl.po
index 4751b80033a70c89d510660de1b4f8352d48c01f..c35e8b2d430fb66d48a85e0615b91a0bc856aea0 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.3.59\n"
-"POT-Creation-Date: 2001-02-23 11:58+0100\n"
+"POT-Creation-Date: 2001-02-24 12:58+0100\n"
 "PO-Revision-Date: 2000-06-09 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -73,7 +73,7 @@ msgid "can't map file"
 msgstr "kan bestand niet inkaarten"
 
 #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
-#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23
+#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "kan bestand niet openen: `%s'"
@@ -142,7 +142,7 @@ msgstr "Laad verstek font"
 msgid "can't find default font: `%s'"
 msgstr "kan verstekfont niet vinden: `%s'"
 
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114
+#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(zoekpad: `%s')"
@@ -309,7 +309,7 @@ msgstr ""
 "Niets om streepje aan linkerkant aan vast te maken.  Negeer streepje verzoek."
 
 #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
-#: scores.cc:113 scores.cc:119
+#: scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "kan bestand niet vinden: `%s'"
@@ -345,91 +345,95 @@ msgstr "liedteksten gevonden zonder bijbehorend nootbolletje"
 msgid "Huh? Melismatic note found to have associated lyrics."
 msgstr "Huh?  Melismatische noot blijkt bijbehorende liedtekst te hebben."
 
-#: main.cc:102
+#: main.cc:105
 msgid "EXT"
 msgstr "EXT"
 
-#: main.cc:102
+#: main.cc:105
 msgid "use output format EXT (scm, ps, tex or as)"
 msgstr "gebruik uitvoer formaat EXT (scm, ps, tex of as)"
 
-#: main.cc:95 main.cc:103
+#: main.cc:95 main.cc:106
 msgid "this help"
 msgstr "deze hulp"
 
-#: main.cc:104
+#: main.cc:107
 msgid "FIELD"
 msgstr "VELD"
 
-#: main.cc:104
+#: main.cc:107
 msgid "write header field to BASENAME.FIELD"
 msgstr "schrijf kop veld naar BASISNAAM.VELD"
 
-#: main.cc:105
+#: main.cc:108 main.cc:111
 msgid "DIR"
 msgstr "DIR"
 
-#: main.cc:105
+#: main.cc:108
 msgid "add DIR to search path"
 msgstr "voeg DIR toe aan zoekpad"
 
-#: main.cc:98 main.cc:106
+#: main.cc:98 main.cc:109
 msgid "FILE"
 msgstr "BESTAND"
 
-#: main.cc:106
+#: main.cc:109
 msgid "use FILE as init file"
 msgstr "gebruik BESTAND als initialisatiebestand"
 
-#: main.cc:107
+#: main.cc:110
 msgid "write Makefile dependencies for every input file"
 msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand"
 
-#: main.cc:108
+#: main.cc:111
+msgid "prepend DIR to dependencies"
+msgstr "voeg DIR voor aan afhankelijkheden"
+
+#: main.cc:112
 msgid "produce MIDI output only"
 msgstr "produceer alleen MIDI uitvoer"
 
-#: main.cc:109
+#: main.cc:113
 msgid "NAME"
 msgstr "NAAM"
 
-#: main.cc:109
+#: main.cc:113
 msgid "write output to NAME"
 msgstr "schrijf uitvoer naar NAAM"
 
-#: main.cc:110
+#: main.cc:114
 msgid "inhibit file output naming and exporting"
 msgstr "verbied naamgeving van uitvoer bestand en exportering"
 
-#: main.cc:103 main.cc:111
+#: main.cc:103 main.cc:115
 msgid "don't timestamp the output"
 msgstr "geen tijdsstempel in de uitvoer"
 
-#: main.cc:104 main.cc:112
+#: main.cc:104 main.cc:116
 msgid "print version number"
 msgstr "druk versienummer af"
 
-#: main.cc:113
+#: main.cc:117
 msgid "verbose"
 msgstr "breedsprakig"
 
-#: main.cc:106 main.cc:114
+#: main.cc:106 main.cc:118
 msgid "show warranty and copyright"
 msgstr "toon garantie en auteursrechten"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:131
+#: main.cc:135
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr "Gebruik: %s [OPTIE]... [BESTAND]..."
 
-#: main.cc:133
+#: main.cc:137
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Zet muziek en of speel MIDI van BESTAND"
 
-#: main.cc:137
+#: main.cc:141
 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"
@@ -439,22 +443,22 @@ msgstr ""
 "uitgaande van een hoog niveau beschrijving bestand.  LilyPond \n"
 "maakt deel uit van het GNU Project.\n"
 
-#: main.cc:119 main.cc:143
+#: main.cc:119 main.cc:147
 msgid "Options:"
 msgstr "Opties:"
 
-#: main.cc:147
+#: main.cc:151
 msgid "This binary was compiled with the following options:"
 msgstr "Dit programma is gecompileerd met de volgende instellingen:"
 
-#: main.cc:123 main.cc:166
+#: main.cc:123 main.cc:170
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 "Meld luizen in het programma aan %s;\n"
 "meld onjuistheden in de vertaling aan <janneke@gnu.org> of <hanwen@cs.uu.nl>"
 
-#: main.cc:55 main.cc:174
+#: main.cc:55 main.cc:178
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -466,16 +470,16 @@ msgstr ""
 "onder bepaalde voorwaarden.  Roep aan als `%s --warranty' voor meer\n"
 "informatie.\n"
 
-#: main.cc:62 main.cc:181 main.cc:193
+#: main.cc:62 main.cc:185 main.cc:197
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s "
 
-#: main.cc:191
+#: main.cc:195
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- De Muziekzetter"
 
-#: main.cc:71 main.cc:199
+#: main.cc:71 main.cc:203
 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"
@@ -696,16 +700,16 @@ msgstr "duur: %.2f seconden"
 msgid "unbound spanner `%s'"
 msgstr "ongebonden spanner `%s'"
 
-#: scores.cc:35
+#: scores.cc:44
 #, c-format
 msgid "dependencies output to %s..."
 msgstr "afhankelijkheden uitvoer naar %s..."
 
-#: scores.cc:83
+#: scores.cc:106
 msgid "Score contains errors; will not process it"
 msgstr "Partituur bevat fouten; zal hem niet verwerken"
 
-#: scores.cc:129
+#: scores.cc:152
 #, c-format
 msgid "Now processing: `%s'"
 msgstr "Nu wordt verwerkt: `%s'"
@@ -1170,4 +1174,3 @@ msgstr "% Automatisch gegenereerd"
 #, c-format
 msgid "% from input file: "
 msgstr "% van invoerbestand: "
-

diff --git a/po/ru.po b/po/ru.po
index 74d9dddfef83ea9c006eee00cd2c476cdf15f157..acdd91565607aa2807eccfb4571d11c6d754360b 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-23 11:58+0100\n"
+"POT-Creation-Date: 2001-02-24 12:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: August S.Sigov <august@infran.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -63,7 +63,7 @@ msgid "can't map file"
 msgstr "ÎÅ ÍÏÇÕ ÏÔÏÂÒÁÚÉÔØ ÆÁÊÌ × ÐÁÍÑÔØ"
 
 #: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
-#: paper-stream.cc:40 scores.cc:39 simple-file-storage.cc:44 text-stream.cc:23
+#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
 #, c-format
 msgid "can't open file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ: `%s'"
@@ -130,7 +130,7 @@ msgstr "
 msgid "can't find default font: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'"
 
-#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:114
+#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')"
@@ -297,7 +297,7 @@ msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr "îÅ Ë ÞÅÍÕ ÐÒÉÓÏÅÄÉÎÉÔØ ÐÅÒÅÎÏÓ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÐÅÒÅÎÏÓÁ."
 
 #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24
-#: scores.cc:113 scores.cc:119
+#: scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
@@ -333,96 +333,100 @@ msgstr ""
 msgid "Huh? Melismatic note found to have associated lyrics."
 msgstr ""
 
-#: main.cc:102
+#: main.cc:105
 msgid "EXT"
 msgstr "òáóû"
 
-#: main.cc:102
+#: main.cc:105
 #, fuzzy
 msgid "use output format EXT (scm, ps, tex or as)"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû"
 
-#: main.cc:95 main.cc:103
+#: main.cc:95 main.cc:106
 msgid "this help"
 msgstr "ÜÔÁ ÓÐÒÁ×ËÁ"
 
-#: main.cc:104
+#: main.cc:107
 #, fuzzy
 msgid "FIELD"
 msgstr "æáêì"
 
-#: main.cc:104
+#: main.cc:107
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:105
+#: main.cc:108 main.cc:111
 msgid "DIR"
 msgstr "ëáô"
 
-#: main.cc:105
+#: main.cc:108
 msgid "add DIR to search path"
 msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ"
 
-#: main.cc:98 main.cc:106
+#: main.cc:98 main.cc:109
 msgid "FILE"
 msgstr "æáêì"
 
-#: main.cc:106
+#: main.cc:109
 msgid "use FILE as init file"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ"
 
-#: main.cc:107
+#: main.cc:110
 msgid "write Makefile dependencies for every input file"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ"
 
-#: main.cc:108
+#: main.cc:111
+msgid "prepend DIR to dependencies"
+msgstr ""
+
+#: main.cc:112
 msgid "produce MIDI output only"
 msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI"
 
-#: main.cc:109
+#: main.cc:113
 #, fuzzy
 msgid "NAME"
 msgstr "ïóîï÷á"
 
-#: main.cc:109
+#: main.cc:113
 #, fuzzy
 msgid "write output to NAME"
 msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ"
 
-#: main.cc:110
+#: main.cc:114
 msgid "inhibit file output naming and exporting"
 msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ"
 
-#: main.cc:103 main.cc:111
+#: main.cc:103 main.cc:115
 msgid "don't timestamp the output"
 msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ"
 
-#: main.cc:104 main.cc:112
+#: main.cc:104 main.cc:116
 msgid "print version number"
 msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ"
 
-#: main.cc:113
+#: main.cc:117
 #, fuzzy
 msgid "verbose"
 msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ"
 
-#: main.cc:106 main.cc:114
+#: main.cc:106 main.cc:118
 msgid "show warranty and copyright"
 msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright"
 
 #.
 #. No version number or newline here. It confuses help2man
 #.
-#: main.cc:131
+#: main.cc:135
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..."
 
-#: main.cc:133
+#: main.cc:137
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ"
 
-#: main.cc:137
+#: main.cc:141
 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"
@@ -432,20 +436,20 @@ msgstr ""
 "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n"
 "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n"
 
-#: main.cc:119 main.cc:143
+#: main.cc:119 main.cc:147
 msgid "Options:"
 msgstr "ïÐÃÉÉ:"
 
-#: main.cc:147
+#: main.cc:151
 msgid "This binary was compiled with the following options:"
 msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:"
 
-#: main.cc:123 main.cc:166
+#: main.cc:123 main.cc:170
 #, c-format
 msgid "Report bugs to %s"
 msgstr "óÏÏÂÝÁÊÔÅ ÏÂ ÏÛÉÂËÁÈ ÐÏ %s"
 
-#: main.cc:55 main.cc:174
+#: main.cc:55 main.cc:178
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -457,17 +461,17 @@ msgstr ""
 "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n"
 "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: main.cc:62 main.cc:181 main.cc:193
+#: main.cc:62 main.cc:185 main.cc:197
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by"
 
-#: main.cc:191
+#: main.cc:195
 #, fuzzy
 msgid "GNU LilyPond -- The music typesetter"
 msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU"
 
-#: main.cc:71 main.cc:199
+#: main.cc:71 main.cc:203
 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"
@@ -675,16 +679,16 @@ msgstr "
 msgid "unbound spanner `%s'"
 msgstr ""
 
-#: scores.cc:35
+#: scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to %s..."
 msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..."
 
-#: scores.cc:83
+#: scores.cc:106
 msgid "Score contains errors; will not process it"
 msgstr ""
 
-#: scores.cc:129
+#: scores.cc:152
 #, fuzzy, c-format
 msgid "Now processing: `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'"