lilypond-1.3.152

diff --git a/lily/afm.cc b/lily/afm.cc
index aa569951eaa63d986d837e8cd18a766d8ba70e56..6786afd72592ff34ac67c8070e9fce44040822a7 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -73,6 +73,11 @@ Adobe_font_metric::find_char_metric (String nm, bool warn) const
     return font_inf_->cmi + (*ai).second;
 }
 
+int
+Adobe_font_metric::count () const
+{
+  return ascii_to_metric_idx_.size ();
+}
 
 Box
 Adobe_font_metric::get_char (int code) const
@@ -110,7 +115,7 @@ read_afm_file (String nm)
 
   if (ok)
     {
-      error (_f ("Error parsing AFM file: %s", nm.ch_C ()));
+      error (_f ("Error parsing AFM file: `%s'", nm.ch_C ()));
       exit (2);
     }
   fclose (f);

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 5ad7799c11156af1103716be8e144cdd62e8c075..10e56f0883cdd261840c920e37bacb903294790b 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -106,7 +106,7 @@ Paper_outputter*
 Paper_def::paper_outputter_p () 
 {
   String outname = outname_str (); 
-  progress_indication (_f ("paper output to %s...",
+  progress_indication (_f ("paper output to `%s'...",
                           outname == "-" ? String ("<stdout>") : outname));
 
   target_str_global_array.push (outname);

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index bfe92de4b87c164803bf84f4f7d60d6d15053235..c146d194a3edbc5ecbbe3761e9808dc176184ebb 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -229,7 +229,7 @@ Paper_outputter::write_header_field_to_file (String filename, String key, String
 {
   if (filename != "-")
     filename += String (".") + key;
-  progress_indication (_f ("writing header field %s to %s...",
+  progress_indication (_f ("writing header field `%s' to `%s'...",
                           key,
                           filename == "-" ? String ("<stdout>") : filename));
   

diff --git a/lily/performance.cc b/lily/performance.cc
index be168b2de052d6ff57c7a35a3d5363a431c93f46..5aa7abaa53667e44daabbb0370a87c28df294329 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -165,7 +165,7 @@ Performance::process ()
   out = p.str ();
   
   Midi_stream midi_stream (out);
-  progress_indication (_f ("MIDI output to %s...", out));
+  progress_indication (_f ("MIDI output to `%s'...", out));
   target_str_global_array.push (out);
 
   output (midi_stream);

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 7f25a21dd30c51874851d33cca1740a75ae6341c..0a57fa762c072744bec6deeb43c02c3fa4fcbbb2 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -139,7 +139,7 @@ Piano_pedal_engraver::create_grobs ()
        {
          if (!p->start_req_l_)
            {
-             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: %s",  p->name_));
+             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'",  p->name_));
            }
          else
            {
@@ -151,7 +151,7 @@ Piano_pedal_engraver::create_grobs ()
        {
          if (!p->start_req_l_)
            {
-             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: %s", p->name_));
+             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_));
            }
          else
            {

diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index 36f91d131d412a888c938a87a28a7d43121f8ece..3783a353a6b25c8c20a608604b6cb9e97c3dfc29 100644 (file)
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -84,7 +84,7 @@ Piano_pedal_performer::create_audio_elements ()
        {
          if (!p->start_req_l_)
            {
-             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: %s", String (p->name_)));
+             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", String (p->name_)));
            }
          else
            {

diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc
index 6c1a81c3bb5449fc92d43a483f1f1452cd6b0465..57a6e04e9a0fae2f7106adc7ba4a18411b21b3ac 100644 (file)
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -118,7 +118,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
 
          SCM meta = e->get_grob_property ("meta");
          SCM name = scm_assoc (ly_symbol2scm ("name"), meta);
-         warning (_f ("%s is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
+         warning (_f ("`%s' is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
                       ly_symbol2string (prop_sym).ch_C (),
                       origin->type_str_.ch_C (),
                       ly_scm2string (gh_cdr (name)).ch_C (),

diff --git a/lily/scores.cc b/lily/scores.cc
index 2e4e6b8bb5260dfa301434b1b2bf318fbea89789..c711d24a2bf2f7ba1e110015c1e639477cf93063 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -41,7 +41,7 @@ void write_dependency_file (String fn, Array<String> targets,
 {
   const int WRAPWIDTH = 65;
 
-  progress_indication (_f ("dependencies output to %s...", fn.ch_C ()));
+  progress_indication (_f ("dependencies output to `%s'...", fn.ch_C ()));
   progress_indication ("\n");
   ofstream f (fn.ch_C ());
   if (!f)

diff --git a/po/de.po b/po/de.po
index ba9075da208e81c48fe28c6fd9b59c2c4c0ab327..76916550258dd1052c9a1a0044dec6216bffa86d 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -158,12 +158,12 @@ msgstr "Uralt-Bitte: `%s'"
 
 #: ly2dvi.py:654 scores.cc:44
 #, fuzzy, c-format
-msgid "dependencies output to %s..."
+msgid "dependencies output to `%s'..."
 msgstr "Ausgabe auf Papier auf %s..."
 
 #: ly2dvi.py:665
 #, fuzzy, c-format
-msgid "%s output to %s..."
+msgid "%s output to `%s'..."
 msgstr "MIDI-Ausgabe nach %s..."
 
 #: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667
@@ -209,7 +209,7 @@ msgstr "Verarbeite..."
 
 #: mup2ly.py:1203
 #, fuzzy, c-format
-msgid "Writing %s..."
+msgid "Writing `%s'..."
 msgstr "Linie ... "
 
 #: update-lily.py:46
@@ -803,7 +803,7 @@ msgstr "Uralt-Bitte: `%s'"
 
 #: paper-def.cc:109
 #, fuzzy, c-format
-msgid "paper output to %s..."
+msgid "paper output to `%s'..."
 msgstr "Ausgabe auf Papier auf %s..."
 
 #: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
@@ -812,7 +812,7 @@ msgstr ", bei "
 
 #: paper-outputter.cc:232
 #, fuzzy, c-format
-msgid "writing header field %s to %s..."
+msgid "writing header field `%s' to `%s'..."
 msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..."
 
 #: paper-score.cc:80
@@ -875,7 +875,7 @@ msgstr "von der musiaklischen Definition: %s"
 
 #: performance.cc:168
 #, c-format
-msgid "MIDI output to %s..."
+msgid "MIDI output to `%s'..."
 msgstr "MIDI-Ausgabe nach %s..."
 
 #: phrasing-slur-engraver.cc:119
@@ -1238,7 +1238,7 @@ msgstr "#32 in Vierteln: %d"
 
 #: lilypond-score.cc:108
 #, c-format
-msgid "Lily output to %s..."
+msgid "Lily output to `%s'..."
 msgstr "Lily-Ausgabe nach %s..."
 
 #: lilypond-score.cc:119

diff --git a/po/fr.po b/po/fr.po
index 921e1a200c1deef42cf09861e3f27ecbdbeece7b..ef88e5a85cf8bb9f86d753f8cd6e59bec8a08f4b 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -154,12 +154,12 @@ msgstr "Cr
 
 #: ly2dvi.py:654 scores.cc:44
 #, fuzzy, c-format
-msgid "dependencies output to %s..."
+msgid "dependencies output to `%s'..."
 msgstr "Sortie papier vers %s..."
 
 #: ly2dvi.py:665
 #, fuzzy, c-format
-msgid "%s output to %s..."
+msgid "%s output to `%s'..."
 msgstr "Sortie de Lily vers %s..."
 
 #: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667
@@ -204,7 +204,7 @@ msgstr "Traitement..."
 
 #: mup2ly.py:1203
 #, fuzzy, c-format
-msgid "Writing %s..."
+msgid "Writing `%s'..."
 msgstr "Ligne ..."
 
 #: update-lily.py:46
@@ -778,7 +778,7 @@ msgstr ""
 
 #: paper-def.cc:109
 #, fuzzy, c-format
-msgid "paper output to %s..."
+msgid "paper output to `%s'..."
 msgstr "Sortie papier vers %s..."
 
 #: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
@@ -787,7 +787,7 @@ msgstr ", 
 
 #: paper-outputter.cc:232
 #, fuzzy, c-format
-msgid "writing header field %s to %s..."
+msgid "writing header field `%s' to `%s'..."
 msgstr "impossible d'ouvrir le fichier: `%s'"
 
 #: paper-score.cc:80
@@ -849,7 +849,7 @@ msgstr ""
 
 #: performance.cc:168
 #, c-format
-msgid "MIDI output to %s..."
+msgid "MIDI output to `%s'..."
 msgstr ""
 
 #: phrasing-slur-engraver.cc:119
@@ -1201,7 +1201,7 @@ msgstr ""
 
 #: lilypond-score.cc:108
 #, c-format
-msgid "Lily output to %s..."
+msgid "Lily output to `%s'..."
 msgstr "Sortie de Lily vers %s..."
 
 #: lilypond-score.cc:119

diff --git a/po/it.po b/po/it.po
index 6b158b271d2e9c0d5c4ba7c78c4d032a1ec0546c..f7377dc280ed848b42ad9bb9597424785a44cde9 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -159,12 +159,12 @@ msgstr "Genero le voci..."
 
 #: ly2dvi.py:654 scores.cc:44
 #, fuzzy, c-format
-msgid "dependencies output to %s..."
+msgid "dependencies output to `%s'..."
 msgstr "L'output stampato è inviato a %s..."
 
 #: ly2dvi.py:665
 #, fuzzy, c-format
-msgid "%s output to %s..."
+msgid "%s output to `%s'..."
 msgstr "L'output MIDI è inviato a %s..."
 
 #: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667
@@ -209,7 +209,7 @@ msgstr "Elaboro..."
 
 #: mup2ly.py:1203
 #, fuzzy, c-format
-msgid "Writing %s..."
+msgid "Writing `%s'..."
 msgstr "Genero le voci..."
 
 #: update-lily.py:46
@@ -795,7 +795,7 @@ msgstr "Cosa? Non 
 
 #: paper-def.cc:109
 #, fuzzy, c-format
-msgid "paper output to %s..."
+msgid "paper output to `%s'..."
 msgstr "L'output stampato è inviato a %s..."
 
 #: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
@@ -804,7 +804,7 @@ msgstr ", a "
 
 #: paper-outputter.cc:232
 #, fuzzy, c-format
-msgid "writing header field %s to %s..."
+msgid "writing header field `%s' to `%s'..."
 msgstr "scrivo il file delle dipendenze: `%s'..."
 
 #: paper-score.cc:80
@@ -867,7 +867,7 @@ msgstr "della definizione musicale: %s"
 
 #: performance.cc:168
 #, c-format
-msgid "MIDI output to %s..."
+msgid "MIDI output to `%s'..."
 msgstr "L'output MIDI è inviato a %s..."
 
 #: phrasing-slur-engraver.cc:119
@@ -1226,7 +1226,7 @@ msgstr "#32 in un quarto: %d"
 
 #: lilypond-score.cc:108
 #, c-format
-msgid "Lily output to %s..."
+msgid "Lily output to `%s'..."
 msgstr "Output di Lily in %s..."
 
 #: lilypond-score.cc:119

diff --git a/po/ja.po b/po/ja.po
index 2ef4ff69a0480b4a3f981972aa799b5b3ac4eafc..d8003b29cccbb721e81130af7dfa4e46061ab986 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -157,12 +157,12 @@ msgstr "
 
 #: ly2dvi.py:654 scores.cc:44
 #, fuzzy, c-format
-msgid "dependencies output to %s..."
+msgid "dependencies output to `%s'..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
 #: ly2dvi.py:665
 #, fuzzy, c-format
-msgid "%s output to %s..."
+msgid "%s output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
 #: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667
@@ -208,7 +208,7 @@ msgstr "
 
 #: mup2ly.py:1203
 #, fuzzy, c-format
-msgid "Writing %s..."
+msgid "Writing `%s'..."
 msgstr "¹Ô ..."
 
 #: update-lily.py:46
@@ -815,7 +815,7 @@ msgstr "
 
 #: paper-def.cc:109
 #, c-format
-msgid "paper output to %s..."
+msgid "paper output to `%s'..."
 msgstr "%s ¤Ø paper ½ÐÎÏ..."
 
 #: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
@@ -824,7 +824,7 @@ msgstr ", at "
 
 #: paper-outputter.cc:232
 #, fuzzy, c-format
-msgid "writing header field %s to %s..."
+msgid "writing header field `%s' to `%s'..."
 msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..."
 
 #: paper-score.cc:80
@@ -885,7 +885,7 @@ msgstr "
 
 #: performance.cc:168
 #, c-format
-msgid "MIDI output to %s..."
+msgid "MIDI output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
 #: phrasing-slur-engraver.cc:119
@@ -1234,7 +1234,7 @@ msgstr "
 
 #: lilypond-score.cc:108
 #, c-format
-msgid "Lily output to %s..."
+msgid "Lily output to `%s'..."
 msgstr "Lily ¤Ï %s ¤Ë½ÐÎϤ·¤Þ¤¹..."
 
 #: lilypond-score.cc:119

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 8fcf5408d52ffb0612788787dbd6c268021da247..29dff958815a1f4a07529a6b33f2d66c5adc80ee 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -203,7 +203,7 @@ msgstr ""
 
 #: mup2ly.py:1203
 #, c-format
-msgid "Writing %s..."
+msgid "Wwriting `%s'..."
 msgstr ""
 
 #: update-lily.py:46

diff --git a/po/nl.po b/po/nl.po
index d95267b6625699dab75485d782d808995515f184..a46eff289e9dbae9edf8813a66253429670fd616 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -165,12 +165,12 @@ msgstr "Uitvoeren %s..."
 
 #: ly2dvi.py:654 scores.cc:44
 #, c-format
-msgid "dependencies output to %s..."
+msgid "dependencies output to `%s'..."
 msgstr "afhankelijkheden uitvoer naar %s..."
 
 #: ly2dvi.py:665
 #, c-format
-msgid "%s output to %s..."
+msgid "%s output to `%s'..."
 msgstr "%s uitvoer naar %s..."
 
 #: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667
@@ -215,7 +215,7 @@ msgstr "Verwerken..."
 
 #: mup2ly.py:1203
 #, fuzzy, c-format
-msgid "Writing %s..."
+msgid "Writing `%s'..."
 msgstr "Beëidigen ..."
 
 #: update-lily.py:46
@@ -787,7 +787,7 @@ msgstr "Schroot verzoek: `%s'"
 
 #: paper-def.cc:109
 #, c-format
-msgid "paper output to %s..."
+msgid "paper output to `%s'..."
 msgstr "papier uitvoer naar %s..."
 
 #: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
@@ -796,7 +796,7 @@ msgstr ", bij "
 
 #: paper-outputter.cc:232
 #, c-format
-msgid "writing header field %s to %s..."
+msgid "writing header field `%s' to `%s'..."
 msgstr "Schijven van kop veld %s naar bestand %s..."
 
 #: paper-score.cc:80
@@ -856,7 +856,7 @@ msgstr "van muzikale definitie: %s"
 
 #: performance.cc:168
 #, c-format
-msgid "MIDI output to %s..."
+msgid "MIDI output to `%s'..."
 msgstr "MIDI uitvoer naar %s..."
 
 #: phrasing-slur-engraver.cc:119
@@ -1202,7 +1202,7 @@ msgstr "#32 in kwart: %d"
 
 #: lilypond-score.cc:108
 #, c-format
-msgid "Lily output to %s..."
+msgid "Lily output to `%s'..."
 msgstr "Lelie uitvoer naar %s..."
 
 #: lilypond-score.cc:119

diff --git a/po/ru.po b/po/ru.po
index 0ec90123995efc9f21f484e8c90c03cdbd987811..8be7cea62911b53f3dc864331db05159797475d9 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -156,12 +156,12 @@ msgstr "
 
 #: ly2dvi.py:654 scores.cc:44
 #, fuzzy, c-format
-msgid "dependencies output to %s..."
+msgid "dependencies output to `%s'..."
 msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..."
 
 #: ly2dvi.py:665
 #, fuzzy, c-format
-msgid "%s output to %s..."
+msgid "%s output to `%s'..."
 msgstr "×Ù×ÏÄ MIDI × %s..."
 
 #: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:667
@@ -207,7 +207,7 @@ msgstr "
 
 #: mup2ly.py:1203
 #, fuzzy, c-format
-msgid "Writing %s..."
+msgid "Writing `%s'..."
 msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'"
 
 #: update-lily.py:46
@@ -767,7 +767,7 @@ msgstr "
 
 #: paper-def.cc:109
 #, c-format
-msgid "paper output to %s..."
+msgid "paper output to `%s'..."
 msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..."
 
 #: lilypond-stream.cc:93 paper-outputter.cc:85 performance.cc:99
@@ -776,7 +776,7 @@ msgstr ", 
 
 #: paper-outputter.cc:232
 #, fuzzy, c-format
-msgid "writing header field %s to %s..."
+msgid "writing header field `%s' to `%s'..."
 msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..."
 
 #: paper-score.cc:80
@@ -837,7 +837,7 @@ msgstr "
 
 #: performance.cc:168
 #, c-format
-msgid "MIDI output to %s..."
+msgid "MIDI output to `%s'..."
 msgstr "×Ù×ÏÄ MIDI × %s..."
 
 #: phrasing-slur-engraver.cc:119
@@ -1186,7 +1186,7 @@ msgstr "#32 
 
 #: lilypond-score.cc:108
 #, c-format
-msgid "Lily output to %s..."
+msgid "Lily output to `%s'..."
 msgstr "Lily ×ÙÈÏÄ × %s..."
 
 #: lilypond-score.cc:119

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index c450497c9ca77f6c7803cab253833793ecad113c..c4e0619901c52c2c3cc22ce0d4e8c797940189da 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -968,7 +968,7 @@ for f in files:
                do_one_file (f)
        except UnknownVersion:
                sys.stderr.write ('\n')
-               sys.stderr.write ("%s: can't determine version for %s" % (program_name, f))
+               sys.stderr.write ("%s: can't determine version for `%s'" % (program_name, f))
                sys.stderr.write ('\n')
                if assume_old:
                        fv = from_version
@@ -976,6 +976,6 @@ for f in files:
                        do_one_file (f)
                        from_version = fv
                else:
-                       sys.stderr.write ("%s: skipping: %s " % (program_name,  f))
+                       sys.stderr.write ("%s: skipping: `%s' " % (program_name,  f))
                pass
 sys.stderr.write ('\n')