lilypond-1.4.4

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 93649dc3e173da176e266e185af66e967a025173..583d9219c2ad0924c94e0a86a140fb807100a1b6 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -9,9 +9,11 @@
 Usage:
 
 @example
-        lilypond [@var{OPTION}@dots{} [@var{FILE}]@dots{}
+        lilypond [@var{OPTION}@dots{} @var{FILE}@dots{}
 @end example
 
+To have LilyPond read from stdin, use a dash @code{-} for @var{FILE}.
+
 @unnumberedsec Options
 
 @table @code

diff --git a/lily/main.cc b/lily/main.cc
index 85a447ed203096798cc12bd9993e60b5c0077adf..b4c78117336d973c18b0d6e881a2a7730f9ff3d9 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -133,7 +133,7 @@ usage ()
   /*
     No version number or newline here. It confuses help2man
    */
-  cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond");
+  cout << _f ("Usage: %s [OPTION]... FILE...", "lilypond");
   cout << "\n\n";
   cout << _ ("Typeset music and or play MIDI from FILE");
   cout << "\n\n";
@@ -335,7 +335,11 @@ main_prog (int, char**)
   const char *arg  = oparser_p_static->get_next_arg ();
 
   if (!arg)
-    usage ();
+    {
+      usage ();
+      /* No FILE arguments is now a usage error */
+      exit (2);
+    }
   else
     do 
     {
@@ -383,8 +387,6 @@ main_prog (int, char**)
       output_name_global = save_output_name_global;
       
       p++;
-
-      oparser_p_static->get_next_arg ();      
     } while ((arg  = oparser_p_static->get_next_arg ()));
   delete oparser_p_static;
   oparser_p_static = 0;

diff --git a/po/de.po b/po/de.po
index 175daf6528489c86c2b7b67b09b77cf20dc5214f..39ee516b138d2909e8a64526b193f481667c77a3 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-05-18 15:48+0200\n"
+"POT-Creation-Date: 2001-06-14 13:22+0200\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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "warning: "
 msgstr "Warnung: "
 
-#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
+#: 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
 msgid "error: "
 msgstr "Fehler: "
@@ -136,7 +136,7 @@ msgstr "Zeige die Versionsnummer"
 msgid "show warranty and copyright"
 msgstr "Zeige Garantie und Urheberrechte"
 
-#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
+#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Uralt-Bitte: `%s'"
@@ -156,23 +156,23 @@ msgstr ""
 msgid "invalid value: %s"
 msgstr "Ungültiger Buchstabe `%c'"
 
-#: ly2dvi.py:807 scores.cc:44
+#: ly2dvi.py:781 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "Ausgabe auf Papier auf %s..."
 
-#: ly2dvi.py:817
+#: ly2dvi.py:791
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "MIDI-Ausgabe nach %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793
 #: 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:830
+#: ly2dvi.py:804
 msgid "no files specified on command line."
 msgstr ""
 
@@ -493,7 +493,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"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
 #, fuzzy
 msgid "unterminated chord tremolo"
 msgstr "Unbeendeter Bindestrich"
@@ -667,8 +667,8 @@ msgstr "Unterdr
 #. No version number or newline here. It confuses help2man
 #.
 #: main.cc:136
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..."
 
 #: main.cc:138
@@ -859,7 +859,7 @@ msgstr ""
 msgid "none of these in my family: `%s'"
 msgstr ""
 
-#: percent-repeat-engraver.cc:118
+#: percent-repeat-engraver.cc:117
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "Weiß nicht, wie ich eine fehlende Tonart behandeln soll"

diff --git a/po/fr.po b/po/fr.po
index 8c1599e0524e8c5b5e98f2128591ffb08fdbb101..6cad31a3d93165b930f7828afe153a33e8d081c8 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-05-18 15:48+0200\n"
+"POT-Creation-Date: 2001-06-14 13:22+0200\n"
 "PO-Revision-Date: 1999-12-28 00:32 +1\n"
 "Last-Translator: Laurent Martelli <laurent@linuxfan.com>\n"
 "Language-Team: \n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "warning: "
 msgstr "avertissement: "
 
-#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
+#: 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
 msgid "error: "
 msgstr "erreur: "
@@ -132,7 +132,7 @@ msgstr "afficher le numro de version"
 msgid "show warranty and copyright"
 msgstr ""
 
-#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
+#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Cration des voix..."
@@ -152,23 +152,23 @@ msgstr ""
 msgid "invalid value: %s"
 msgstr "caractres illgal: `%c'"
 
-#: ly2dvi.py:807 scores.cc:44
+#: ly2dvi.py:781 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "Sortie papier vers %s..."
 
-#: ly2dvi.py:817
+#: ly2dvi.py:791
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "Sortie de Lily vers %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "ne peut pas trouver le fichier: `%s'"
 
-#: ly2dvi.py:830
+#: ly2dvi.py:804
 msgid "no files specified on command line."
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr "soustraction invalide: ne fait pas partie de l'accord: %s"
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "renversement invalide: ne fait pas partie de l'accord: %s"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
 msgid "unterminated chord tremolo"
 msgstr ""
 
@@ -660,8 +660,8 @@ msgstr ""
 #. No version number or newline here. It confuses help2man
 #.
 #: main.cc:136
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Usage: %s [OPTION]... [FICHIER]..."
 
 #: main.cc:138
@@ -833,7 +833,7 @@ msgstr ""
 msgid "none of these in my family: `%s'"
 msgstr ""
 
-#: percent-repeat-engraver.cc:118
+#: percent-repeat-engraver.cc:117
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "ne sait pas traiter les cls vides"

diff --git a/po/it.po b/po/it.po
index 5129acac40f1a119b65b42d1611b0c373d1c971f..0aa67d4b4e5c8a13c28edf8343180ee14851eacc 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-05-18 15:48+0200\n"
+"POT-Creation-Date: 2001-06-14 13:22+0200\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Date: 1998-05-30 00:17:12+0200\n"
 "From:  <jantien@xs4all.nl>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "warning: "
 msgstr "attenzione: "
 
-#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
+#: 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
 msgid "error: "
 msgstr "errore: "
@@ -137,7 +137,7 @@ msgstr ""
 msgid "show warranty and copyright"
 msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"
 
-#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
+#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Genero le voci..."
@@ -157,23 +157,23 @@ msgstr ""
 msgid "invalid value: %s"
 msgstr "carattere illegale: `%c'"
 
-#: ly2dvi.py:807 scores.cc:44
+#: ly2dvi.py:781 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "L'output stampato è inviato a %s..."
 
-#: ly2dvi.py:817
+#: ly2dvi.py:791
 #, 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:819
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793
 #: 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:830
+#: ly2dvi.py:804
 msgid "no files specified on command line."
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
 #, fuzzy
 msgid "unterminated chord tremolo"
 msgstr "beam non terminato"
@@ -664,8 +664,8 @@ msgstr ""
 #. No version number or newline here. It confuses help2man
 #.
 #: main.cc:136
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... FILE..."
 msgstr "Uso: %s [OPZIONE]... [FILE]..."
 
 #: main.cc:138
@@ -851,7 +851,7 @@ msgstr ""
 msgid "none of these in my family: `%s'"
 msgstr ""
 
-#: percent-repeat-engraver.cc:118
+#: percent-repeat-engraver.cc:117
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "non so manipolare tasti vuoti"

diff --git a/po/ja.po b/po/ja.po
index 51a1f80b5bf765a9465852cd901447ec6321ba32..f652910f64c0551247465b6cb884a06395799d09 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-05-18 15:48+0200\n"
+"POT-Creation-Date: 2001-06-14 13:22+0200\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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "warning: "
 msgstr "·Ù¹ð: "
 
-#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
+#: 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
 msgid "error: "
 msgstr "¥¨¥é¡¼: "
@@ -135,7 +135,7 @@ msgstr "
 msgid "show warranty and copyright"
 msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
 
-#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
+#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
@@ -155,23 +155,23 @@ msgstr ""
 msgid "invalid value: %s"
 msgstr "̵¸ú¤Êʸ»ú: `%c'"
 
-#: ly2dvi.py:807 scores.cc:44
+#: ly2dvi.py:781 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
-#: ly2dvi.py:817
+#: ly2dvi.py:791
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, fuzzy, c-format
 msgid "can't find file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: ly2dvi.py:830
+#: ly2dvi.py:804
 msgid "no files specified on command line."
 msgstr ""
 
@@ -491,7 +491,7 @@ msgstr "̵
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
 #, fuzzy
 msgid "unterminated chord tremolo"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
@@ -661,8 +661,8 @@ msgstr "̾
 #. No version number or newline here. It confuses help2man
 #.
 #: main.cc:136
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... FILE..."
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
 
 #: main.cc:138
@@ -869,7 +869,7 @@ msgstr "
 msgid "none of these in my family: `%s'"
 msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó"
 
-#: percent-repeat-engraver.cc:118
+#: percent-repeat-engraver.cc:117
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó"

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 3ad5bfbb9521b84363f81cb0d992f8638e8979a6..d85c3cfe60ff02da5ed8495f5906259576231714 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-05-18 15:48+0200\n"
+"POT-Creation-Date: 2001-06-14 13:22+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ly2dvi.py:105
 msgid "Generate .dvi with LaTeX for LilyPond"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "warning: "
 msgstr ""
 
-#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
+#: 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
 msgid "error: "
 msgstr ""
@@ -131,7 +131,7 @@ msgstr ""
 msgid "show warranty and copyright"
 msgstr ""
 
-#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
+#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603
 #, c-format
 msgid "Running %s..."
 msgstr ""
@@ -151,23 +151,23 @@ msgstr ""
 msgid "invalid value: %s"
 msgstr ""
 
-#: ly2dvi.py:807 scores.cc:44
+#: ly2dvi.py:781 scores.cc:44
 #, c-format
 msgid "dependencies output to `%s'..."
 msgstr ""
 
-#: ly2dvi.py:817
+#: ly2dvi.py:791
 #, c-format
 msgid "%s output to `%s'..."
 msgstr ""
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr ""
 
-#: ly2dvi.py:830
+#: ly2dvi.py:804
 msgid "no files specified on command line."
 msgstr ""
 
@@ -477,7 +477,7 @@ msgstr ""
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
 msgid "unterminated chord tremolo"
 msgstr ""
 
@@ -639,7 +639,7 @@ msgstr ""
 #.
 #: main.cc:136
 #, c-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
 #: main.cc:138
@@ -804,7 +804,7 @@ msgstr ""
 msgid "none of these in my family: `%s'"
 msgstr ""
 
-#: percent-repeat-engraver.cc:118
+#: percent-repeat-engraver.cc:117
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr ""
 

diff --git a/po/nl.po b/po/nl.po
index 94b175542ac164484a159347a6e2f60983020788..c8d1627e0c58f1bb4785611ff00fed9284a67072 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.4.1\n"
-"POT-Creation-Date: 2001-05-18 15:48+0200\n"
+"POT-Creation-Date: 2001-06-14 13:22+0200\n"
 "PO-Revision-Date: 2001-05-09 23:29+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -32,7 +32,7 @@ msgstr "Genereer .dvi met LaTeX voor LilyPond"
 msgid "warning: "
 msgstr "waarschuwing: "
 
-#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
+#: 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
 msgid "error: "
 msgstr "fout: "
@@ -142,7 +142,7 @@ msgstr "druk versienummer af"
 msgid "show warranty and copyright"
 msgstr "toon garantie en auteursrechten"
 
-#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
+#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603
 #, c-format
 msgid "Running %s..."
 msgstr "Uitvoeren %s..."
@@ -162,23 +162,23 @@ msgstr "geen lilypond uitvoer gevonden voor %s"
 msgid "invalid value: %s"
 msgstr "ongeldige waarde: %s"
 
-#: ly2dvi.py:807 scores.cc:44
+#: ly2dvi.py:781 scores.cc:44
 #, c-format
 msgid "dependencies output to `%s'..."
 msgstr "afhankelijkheden uitvoer naar %s..."
 
-#: ly2dvi.py:817
+#: ly2dvi.py:791
 #, c-format
 msgid "%s output to `%s'..."
 msgstr "%s uitvoer naar `%s'..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793
 #: 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:830
+#: ly2dvi.py:804
 msgid "no files specified on command line."
 msgstr "geen bestanden gespecificeerd op de commandoregel."
 
@@ -490,7 +490,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"
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
 msgid "unterminated chord tremolo"
 msgstr "onbeëindigd akkoordtremolo"
 
@@ -654,8 +654,8 @@ msgstr "verbied naamgeving van uitvoer bestand en exportering"
 #.
 #: main.cc:136
 #, c-format
-msgid "Usage: %s [OPTION]... [FILE]..."
-msgstr "Gebruik: %s [OPTIE]... [BESTAND]..."
+msgid "Usage: %s [OPTION]... FILE..."
+msgstr "Gebruik: %s [OPTIE]... BESTAND..."
 
 #: main.cc:138
 msgid "Typeset music and or play MIDI from FILE"
@@ -839,7 +839,7 @@ msgstr "Ben er zelf een: `%s'"
 msgid "none of these in my family: `%s'"
 msgstr "geen van deze in mijn gezin: `%s'"
 
-#: percent-repeat-engraver.cc:118
+#: percent-repeat-engraver.cc:117
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "Weet niet hoe procent herhaling van deze lengte af te handelen."
 
@@ -1415,4 +1415,3 @@ msgstr "MIDI spoor verwacht"
 #: midi-track-parser.cc:353
 msgid "invalid track length"
 msgstr "ongeldige spoorlengte"
-

diff --git a/po/ru.po b/po/ru.po
index 2f034c0409035862363ab0dd85c9b564b88d69f4..67c9d6b3446aacc31800d7bee7434b0224ce889a 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-05-18 15:48+0200\n"
+"POT-Creation-Date: 2001-06-14 13:22+0200\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"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: "
 
-#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188
+#: 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
 msgid "error: "
 msgstr "ÏÛÉÂËÁ: "
@@ -134,7 +134,7 @@ msgstr "
 msgid "show warranty and copyright"
 msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright"
 
-#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629
+#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603
 #, fuzzy, c-format
 msgid "Running %s..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
@@ -154,23 +154,23 @@ msgstr ""
 msgid "invalid value: %s"
 msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'"
 
-#: ly2dvi.py:807 scores.cc:44
+#: ly2dvi.py:781 scores.cc:44
 #, fuzzy, c-format
 msgid "dependencies output to `%s'..."
 msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..."
 
-#: ly2dvi.py:817
+#: ly2dvi.py:791
 #, fuzzy, c-format
 msgid "%s output to `%s'..."
 msgstr "×Ù×ÏÄ MIDI × %s..."
 
-#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819
+#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793
 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142
 #, c-format
 msgid "can't find file: `%s'"
 msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'"
 
-#: ly2dvi.py:830
+#: ly2dvi.py:804
 msgid "no files specified on command line."
 msgstr ""
 
@@ -482,7 +482,7 @@ msgstr "
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192
 msgid "unterminated chord tremolo"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ"
 
@@ -647,8 +647,8 @@ msgstr "
 #. No version number or newline here. It confuses help2man
 #.
 #: main.cc:136
-#, c-format
-msgid "Usage: %s [OPTION]... [FILE]..."
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]... FILE..."
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..."
 
 #: main.cc:138
@@ -821,7 +821,7 @@ msgstr "
 msgid "none of these in my family: `%s'"
 msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ"
 
-#: percent-repeat-engraver.cc:118
+#: percent-repeat-engraver.cc:117
 #, fuzzy
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ"

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 454c70c1f3a81069bcafda98f27ea16ed85fa7c7..98a92708750095693e34a96c3b0568ce404ce7de 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -218,6 +218,7 @@
    * TODO: any uneven step that's lower than an uneven step which is
      chromatically altered
   "
+  (write-me "adds: " 
   (let ((evens (filter-list (lambda (x) (!= 0 (modulo (cadr x) 2))) steps))
        (altered-unevens
         (filter-list (lambda (x)
@@ -235,13 +236,13 @@
                       '()))))
     ;; Hmm, what if we have a step twice, can we ignore that?
     (uniq-list (sort (apply append evens altered-unevens highest)
-                    pitch::<))))
+                    pitch::<)))))
        
      
 ;; FIXME: unLOOP, see ::additions
 ;; find the pitches that are missing from `normal' chord
 (define (chord::subtractions chord-pitches)
-  (let ((tonic (car chord-pitches)))
+  (write-me "subs: " (let ((tonic (car chord-pitches)))
     (let loop ((step 1) (pitches chord-pitches) (subtractions '()))
       (if (pair? pitches)
        (let* ((pitch (car pitches))
@@ -264,7 +265,7 @@
            (if (= p-step step)
              (loop (+ step 2) (cdr pitches) subtractions)
              (loop step (cdr pitches) subtractions)))))
-       (reverse subtractions)))))
+       (reverse subtractions))))))
 
 (define (chord::additions->text-banter additions subtractions)
   (if (pair? additions)
@@ -375,7 +376,7 @@
 ;; return (MATCHED-EXCEPTION . BASE-CHORD-WITH-UNMATCHED-STEPS)
 ;; BASE-CHORD-WITH-UNMATCHED-STEPS always includes (tonic 3 5)
 (define (chord::exceptions-lookup style steps)
-  (let* ((result (chord::exceptions-lookup-helper
+  (write-me "xl: " (let* ((result (chord::exceptions-lookup-helper
                  (chord::restyle 'chord::names-alist- style)
                  steps '() #f))
           (exception-part (car result))
@@ -390,7 +391,7 @@
                        ((= i 0) base)
                      ())
                    unmatched-steps)))
-    (list exception-part unmatched-with-1-3-5)))
+    (list exception-part unmatched-with-1-3-5))))
 
 
 (define (chord::name->text style tonic steps bass-and-inversion)