From 4b6b2b56143d7ef26c0d7643ffed4d5f3ea63de3 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 01:03:33 +0000 Subject: [PATCH] lilypond-1.3.152 --- lily/afm.cc | 7 ++++++- lily/paper-def.cc | 2 +- lily/paper-outputter.cc | 2 +- lily/performance.cc | 2 +- lily/piano-pedal-engraver.cc | 4 ++-- lily/piano-pedal-performer.cc | 2 +- lily/property-engraver.cc | 2 +- lily/scores.cc | 2 +- po/de.po | 14 +++++++------- po/fr.po | 14 +++++++------- po/it.po | 14 +++++++------- po/ja.po | 14 +++++++------- po/lilypond.pot | 2 +- po/nl.po | 14 +++++++------- po/ru.po | 14 +++++++------- scripts/convert-ly.py | 4 ++-- 16 files changed, 59 insertions(+), 54 deletions(-) diff --git a/lily/afm.cc b/lily/afm.cc index aa569951ea..6786afd725 100644 --- 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 5ad7799c11..10e56f0883 100644 --- 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 ("") : outname)); target_str_global_array.push (outname); diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index bfe92de4b8..c146d194a3 100644 --- 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 ("") : filename)); diff --git a/lily/performance.cc b/lily/performance.cc index be168b2de0..5aa7abaa53 100644 --- 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 7f25a21dd3..0a57fa762c 100644 --- 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 36f91d131d..3783a353a6 100644 --- 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 6c1a81c3bb..57a6e04e9a 100644 --- 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 2e4e6b8bb5..c711d24a2b 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -41,7 +41,7 @@ void write_dependency_file (String fn, Array 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 ba9075da20..7691655025 100644 --- 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 921e1a200c..ef88e5a85c 100644 --- 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 6b158b271d..f7377dc280 100644 --- 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 2ef4ff69a0..d8003b29cc 100644 --- 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 8fcf5408d5..29dff95881 100644 --- 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 d95267b662..a46eff289e 100644 --- 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 0ec9012399..8be7cea629 100644 --- 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 c450497c9c..c4e0619901 100644 --- 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') -- 2.39.5