From: fred Date: Wed, 27 Mar 2002 00:56:13 +0000 (+0000) Subject: lilypond-1.3.131 X-Git-Tag: release/1.5.59~912 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e827a1294fdc33d84a16fd0fdfc2a57e31fc5517;p=lilypond.git lilypond-1.3.131 --- diff --git a/GNUmakefile.in b/GNUmakefile.in index 37ac56142a..dc4b58369b 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -19,10 +19,12 @@ README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt IN_FILES := $(wildcard *.in) EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) +INSTALLATION_DIR=$(datadir) +INSTALLATION_FILES=config.make VERSION # bootstrap stepmake: # -STEPMAKE_TEMPLATES=toplevel yolily-toplevel po +STEPMAKE_TEMPLATES=toplevel yolily-toplevel po install include $(depth)/make/stepmake.make # diff --git a/config.make.in b/config.make.in index 3f2ec353a2..fe73a6aa4a 100644 --- a/config.make.in +++ b/config.make.in @@ -63,6 +63,7 @@ MFMODE = @MFMODE@ METAPOST = @METAPOST@ MFPLAIN_MP = @MFPLAIN_MP@ MSGFMT = @MSGFMT@ +ROOTSEP = @ROOTSEP@ PATHSEP = @PATHSEP@ PERL = @PERL@ PYTHON = @PYTHON@ diff --git a/flower/file-path.cc b/flower/file-path.cc index 80c34db4c1..d7d6d27c37 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -5,6 +5,7 @@ #include "config.h" #include #include + #if HAVE_SYS_STAT_H #include #endif @@ -12,52 +13,68 @@ #include "file-path.hh" #include "flower-debug.hh" +#ifndef PATHSEP +#define PATHSEP ':' +#endif + +#ifndef ROOTSEP +#define ROOTSEP '/' +#endif + #ifndef DIRSEP #define DIRSEP '/' #endif -#ifndef PATHSEP -#define PATHSEP ':' +#ifndef EXTSEP +#define EXTSEP '.' #endif +/* Join components to full path. */ +String +Path::str () const +{ + String s; + if (!root.empty_b ()) + s = root + to_str (ROOTSEP); + if (!dir.empty_b ()) + s += dir + to_str (DIRSEP); + s += base; + if (!ext.empty_b ()) + s += to_str (EXTSEP) + ext; + return s; +} + /** @param path the original full filename @return 4 components of the path. They can be empty */ -void -split_path (String path, - String &drive, String &dirs, String &filebase, String &extension) +Path +split_path (String path) { - // peel off components, one by one. - int di = path.index_i (':'); - if (di >= 0) + Path p; + int i = path.index_i (ROOTSEP); + if (i >= 0) { - drive = path.left_str (di + 1); - path = path.right_str (path.length_i () - di -1); + p.root = path.left_str (i); + path = path.right_str (path.length_i () - i); // - 1); } - else - drive = ""; - di = path.index_last_i (DIRSEP); - if (di >=0) + i = path.index_last_i (DIRSEP); + if (i >= 0) { - dirs = path.left_str (di + 1); - path = path.right_str (path.length_i ()-di -1); + p.dir = path.left_str (i); + path = path.right_str (path.length_i () - i - 1); } - else - dirs = ""; - di = path.index_last_i ('.'); - if (di >= 0) + i = path.index_last_i ('.'); + if (i >= 0) { - filebase = path.left_str (di); - extension =path.right_str (path.length_i ()-di); + p.base = path.left_str (i); + p.ext = path.right_str (path.length_i () - i - 1); } else - { - extension = ""; - filebase = path; - } + p.base = path; + return p; } void diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh index fdaf3e254a..c7eb980c3b 100644 --- a/flower/include/file-path.hh +++ b/flower/include/file-path.hh @@ -1,13 +1,14 @@ /* - path.hh -- declare File_path + file-path.hh -- declare Path and File_path source file of the Flower Library (c) 1997--2000 Han-Wen Nienhuys */ -#ifndef PATH_HH -#define PATH_HH +#ifndef FILE_PATH_HH +#define FILE_PATH_HH + #include "string.hh" #include "array.hh" @@ -19,10 +20,19 @@ Search a number of dirs for a file. TODO: add a unix style PATH interface - Should use kpathsea? - */ +class Path +{ +public: + String root; + String dir; + String base; + String ext; + + String str () const; +}; + class File_path : private Array { public: @@ -35,13 +45,6 @@ public: void parse_path (String); }; -/** split a path into its components. - - @params path - - @return - String &drive, String &dirs, String &filebase, String &extension - */ -void split_path (String path, String &drive, String &dirs, String &filebase, String &extension); +Path split_path (String path); -#endif +#endif /* FILE_PATH */ diff --git a/flower/simple-file-storage.cc b/flower/simple-file-storage.cc index 5b61cc1f43..34cda9d1f4 100644 --- a/flower/simple-file-storage.cc +++ b/flower/simple-file-storage.cc @@ -74,7 +74,7 @@ Simple_file_storage::Simple_file_storage (String s) data_p_ = 0; len_i_ = 0; - if (!s.length_i () || (s == "-")) + if ((s == "-")) load_stdin (); else load_file (s); diff --git a/input/bugs/beaming.ly b/input/bugs/beaming.ly new file mode 100644 index 0000000000..4d718747fe --- /dev/null +++ b/input/bugs/beaming.ly @@ -0,0 +1,4 @@ +\score { \notes { + + [\times 2/3 {c16 c c} c8] + [\times 2/3 {c16 c c} c8]}} diff --git a/input/bugs/dynamic-collide.ly b/input/bugs/dynamic-collide.ly new file mode 100644 index 0000000000..84d3cdcdc8 --- /dev/null +++ b/input/bugs/dynamic-collide.ly @@ -0,0 +1,70 @@ + +% dynamics should not collide with staff +% dynamics (of two voices) should not collide with eachother + +\header { +texidoc="Template for part-combining orchestral scores"; +} + + +End = { \skip 1; } +violoncello = \notes\relative c'' { + c1\ff +} + +contrabasso = \notes\relative c'' { + c1\pp +} + +flautiStaff = \notes \context Staff = flauti < + \context Voice=oneBassi \End + \context Voice=twoBassi \End + \context Voice=Flauti \partcombine Voice + \context Thread=oneFlauti \violoncello + \context Thread=twoFlauti \contrabasso +> + +staffCombineProperties = { + \property Voice.devNullThread = #'unisolo + \property Voice.soloADue = ##t + \property Voice.soloText = #"" + \property Voice.soloIIText = #"" + % This is non-conventional, but currently it is + % the only way to tell the difference. + \property Voice.aDueText = #"\\`a2" + \property Voice.splitInterval = #'(1 . 0) + \property Voice.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) +} + +\score { + < + \flautiStaff + > + + + \paper { + % \paperSixteen + linewidth = 80 * \staffspace; + textheight = 200 * \staffspace; + \translator{ + \ThreadContext + \consists "Rest_engraver"; + } + \translator{ + \VoiceContext + \remove "Rest_engraver"; + + devNullThread = #'never + \consists "Thread_devnull_engraver"; + + soloText = #"I." + soloIIText = #"II." + soloADue = ##f + } + \translator{ + \HaraKiriStaffContext + \consists "Mark_engraver"; + } + } +} + diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 653024e70c..3c3bb28577 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,7 +1,9 @@ \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. -Stems may be short, but noteheads should never touch the beam. +Stems may be short, but noteheads should never touch the beam. Note that +under normal circumstances, these beams would get knees; here +Beam.auto-knee-gap was set to false. "; } \version "1.3.117"; @@ -15,5 +17,11 @@ Stems may be short, but noteheads should never touch the beam. } \paper{ linewidth=-1.; + \translator { + \VoiceContext + % If we want to test extreme beams, + % we should not have them auto-kneed + Beam \override #'auto-knee-gap = ##f + } } } diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index ec0309b322..58b6abea2d 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -8,15 +8,15 @@ lyrics don't collide with barlines. \score { \context StaffGroup < \notes \context Staff { - b1 b1 \bar "|."; + b1 \bar "|:"; b1 \bar ":|"; } \lyrics\context Lyrics < \context LyricsVoiceWithBars { -% thisContextHasSpanBarEngraver1 added - ThisContextCertainlyHasSpanBarEngraverAddedButTheresSomethingFunny1. Here. +% thisContextHasBarEngraver1 added + ThisContextCertainlyHasBarEngraverAddedButThereHasBeenSomethingFunnyBefore1. Here. } \context LyricsVoice { - this4 one has no SpanBarEngraverAddedToContext1 + this4 one has no BarEngraverAddedToContext1 } > \notes \context Staff = SB { b1 b1 } @@ -25,11 +25,11 @@ lyrics don't collide with barlines. linewidth = -1.0\cm; \translator { \LyricsContext - \consists "Span_bar_engraver"; \accepts "LyricsVoiceWithBars"; } \translator { \LyricsVoiceContext + \consists "Bar_engraver"; \name "LyricsVoiceWithBars"; } \translator { diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 339826fb6b..150ed56921 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -6,23 +6,6 @@ http://www.Arkkra.com/doc/star.ps \version "1.3.120"; -% TODO: -% -% * centre non-melismata lyrics (where there's only one verse!) under -% notehead: -% -% l c c c l -% ___ -% | | | | | | | -% x|()x| x| x| x| x|( )x| -% Oh_____say can you see -% -% NOT! -% -% -% * slur/lyric clash -% - \header{ title="The Star Spangled Banner"; subtitle="The United States National Anthem"; @@ -139,12 +122,12 @@ text = \lyrics { \clef treble; \property Staff.automaticMelismata = ##t \context Voice = one \transpose c'' { - \stemUp + \voiceOne \staffBVoiceB \bar "|."; } \context Voice = two \transpose c'' { - \stemDown + \voiceTwo \staffBVoiceC } > @@ -154,11 +137,11 @@ text = \lyrics { \clef bass; \property Staff.VoltaBracket = \turnOff \context Voice = three { - \stemUp + \voiceOne \staffCVoiceB } \context Voice = four { - \stemDown + \voiceTwo \staffCVoiceC } > @@ -171,11 +154,6 @@ text = \lyrics { \GrandStaffContext \accepts "Lyrics"; } -% We have a Span_bar_engraver in GrandStaff; we only get grief if we add it here too. -% \translator { -% \LyricsContext -% \consists "Span_bar_engraver"; -% } \translator { \LyricsVoiceContext \consists "Bar_engraver"; diff --git a/input/test/markup.ly b/input/test/markup.ly index 07f3ecb1bf..8ef49ed00d 100644 --- a/input/test/markup.ly +++ b/input/test/markup.ly @@ -8,6 +8,7 @@ \score{ \notes\relative c''{ \stemUp +% { a-"text" b-#"texta" c-#'(bold "textb") @@ -18,10 +19,12 @@ (italic "three")) f-#'(finger "3") g-#'(music (named "noteheads-2" "flags-u3")) - - b-#'(rows "a" ((kern . 3) ((raise . 2) "b")) "c") - c-#'(rows "1" ((kern . -3) ((raise . -2) "2")) "3") - + b-#'(rows "a" (((kern . 3) (raise . 2)) "b") "c") + c-#'(rows "1" (((raise . -2) (kern . -1)) "2") "3") +% } + d-#'(lines "Violoncello" " e" "Contrabasso") + e-#'((lines (baselineskip . 0) (kern . 1.5)) "Violoncello" " e" "Contrabasso") + e-#'(((baselineskip . 0) (kern . 1.5) lines) "Violoncello" " e" "Contrabasso") } \paper{ linewidth = -1.\mm; diff --git a/input/tutorial/orchestral-score.ly b/input/tutorial/orchestral-score.ly index 64f7ba7f15..d46b66856a 100644 --- a/input/tutorial/orchestral-score.ly +++ b/input/tutorial/orchestral-score.ly @@ -1,4 +1,4 @@ -\version "1.3.120"; +\version "1.3.130"; \include "paper16.ly"; @@ -122,10 +122,10 @@ contrabasso = \notes\relative c { > \context Staff = clarinets < \property Staff.midiInstrument = #"clarinet" - \property Staff.instrument = #`((kern . 0.5) - (lines "2 Clarinetti" (rows "(B" ,text-flat ")"))) - \property Staff.instr = #`((kern . 0.5) - (lines "Cl." (rows "(B" ,text-flat ")"))) + \property Staff.instrument = #`(lines + "2 Clarinetti" (rows "(B" ,text-flat ")")) + \property Staff.instr = #`(lines + "Cl." (rows "(B" ,text-flat ")")) \property Staff.transposing = #-2 \notes \key f \major; \context Voice=one \partcombine Voice @@ -145,10 +145,10 @@ contrabasso = \notes\relative c { \context StaffGroup = brass < \context Staff = frenshHorns < \property Staff.midiInstrument = #"french horn" - \property Staff.instrument = #`((kern . 0.5) - (lines "2 Corni" (rows "(E" ,text-flat ")"))) - \property Staff.instr = #`((kern . 0.5) - (lines "Cor." (rows "(E" ,text-flat ")"))) + \property Staff.instrument = #`(lines + "2 Corni" (rows "(E" ,text-flat ")")) + \property Staff.instr = #`(lines + "Cor." (rows "(E" ,text-flat ")")) \property Staff.transposing = #3 \notes \key c \major; \context Voice=one \partcombine Voice @@ -157,10 +157,10 @@ contrabasso = \notes\relative c { > \context Staff = trumpets < \property Staff.midiInstrument = #"clarinet" - \property Staff.instrument = #`((kern . 0.5) - (lines "2 Trombe" (rows "(C)"))) - \property Staff.instr = #`((kern . 0.5) - (lines "Tbe." (rows "(C)"))) + \property Staff.instrument = #`(lines + "2 Trombe" (rows "(C)")) + \property Staff.instr = #`(lines + "Tbe." (rows "(C)")) \context Voice=one \partcombine Voice \context Thread=one \tromboI \context Thread=two \tromboII @@ -169,8 +169,8 @@ contrabasso = \notes\relative c { \context StaffGroup = timpani < \context Staff = timpani < \property Staff.midiInstrument = #"timpani" - \property Staff.instrument = #'((kern . 0.5) - (lines "2 Timpani" "(C-G)")) + \property Staff.instrument = #'(lines + "2 Timpani" "(C-G)") \property Staff.instr = #"Timp." \clef bass; \timpani @@ -204,8 +204,8 @@ contrabasso = \notes\relative c { \staffCombinePianoStaffProperties \context Staff=one < \property Staff.midiInstrument = #"cello" - \property Staff.instrument = #'((kern . 0.5) - (lines "Violoncello" (rows " e") (rows "Contrabasso"))) + \property Staff.instrument = #'(lines + "Violoncello" " e" "Contrabasso") \property Staff.instr = "Vc." \clef bass; > diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc index 5df8930a30..ef735b38bb 100644 --- a/lily/a2-engraver.cc +++ b/lily/a2-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" @@ -132,6 +132,8 @@ A2_engraver::acknowledge_grob (Grob_info i) if (Stem::has_interface (i.elem_l_) || Slur::has_interface (i.elem_l_) + // || Tie::has_interface (i.elem_l_) + || i.elem_l_->has_interface (ly_symbol2scm ("tie-interface")) /* Usually, dynamics are removed by *_devnull_engravers for the second voice. On the one hand, we don't want all dynamics for diff --git a/lily/afm.cc b/lily/afm.cc index b9224648be..746c6eb123 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -3,7 +3,7 @@ source file of the Flower Library - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include "afm.hh" diff --git a/lily/align-interface.cc b/lily/align-interface.cc index d335966f7f..dfb79e812b 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/align-note-column-engraver.cc b/lily/align-note-column-engraver.cc index 0f7f67afab..d03f316746 100644 --- a/lily/align-note-column-engraver.cc +++ b/lily/align-note-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 33a4667ef7..6f749f85cc 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ @@ -81,7 +81,8 @@ All_font_metrics::find_afm (String name) if (tfm->info_.checksum != afm->checksum_) { - String s = _f ("checksum mismatch for font file:\n`%s'", path.ch_C ()); + String s = _f ("checksum mismatch for font file: `%s'", + path.ch_C ()); s += " " + _f ("does not match: `%s'", tfm->path_.ch_C()); // FIXME s += "\n"; s += " TFM: " + to_str ((int) tfm->info_.checksum); diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index aa83cb68dc..76bc80a505 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index ba1e4d28ba..5cbf5c17ec 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/audio-column.cc b/lily/audio-column.cc index b29f09982c..fd1255eda2 100644 --- a/lily/audio-column.cc +++ b/lily/audio-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "audio-column.hh" diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc index c9f99c7732..c42ad1a443 100644 --- a/lily/audio-element-info.cc +++ b/lily/audio-element-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "audio-element-info.hh" diff --git a/lily/audio-element.cc b/lily/audio-element.cc index 9eff747eb4..ca124d9704 100644 --- a/lily/audio-element.cc +++ b/lily/audio-element.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "audio-element.hh" diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 05b101eabd..fc22538820 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "debug.hh" #include "audio-item.hh" diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc index e9993dbfdf..fe9ecaf9f4 100644 --- a/lily/audio-staff.cc +++ b/lily/audio-staff.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "audio-staff.hh" diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 1dafaad75b..27283b34dd 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ @@ -219,8 +219,6 @@ Spanner* Auto_beam_engraver::create_beam_p () { Spanner* beam_p = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p); - for (int i = 0; i < stem_l_arr_p_->size (); i++) { /* diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index ab240be254..9e3bb205db 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 38142ee4e9..6e22f40b6b 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "spanner.hh" diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 67beabd1c7..b7a8ec5a20 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include "hara-kiri-group-spanner.hh" diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 32bd40368e..540c321396 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index ce129ffd9b..b082ddb1aa 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ @@ -35,6 +35,11 @@ public: Bar_number_engraver(); }; + +/* + TODO: more advanced formatting via SCM function, perhaps barnumbers + every 5 measures? */ + void Bar_number_engraver::create_grobs () { diff --git a/lily/bar.cc b/lily/bar.cc index 0ee7890743..6d0c9a968b 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include @@ -73,12 +73,12 @@ Bar::compound_barline (Grob*me, String str, Real h) { return thin; } - else if (str == "|.") + else if (str == "|." || (h == 0 && str == ":|")) { m.add_at_edge (X_AXIS, LEFT, thick, 0); m.add_at_edge (X_AXIS, LEFT, thin, kern); } - else if (str == ".|") + else if (str == ".|" || (h == 0 && str == "|:")) { m.add_at_edge (X_AXIS, RIGHT, thick, 0); m.add_at_edge (X_AXIS, RIGHT, thin, kern); diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index fdb459ccb2..824cf0344e 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "engraver-group-engraver.hh" @@ -161,8 +161,6 @@ Beam_engraver::create_grobs () prev_start_req_ = reqs_drul_[START]; beam_p_ = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p_); - SCM smp = get_property ("measurePosition"); Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0); diff --git a/lily/beam.cc b/lily/beam.cc index d58054aa8f..a28b7b56de 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -1066,15 +1066,3 @@ Beam::has_interface (Grob*me) return me->has_interface (ly_symbol2scm ("beam-interface")); } -void -Beam::set_interface (Grob*me) -{ -#if 0 - /* - why the init? No way to tell difference between default and user - override. */ - me->set_grob_property ("y" ,gh_double2scm (0)); - me->set_grob_property ("dy", gh_double2scm (0)); - me->set_interface (ly_symbol2scm("beam-interface")); -#endif -} diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc index 9b92ddeb1a..653e1b3382 100644 --- a/lily/beaming-info.cc +++ b/lily/beaming-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index 7b8654d1bb..13fbba0c34 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/bezier.cc b/lily/bezier.cc index 21c49801b5..945a1ccda3 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/box.cc b/lily/box.cc index 6f8bf34394..f82325d20b 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "box.hh" diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index 92bed86e45..320857f7b8 100644 --- a/lily/break-algorithm.cc +++ b/lily/break-algorithm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "paper-column.hh" diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 1fdf8ea46e..057ea36945 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "engraver.hh" diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index edf184bed6..36f536ba0f 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc index 3bf8101690..f76a2d7203 100644 --- a/lily/change-iterator.cc +++ b/lily/change-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "change-iterator.hh" diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index ebe406f1f8..7a4302a912 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include "engraver.hh" @@ -46,7 +46,7 @@ Chord_name_engraver::Chord_name_engraver () { chord_name_p_ = 0; chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); - last_chord_ = SCM_EOL; + last_chord_ = chord_; } void @@ -94,7 +94,7 @@ Chord_name_engraver::create_grobs () chord_name_p_->set_grob_property ("chord", chord_); announce_grob (chord_name_p_, 0); SCM s = get_property ("chordChanges"); - if (to_boolean (s) && last_chord_ != SCM_EOL + if (to_boolean (s) && gh_car (last_chord_) != SCM_EOL && gh_equal_p (chord_, last_chord_)) chord_name_p_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T); } @@ -109,7 +109,8 @@ Chord_name_engraver::stop_translation_timestep () } chord_name_p_ = 0; - last_chord_ = chord_; + if (gh_car (chord_) != SCM_EOL) + last_chord_ = chord_; chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); } diff --git a/lily/chord-name.cc b/lily/chord-name.cc index dd06b0bbdf..8c0d543487 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #include "chord-name.hh" diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index e990addf9b..a73cb16875 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ @@ -107,7 +107,6 @@ Chord_tremolo_engraver::process_music () if (sequential_body_b_ && !beam_p_) { beam_p_ = new Spanner (get_property ("Beam")); - Beam::set_interface (beam_p_); beam_p_->set_grob_property ("chord-tremolo", SCM_BOOL_T); diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index 164efb439d..5487f96251 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/chord.cc b/lily/chord.cc index 2b7fa42d67..32215b656c 100644 --- a/lily/chord.cc +++ b/lily/chord.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #include "chord.hh" diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 2d6d585d54..adc1807f39 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys , + (c) 1997--2001 Han-Wen Nienhuys , Mats Bengtsson */ diff --git a/lily/clef-item.cc b/lily/clef-item.cc index 79444fae9c..22dcaf1fd8 100644 --- a/lily/clef-item.cc +++ b/lily/clef-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 7f361c5d8e..b0cc610f12 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "note-column.hh" diff --git a/lily/collision.cc b/lily/collision.cc index 8d5448b128..af13b3f6b2 100644 --- a/lily/collision.cc +++ b/lily/collision.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" #include "collision.hh" diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc index 3a56d61cce..bf4eccf4e0 100644 --- a/lily/column-x-positions.cc +++ b/lily/column-x-positions.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "column-x-positions.hh" diff --git a/lily/command-request.cc b/lily/command-request.cc index f37c73825c..1255c87bcc 100644 --- a/lily/command-request.cc +++ b/lily/command-request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "command-request.hh" diff --git a/lily/context-specced-music.cc b/lily/context-specced-music.cc index 8350fcb098..bb479a4ba6 100644 --- a/lily/context-specced-music.cc +++ b/lily/context-specced-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "context-specced-music.hh" diff --git a/lily/cxx-function-smob.cc b/lily/cxx-function-smob.cc index 796e33470a..35b2073219 100644 --- a/lily/cxx-function-smob.cc +++ b/lily/cxx-function-smob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/debug.cc b/lily/debug.cc index 44f120101d..8dc98a7018 100644 --- a/lily/debug.cc +++ b/lily/debug.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index 879f9f028b..e78ec6c282 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include #include "warn.hh" diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index 7075e2e44f..1197048d31 100644 --- a/lily/directional-element-interface.cc +++ b/lily/directional-element-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc index ca52e1273a..9fc7bbcd04 100644 --- a/lily/dot-column-engraver.cc +++ b/lily/dot-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 014af080bf..cfd51975ac 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "dots.hh" diff --git a/lily/dots.cc b/lily/dots.cc index 4dc6ab4877..a601beeeb1 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "dots.hh" diff --git a/lily/duration.cc b/lily/duration.cc index 9ea1ec5e20..930321d067 100644 --- a/lily/duration.cc +++ b/lily/duration.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 83b2def70a..223a7303bb 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" #include "dimensions.hh" @@ -110,8 +110,13 @@ Dynamic_engraver::try_music (Music * m) { accepted_spanreqs_drul_[LEFT] = 0; accepted_spanreqs_drul_[RIGHT] = 0; - if (line_spanner_) - line_spanner_->suicide (); + /* + Let's not kill the line spanner, since that would fuck up + earlier, not-to-be-terminated stuff. + + It will disappear by itself when stop_translation_timestep + () finds that there is nothing to support anymore. */ + line_spanner_ = 0; if (cresc_p_) cresc_p_->suicide (); diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 33067abcaf..ab1b5602f0 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "flower-proto.hh" diff --git a/lily/engraver.cc b/lily/engraver.cc index 0d3f2a67f8..5e9df9c922 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -3,7 +3,7 @@ Sourcefile of GNU LilyPond music type setter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "music.hh" diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc index a6126ddcb4..75c2e0f3d7 100644 --- a/lily/folded-repeat-iterator.cc +++ b/lily/folded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/font-interface.cc b/lily/font-interface.cc index fa285aef06..0f946a7480 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/font-metric.cc b/lily/font-metric.cc index fdc8bbc441..e8682df66b 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys Mats Bengtsson (the ugly TeX parsing in text_dimension) */ diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc index b48a72ff3b..27ab068d09 100644 --- a/lily/global-ctor.cc +++ b/lily/global-ctor.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "global-ctor.hh" diff --git a/lily/global-translator.cc b/lily/global-translator.cc index af8d804537..1174200de2 100644 --- a/lily/global-translator.cc +++ b/lily/global-translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index c05731f149..35db227ff8 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include // rint diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc index 901953cce1..c907e9ed2b 100644 --- a/lily/grace-align-item.cc +++ b/lily/grace-align-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc index e02d09be25..c5e6bcf9ae 100644 --- a/lily/grace-engraver-group.cc +++ b/lily/grace-engraver-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index b0c89c9214..3be0038dde 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-music.cc b/lily/grace-music.cc index a17842339c..20d3e8a167 100644 --- a/lily/grace-music.cc +++ b/lily/grace-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc index f7d2929561..c58a8a25c7 100644 --- a/lily/grace-performer-group.cc +++ b/lily/grace-performer-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music playter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #include "grace-performer-group.hh" diff --git a/lily/grace-position-engraver.cc b/lily/grace-position-engraver.cc index 5a7039016c..b5bf1b1a05 100644 --- a/lily/grace-position-engraver.cc +++ b/lily/grace-position-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/grace-position-performer.cc b/lily/grace-position-performer.cc index 168bbd3a0f..e275e891a7 100644 --- a/lily/grace-position-performer.cc +++ b/lily/grace-position-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/grob-info.cc b/lily/grob-info.cc index ac0076dc8f..edd020796e 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "grob-info.hh" diff --git a/lily/grob.cc b/lily/grob.cc index fdfb97c069..467853e6df 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/group-interface.cc b/lily/group-interface.cc index 313820a0b5..d0ac48aa3f 100644 --- a/lily/group-interface.cc +++ b/lily/group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "group-interface.hh" diff --git a/lily/hairpin.cc b/lily/hairpin.cc index c4520adef0..6634746e85 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "molecule.hh" diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index ae50f44685..53166be9e5 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index b4ee0f2821..d1a781699b 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/include/afm.hh b/lily/include/afm.hh index 73f2268a1d..b62d34fa54 100644 --- a/lily/include/afm.hh +++ b/lily/include/afm.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 9b7c646ef7..94d60926c0 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh index cd3eb17fa4..fb32f70ec7 100644 --- a/lily/include/all-font-metrics.hh +++ b/lily/include/all-font-metrics.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh index 628d100c29..74411bfc9e 100644 --- a/lily/include/arpeggio.hh +++ b/lily/include/arpeggio.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #ifndef ARPEGGIO_HH diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh index fb7e150d67..5705a9c7b0 100644 --- a/lily/include/audio-column.hh +++ b/lily/include/audio-column.hh @@ -1,7 +1,7 @@ /* audio-column.hh -- declare Audio_column - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef AUDIO_COLUMN_HH diff --git a/lily/include/audio-element-info.hh b/lily/include/audio-element-info.hh index b3b805ca07..85db1680ba 100644 --- a/lily/include/audio-element-info.hh +++ b/lily/include/audio-element-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/audio-element.hh b/lily/include/audio-element.hh index a8d79fc0e5..21cae00272 100644 --- a/lily/include/audio-element.hh +++ b/lily/include/audio-element.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index 72281b52da..04b876761f 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -1,7 +1,7 @@ /* audio-item.hh -- declare Audio_items - (c) 1996--2000 Jan Nieuwenhuizen + (c) 1996--2001 Jan Nieuwenhuizen */ #ifndef AUDIO_ITEM_HH diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh index 0413ad0508..2bda2aff9f 100644 --- a/lily/include/audio-staff.hh +++ b/lily/include/audio-staff.hh @@ -1,7 +1,7 @@ /* audio-staff.hh -- declare Audio_staff - (c) 1996--2000 Jan Nieuwenhuizen + (c) 1996--2001 Jan Nieuwenhuizen */ #ifndef AUDIO_STAFF_HH diff --git a/lily/include/auto-change-iterator.hh b/lily/include/auto-change-iterator.hh index 74558ab4df..536da00e82 100644 --- a/lily/include/auto-change-iterator.hh +++ b/lily/include/auto-change-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index 9c2097b345..869361f64b 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/bar-req-collector-engraver.hh b/lily/include/bar-req-collector-engraver.hh index 61affaa054..af401e7946 100644 --- a/lily/include/bar-req-collector-engraver.hh +++ b/lily/include/bar-req-collector-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/bar.hh b/lily/include/bar.hh index ffc4e4ad45..fa3330a15b 100644 --- a/lily/include/bar.hh +++ b/lily/include/bar.hh @@ -1,7 +1,7 @@ /* bar.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef BAR_HH diff --git a/lily/include/beam.hh b/lily/include/beam.hh index c1eb843b1a..e74b8e1b0e 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -1,7 +1,7 @@ /* beam.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef BEAM_HH @@ -19,7 +19,6 @@ public: static Item* first_visible_stem (Grob*); static Item* last_visible_stem (Grob*); static bool has_interface (Grob*); - static void set_interface (Grob*); DECLARE_SCHEME_CALLBACK(rest_collision_callback, (SCM element, SCM axis)); Beam (SCM); static void add_stem (Grob*,Grob*); diff --git a/lily/include/beaming.hh b/lily/include/beaming.hh index 06dd19f451..fd1643f153 100644 --- a/lily/include/beaming.hh +++ b/lily/include/beaming.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/bezier-bow.hh b/lily/include/bezier-bow.hh index 43b09f0e75..db32ad1d43 100644 --- a/lily/include/bezier-bow.hh +++ b/lily/include/bezier-bow.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index ebdfdb3939..318110c742 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -1,7 +1,7 @@ /* bezier.hh -- declare Bezier and Bezier_bow - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #ifndef BEZIER_HH diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh index 57fd8cdb92..9e7866cac0 100644 --- a/lily/include/break-algorithm.hh +++ b/lily/include/break-algorithm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh index 5ebbc384ff..06f62615ed 100644 --- a/lily/include/break-align-item.hh +++ b/lily/include/break-align-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh index 929271bcdf..d98488dc4a 100644 --- a/lily/include/change-iterator.hh +++ b/lily/include/change-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index 729af54e49..d9cc316497 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #ifndef CHORD_NAME_HH diff --git a/lily/include/chord-tremolo-iterator.hh b/lily/include/chord-tremolo-iterator.hh index 7f5e5c4852..8c35be601d 100644 --- a/lily/include/chord-tremolo-iterator.hh +++ b/lily/include/chord-tremolo-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/chord.hh b/lily/include/chord.hh index 0647233da3..1b6b856927 100644 --- a/lily/include/chord.hh +++ b/lily/include/chord.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #ifndef CHORD_HH diff --git a/lily/include/clef.hh b/lily/include/clef.hh index 81ac89000a..a436219de1 100644 --- a/lily/include/clef.hh +++ b/lily/include/clef.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/collision.hh b/lily/include/collision.hh index c5c005f06b..798634244e 100644 --- a/lily/include/collision.hh +++ b/lily/include/collision.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/column-x-positions.hh b/lily/include/column-x-positions.hh index f8cb92d079..3e186c57ae 100644 --- a/lily/include/column-x-positions.hh +++ b/lily/include/column-x-positions.hh @@ -1,7 +1,7 @@ /* column-x-positions.hh -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef COLUMN_X_POSITIONS_HH diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh index b1a28f4350..193636d04c 100644 --- a/lily/include/command-request.hh +++ b/lily/include/command-request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/context-specced-music.hh b/lily/include/context-specced-music.hh index 719a37fffb..29eeb68fbf 100644 --- a/lily/include/context-specced-music.hh +++ b/lily/include/context-specced-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/cxx-function-smob.hh b/lily/include/cxx-function-smob.hh index c9ac4bed3c..4f0b09a32f 100644 --- a/lily/include/cxx-function-smob.hh +++ b/lily/include/cxx-function-smob.hh @@ -2,7 +2,7 @@ cxx-function-smob.hh -- source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/dimension-cache-callback.hh b/lily/include/dimension-cache-callback.hh index 15142a6111..4c8d6d59eb 100644 --- a/lily/include/dimension-cache-callback.hh +++ b/lily/include/dimension-cache-callback.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh index e97936d77e..576879b5a2 100644 --- a/lily/include/dimension-cache.hh +++ b/lily/include/dimension-cache.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/directional-element-interface.hh b/lily/include/directional-element-interface.hh index b77ef71754..448ef9d809 100644 --- a/lily/include/directional-element-interface.hh +++ b/lily/include/directional-element-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index 452d0ba000..4757501f63 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/dots.hh b/lily/include/dots.hh index 075bf3fdc7..72c85f09f2 100644 --- a/lily/include/dots.hh +++ b/lily/include/dots.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/duration.hh b/lily/include/duration.hh index 54c4793fb8..06680e1b9e 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/engraver-group-engraver.hh b/lily/include/engraver-group-engraver.hh index 10ccaada0e..65aadbca8e 100644 --- a/lily/include/engraver-group-engraver.hh +++ b/lily/include/engraver-group-engraver.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index 729c5d7d57..d06055ec37 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/include/file-results.hh b/lily/include/file-results.hh index 64ce52bf66..3474c2f0f8 100644 --- a/lily/include/file-results.hh +++ b/lily/include/file-results.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/folded-repeat-iterator.hh b/lily/include/folded-repeat-iterator.hh index 178414c7b6..5bafa50d5d 100644 --- a/lily/include/folded-repeat-iterator.hh +++ b/lily/include/folded-repeat-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh index e18cc9f3ef..a75a25b5b5 100644 --- a/lily/include/font-interface.hh +++ b/lily/include/font-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index 2ebbf303b1..24c9cc1032 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/global-ctor.hh b/lily/include/global-ctor.hh index a0cf239349..03ecd38457 100644 --- a/lily/include/global-ctor.hh +++ b/lily/include/global-ctor.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh index 1afb8483d1..606fea37bb 100644 --- a/lily/include/global-translator.hh +++ b/lily/include/global-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh index 68361114b1..54da51c85c 100644 --- a/lily/include/gourlay-breaking.hh +++ b/lily/include/gourlay-breaking.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-align-item.hh b/lily/include/grace-align-item.hh index debe1d5aa2..b89bd6ef90 100644 --- a/lily/include/grace-align-item.hh +++ b/lily/include/grace-align-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-engraver-group.hh b/lily/include/grace-engraver-group.hh index 2a47925d34..1419ce3e83 100644 --- a/lily/include/grace-engraver-group.hh +++ b/lily/include/grace-engraver-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh index 37c78b7b35..f51cbcbc23 100644 --- a/lily/include/grace-iterator.hh +++ b/lily/include/grace-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-music.hh b/lily/include/grace-music.hh index cc015b5c85..5392b734cc 100644 --- a/lily/include/grace-music.hh +++ b/lily/include/grace-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grace-performer-group.hh b/lily/include/grace-performer-group.hh index 5d4b3400e1..f7d2b93221 100644 --- a/lily/include/grace-performer-group.hh +++ b/lily/include/grace-performer-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh index 65db5a3a34..86997faaee 100644 --- a/lily/include/grob-info.hh +++ b/lily/include/grob-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/grob.hh b/lily/include/grob.hh index 86ef255b4f..3940b7f58a 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -1,7 +1,7 @@ /* grob.hh -- declare Grob - (c) 1996-1999--2000 Han-Wen Nienhuys + (c) 1996-1999--2001 Han-Wen Nienhuys */ #ifndef STAFFELEM_HH diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh index c9fcde7aee..e2303633dc 100644 --- a/lily/include/group-interface.hh +++ b/lily/include/group-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh index 30578b643a..64697548eb 100644 --- a/lily/include/hairpin.hh +++ b/lily/include/hairpin.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/hara-kiri-engraver.hh b/lily/include/hara-kiri-engraver.hh index 0c1d70778e..c1eb5d444f 100644 --- a/lily/include/hara-kiri-engraver.hh +++ b/lily/include/hara-kiri-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh index 2e3b2dc93f..52312d6f97 100644 --- a/lily/include/hara-kiri-group-spanner.hh +++ b/lily/include/hara-kiri-group-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/hara-kiri-line-group-engraver.hh b/lily/include/hara-kiri-line-group-engraver.hh index 391514f7fc..18c3fb8394 100644 --- a/lily/include/hara-kiri-line-group-engraver.hh +++ b/lily/include/hara-kiri-line-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index 1be193910a..2bdfff1f47 100644 --- a/lily/include/includable-lexer.hh +++ b/lily/include/includable-lexer.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/input-smob.hh b/lily/include/input-smob.hh index 87d63c5ba6..2cd9462d5d 100644 --- a/lily/include/input-smob.hh +++ b/lily/include/input-smob.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/interpretation-context-handle.hh b/lily/include/interpretation-context-handle.hh index cb788f124a..4d630936c0 100644 --- a/lily/include/interpretation-context-handle.hh +++ b/lily/include/interpretation-context-handle.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/item.hh b/lily/include/item.hh index 48edba0188..0591a80781 100644 --- a/lily/include/item.hh +++ b/lily/include/item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef ITEM_HH #define ITEM_HH diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index bc8f306f7c..cb8e28aab8 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -1,7 +1,7 @@ /* key-item.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef KEYITEM_HH diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh index 6edecf9c52..c2c6338a0a 100644 --- a/lily/include/keyword.hh +++ b/lily/include/keyword.hh @@ -1,7 +1,7 @@ /* keyword.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef KEYWORD_HH diff --git a/lily/include/kpath.hh b/lily/include/kpath.hh index 7bd89c82e4..95e7df7209 100644 --- a/lily/include/kpath.hh +++ b/lily/include/kpath.hh @@ -3,7 +3,7 @@ kpath.hh -- declare kpath funcs. source file of the GNU LilyPond music typesetter -(c) 2000 Han-Wen Nienhuys +(c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/least-squares.hh b/lily/include/least-squares.hh index 678378eb0a..c7172d8e9f 100644 --- a/lily/include/least-squares.hh +++ b/lily/include/least-squares.hh @@ -1,7 +1,7 @@ /* leastsquare.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef LEASTSQUARE_HH diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index fdda2b6977..ebb7e70c3f 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_HH diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index 63d44ac69d..94e0adb016 100644 --- a/lily/include/lily-proto.hh +++ b/lily/include/lily-proto.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef LILY_PROTO_HH diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh index f5d37d3a55..c8326aae13 100644 --- a/lily/include/lily-version.hh +++ b/lily/include/lily-version.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/lilypond-input-version.hh b/lily/include/lilypond-input-version.hh index 79f7e06ef0..3fdfc26950 100644 --- a/lily/include/lilypond-input-version.hh +++ b/lily/include/lilypond-input-version.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/line-group-group-engraver.hh b/lily/include/line-group-group-engraver.hh index 4f8ca20aaf..4774141b38 100644 --- a/lily/include/line-group-group-engraver.hh +++ b/lily/include/line-group-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh index b40d988917..88068617f9 100644 --- a/lily/include/line-of-score.hh +++ b/lily/include/line-of-score.hh @@ -1,7 +1,7 @@ /* line-of-score.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef SCORELINE_HH diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh index e125a12c02..267a6fda66 100644 --- a/lily/include/line-spanner.hh +++ b/lily/include/line-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh index c6a762ec4f..e0f781c881 100644 --- a/lily/include/local-key-item.hh +++ b/lily/include/local-key-item.hh @@ -1,7 +1,7 @@ /* local-key-item.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef LOCALKEYITEM_HH diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index 3a14777e05..4a3dea7e0f 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh index dea39fcd91..dae14c81dc 100644 --- a/lily/include/lyric-combine-music-iterator.hh +++ b/lily/include/lyric-combine-music-iterator.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh index 78b18b0cb2..a2fcd65dae 100644 --- a/lily/include/lyric-combine-music.hh +++ b/lily/include/lyric-combine-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/lyric-extender.hh b/lily/include/lyric-extender.hh index 860b6072f4..48595e43e0 100644 --- a/lily/include/lyric-extender.hh +++ b/lily/include/lyric-extender.hh @@ -2,7 +2,7 @@ /* extender-spanner.hh -- part of GNU LilyPond - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #ifndef EXTENDER_SPANNER_HH diff --git a/lily/include/main.hh b/lily/include/main.hh index 401a896ad5..e495ade889 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef MAIN_HH #define MAIN_HH @@ -18,35 +18,28 @@ void add_score (Score* s); void set_default_output (String s); String find_file (String); void call_constructors (); +extern Array get_inclusion_names (); +extern void set_inclusion_names (Array); -extern Sources* source_global_l; +/* options */ +extern bool dependency_global_b; +extern String dependency_prefix_global; +extern Array dump_header_fieldnames_global; extern bool no_paper_global_b; -extern bool safe_global_b; extern bool no_timestamps_global_b; -extern bool find_old_relative_b; - -extern int exit_status_i_; -extern bool experimental_features_global_b; -extern char const* output_global_ch; -extern bool dependency_global_b; +extern String output_format_global; +extern String output_name_global; +extern bool safe_global_b; extern bool verbose_global_b; - -extern Array get_inclusion_names (); -extern void set_inclusion_names (Array); - -extern File_path global_path; - -/* - names of header fields to be dumped to a separate file. -*/ -extern Array global_dumped_header_fieldnames; - -extern String default_outname_base_global; -extern String default_outname_suffix_global; -extern int default_count_global; +/* misc */ extern All_font_metrics *all_fonts_global_p; +extern int exit_status_global; +extern File_path global_path; +extern int score_count_global; +extern Sources* source_global_l; class ostream; void print_lilypond_versions (ostream &os); -#endif + +#endif /* MAIN_HH */ diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh index adf7a3e792..1c4c1fe205 100644 --- a/lily/include/midi-def.hh +++ b/lily/include/midi-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ @@ -20,18 +20,17 @@ definitions for midi output. Rather empty */ class Midi_def : public Music_output_def { - static int default_count_i_; + static int score_count_i_; public: VIRTUAL_COPY_CONS(Music_output_def); Midi_def(); - ~Midi_def(); int get_tempo_i (Moment moment); void set_tempo (Moment moment, int count_per_minute_i); - virtual int get_next_default_count () const; - static void reset_default_count(); + virtual int get_next_score_count () const; + static void reset_score_count(); }; #endif // MIDI_DEF_HH diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh index 2fc7721c21..ef344797cb 100644 --- a/lily/include/midi-item.hh +++ b/lily/include/midi-item.hh @@ -1,7 +1,7 @@ /* midi-item.hh -- declare Midi items - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef MIDI_ITEM_HH diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh index 13132e6d28..3881993ab1 100644 --- a/lily/include/midi-stream.hh +++ b/lily/include/midi-stream.hh @@ -1,7 +1,7 @@ /* midi-stream.hh -- declare Midi_stream - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef MIDI_STREAM_HH diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh index 9b4c88ca90..766bc08e5c 100644 --- a/lily/include/midi-walker.hh +++ b/lily/include/midi-walker.hh @@ -1,7 +1,7 @@ /* midi-walker.hh -- declare Midi_walker - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/minterval.hh b/lily/include/minterval.hh index f0381848f4..2c842c3232 100644 --- a/lily/include/minterval.hh +++ b/lily/include/minterval.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh index b135eeb45b..41eb304160 100644 --- a/lily/include/molecule.hh +++ b/lily/include/molecule.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef MOLECULE_HH #define MOLECULE_HH diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 46628e211f..2113ab9f60 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index ade68b16c0..2a6ef9fae0 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh index 40f24b3576..019976f848 100644 --- a/lily/include/music-iterator.hh +++ b/lily/include/music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh index b0a0017a15..1212195f9c 100644 --- a/lily/include/music-list.hh +++ b/lily/include/music-list.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh index 503a1c8105..3381788dbb 100644 --- a/lily/include/music-output-def.hh +++ b/lily/include/music-output-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ @@ -35,14 +35,13 @@ public: VIRTUAL_COPY_CONS(Music_output_def); Music_output_def (Music_output_def const&); Music_output_def (); - virtual int get_next_default_count () const; + virtual int get_next_score_count () const; Global_translator *get_global_translator_p (); Translator_group *get_group_translator_p (String type) const; - String get_default_output () const; void assign_translator (SCM transdef); SCM find_translator_l (SCM name) const; - String base_output_str () ; + String outname_str () ; DECLARE_SMOBS(Music_output_def,); }; diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh index 9b4a046493..f52c82dc6f 100644 --- a/lily/include/music-output.hh +++ b/lily/include/music-output.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh index 67ce044dee..f3d6ed9e9b 100644 --- a/lily/include/music-sequence.hh +++ b/lily/include/music-sequence.hh @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh index 3aec129825..a488b8e2f7 100644 --- a/lily/include/music-wrapper-iterator.hh +++ b/lily/include/music-wrapper-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh index b5f274cad4..8713d912da 100644 --- a/lily/include/music-wrapper.hh +++ b/lily/include/music-wrapper.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/music.hh b/lily/include/music.hh index c6b5339e4f..5ad9151ee0 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index 24052a3c96..04f7c0c3aa 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index 48a87991f4..11ad0adbe0 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef LEXER_HH diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index bd5b82159b..83463056cf 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh index dfc92030af..bb10e2696a 100644 --- a/lily/include/note-column.hh +++ b/lily/include/note-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index e38fbd1609..9c77a23955 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -1,7 +1,7 @@ /* note-head.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef NOTEHEAD_HH diff --git a/lily/include/output-property-music-iterator.hh b/lily/include/output-property-music-iterator.hh index e7bd04a45a..3c94f39e8d 100644 --- a/lily/include/output-property-music-iterator.hh +++ b/lily/include/output-property-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #ifndef OUTPUT_PROPERTY_MUSIC_ITERATOR_HH diff --git a/lily/include/output-property.hh b/lily/include/output-property.hh index 01e8ffbf13..7a91fd7404 100644 --- a/lily/include/output-property.hh +++ b/lily/include/output-property.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh index c111a2e05d..00d7e48864 100644 --- a/lily/include/paper-column.hh +++ b/lily/include/paper-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index 8346074e30..29d0abacc5 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ @@ -54,7 +54,7 @@ protected: public: SCM font_descriptions ()const; virtual ~Paper_def (); - static int default_count_i_; + static int score_count_i_; /* JUNKME @@ -68,8 +68,8 @@ public: Interval line_dimensions_int (int) const; - virtual int get_next_default_count () const; - static void reset_default_count(); + virtual int get_next_score_count () const; + static void reset_score_count (); void output_settings (Paper_outputter*) const; Paper_outputter* paper_outputter_p () ; diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh index a4149faa92..9d76b67f73 100644 --- a/lily/include/paper-outputter.hh +++ b/lily/include/paper-outputter.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh index 31914b2c20..9429aaf5e8 100644 --- a/lily/include/paper-score.hh +++ b/lily/include/paper-score.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/include/paper-stream.hh b/lily/include/paper-stream.hh index 7970ba146d..86c0a22b61 100644 --- a/lily/include/paper-stream.hh +++ b/lily/include/paper-stream.hh @@ -34,7 +34,8 @@ private: }; class ostream; -ostream *open_file_stream (String filename); +#include +ostream *open_file_stream (String filename, int mode=ios::out); void close_file_stream (ostream *os); diff --git a/lily/include/part-combine-music-iterator.hh b/lily/include/part-combine-music-iterator.hh index 4e62ff651c..21be315989 100644 --- a/lily/include/part-combine-music-iterator.hh +++ b/lily/include/part-combine-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/part-combine-music.hh b/lily/include/part-combine-music.hh index 4314b86471..95062639a5 100644 --- a/lily/include/part-combine-music.hh +++ b/lily/include/part-combine-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/performance.hh b/lily/include/performance.hh index e07dc6a89f..1120ac5c89 100644 --- a/lily/include/performance.hh +++ b/lily/include/performance.hh @@ -1,7 +1,7 @@ /* performance.hh -- declare Performance - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef PERFORMANCE_HH diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh index 986afff64f..8101186210 100644 --- a/lily/include/performer-group-performer.hh +++ b/lily/include/performer-group-performer.hh @@ -1,7 +1,7 @@ /* performer-group-performer.hh -- declare Performer_group_performer - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/performer.hh b/lily/include/performer.hh index b5257984aa..1e639af771 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -1,7 +1,7 @@ /* performer.hh -- declare Performer - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh index f5cfa19ed0..cd478d250f 100644 --- a/lily/include/pitch.hh +++ b/lily/include/pitch.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh index 71b0441dd2..e72a0a894f 100644 --- a/lily/include/property-iterator.hh +++ b/lily/include/property-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/protected-scm.hh b/lily/include/protected-scm.hh index cbe08a30c0..7b96c6e7d6 100644 --- a/lily/include/protected-scm.hh +++ b/lily/include/protected-scm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/relative-music.hh b/lily/include/relative-music.hh index 5a07fbc8a1..fac082d913 100644 --- a/lily/include/relative-music.hh +++ b/lily/include/relative-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index 5274e35b8f..222a4abcc9 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/request-chord-iterator.hh b/lily/include/request-chord-iterator.hh index 204598bdd0..d54cfe9d8e 100644 --- a/lily/include/request-chord-iterator.hh +++ b/lily/include/request-chord-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/request.hh b/lily/include/request.hh index e05332a7c9..0f693ce13d 100644 --- a/lily/include/request.hh +++ b/lily/include/request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef REQUEST_HH diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index d58bebf0f4..578b1151dd 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/rest.hh b/lily/include/rest.hh index 462e68922d..b462bca6fc 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh index a9d6f904c0..7b4e7c2302 100644 --- a/lily/include/rhythmic-head.hh +++ b/lily/include/rhythmic-head.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/rod.hh b/lily/include/rod.hh index d795f539ad..b7c07aa575 100644 --- a/lily/include/rod.hh +++ b/lily/include/rod.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/scaled-font-metric.hh b/lily/include/scaled-font-metric.hh index 82d1245976..0535df0fc2 100644 --- a/lily/include/scaled-font-metric.hh +++ b/lily/include/scaled-font-metric.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index 6f8f5fee6f..c36a368e3e 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/scope.hh b/lily/include/scope.hh index 35e19faa62..7420997a49 100644 --- a/lily/include/scope.hh +++ b/lily/include/scope.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index faeecc9127..cdabb2eb13 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh index b5999c53f6..41f00e2ed3 100644 --- a/lily/include/score-performer.hh +++ b/lily/include/score-performer.hh @@ -1,7 +1,7 @@ /* score-performer.hh -- declare Score_performer - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/score.hh b/lily/include/score.hh index ab48fd3c97..26fe6fb57f 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index 2f77a866b4..c5b0bd43ea 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/script.hh b/lily/include/script.hh index bedf9501e5..8ab6db25dd 100644 --- a/lily/include/script.hh +++ b/lily/include/script.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh index 67c45a5376..4bff88adc4 100644 --- a/lily/include/separating-group-spanner.hh +++ b/lily/include/separating-group-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/separating-line-group-engraver.hh b/lily/include/separating-line-group-engraver.hh index 6a26cd3194..5a5f7302cf 100644 --- a/lily/include/separating-line-group-engraver.hh +++ b/lily/include/separating-line-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh index 1e3d5b67c4..49a50baf45 100644 --- a/lily/include/separation-item.hh +++ b/lily/include/separation-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh index 5da129b286..963faf2d07 100644 --- a/lily/include/sequential-music-iterator.hh +++ b/lily/include/sequential-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #ifndef SEQUENTIAL_MUSIC_ITERATOR_HH diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index b2c5b5f2ce..38ab695aa1 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh index d03601a6dc..d5f4683d9b 100644 --- a/lily/include/simple-music-iterator.hh +++ b/lily/include/simple-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #ifndef SIMPLE_MUSIC_ITERATOR_HH diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh index 4cf344fbca..2f13a107d2 100644 --- a/lily/include/simple-spacer.hh +++ b/lily/include/simple-spacer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh index 9197129477..aec5d6494c 100644 --- a/lily/include/simultaneous-music-iterator.hh +++ b/lily/include/simultaneous-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/slur-bezier-bow.hh b/lily/include/slur-bezier-bow.hh index c84e6723f2..01b1304a4e 100644 --- a/lily/include/slur-bezier-bow.hh +++ b/lily/include/slur-bezier-bow.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #ifndef SLUR_BEZIER_BOW_HH diff --git a/lily/include/slur.hh b/lily/include/slur.hh index 62c7f770cf..f4e28b7947 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -1,7 +1,7 @@ /* slur.hh -- declare Slur - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef SLUR_HH diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index 3c46977016..2a519c4326 100644 --- a/lily/include/smobs.hh +++ b/lily/include/smobs.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/spaceable-element.hh b/lily/include/spaceable-element.hh index 2730ea6996..2c40d2e8f5 100644 --- a/lily/include/spaceable-element.hh +++ b/lily/include/spaceable-element.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh index c1158706dd..73d8da023d 100644 --- a/lily/include/spacing-spanner.hh +++ b/lily/include/spacing-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh index e3cc0c2246..370c3626f4 100644 --- a/lily/include/span-bar.hh +++ b/lily/include/span-bar.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/span-score-bar-engraver.hh b/lily/include/span-score-bar-engraver.hh index 0a16540022..b36c83fa69 100644 --- a/lily/include/span-score-bar-engraver.hh +++ b/lily/include/span-score-bar-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index 7a21c3a917..3429e22b0d 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -1,7 +1,7 @@ /* spanner.hh -- part of GNU LilyPond - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef SPANNER_HH diff --git a/lily/include/spring.hh b/lily/include/spring.hh index 7bb5cc3685..9585c874dd 100644 --- a/lily/include/spring.hh +++ b/lily/include/spring.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index 5a702be1d8..8e60ae6591 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh index 4d578c4b02..dde710433a 100644 --- a/lily/include/staff-symbol.hh +++ b/lily/include/staff-symbol.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/stem-info.hh b/lily/include/stem-info.hh index f4f87721a1..8230ef9018 100644 --- a/lily/include/stem-info.hh +++ b/lily/include/stem-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh index adfdf739d1..d76872cce6 100644 --- a/lily/include/stem-tremolo.hh +++ b/lily/include/stem-tremolo.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 46ad72c2f6..8d9c533763 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -1,7 +1,7 @@ /* stem.hh -- declare Stem - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef STEM_HH diff --git a/lily/include/swallow-engraver.hh b/lily/include/swallow-engraver.hh index 169c72ba82..49bc28bc95 100644 --- a/lily/include/swallow-engraver.hh +++ b/lily/include/swallow-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/swallow-perf.hh b/lily/include/swallow-perf.hh index 334cabd678..b297371896 100644 --- a/lily/include/swallow-perf.hh +++ b/lily/include/swallow-perf.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/symbol-cache.hh b/lily/include/symbol-cache.hh index e07b603d3c..5471f09264 100644 --- a/lily/include/symbol-cache.hh +++ b/lily/include/symbol-cache.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh index bcf039374e..5b15f9b264 100644 --- a/lily/include/system-start-delimiter.hh +++ b/lily/include/system-start-delimiter.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh index 15373296c6..650096c140 100644 --- a/lily/include/text-item.hh +++ b/lily/include/text-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -21,7 +21,7 @@ public: DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM)); static Molecule text2molecule (Grob *me, SCM text, SCM properties); static Molecule string2molecule (Grob *me, SCM text, SCM properties); - static Molecule markup_sentence2molecule (Grob *me, SCM markup_sentence, SCM properties); + static Molecule markup_text2molecule (Grob *me, SCM markup_text, SCM properties); private: static Molecule lookup_character (Grob *me, Font_metric*, SCM char_name); diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh index a3af5beedb..7f1486b143 100644 --- a/lily/include/text-spanner.hh +++ b/lily/include/text-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh index 53cb6d45ed..09aef4b701 100644 --- a/lily/include/tfm-reader.hh +++ b/lily/include/tfm-reader.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen revamped code from GNU Fontutils-0.6 diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh index 068ca68ae2..93deefc106 100644 --- a/lily/include/tfm.hh +++ b/lily/include/tfm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen revamped code from GNU Fontutils-0.6 diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh index 333b319949..36072dd03c 100644 --- a/lily/include/tie-column.hh +++ b/lily/include/tie-column.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/tie-engraver.hh b/lily/include/tie-engraver.hh index fbd52deae6..089be415ba 100644 --- a/lily/include/tie-engraver.hh +++ b/lily/include/tie-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 6c5be3f4d7..97499d8a11 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/time-scaled-music-iterator.hh b/lily/include/time-scaled-music-iterator.hh index c13e0bdbd6..5c2763293e 100644 --- a/lily/include/time-scaled-music-iterator.hh +++ b/lily/include/time-scaled-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/time-scaled-music.hh b/lily/include/time-scaled-music.hh index d184f395d1..2ede5ffa6a 100644 --- a/lily/include/time-scaled-music.hh +++ b/lily/include/time-scaled-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh index c45dcd86cc..686c9b132b 100644 --- a/lily/include/time-signature.hh +++ b/lily/include/time-signature.hh @@ -1,7 +1,7 @@ /* time_signature.hh -- declare Time_signature - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #ifndef METER_HH diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh index cdd9143900..85f2c4ba58 100644 --- a/lily/include/timing-translator.hh +++ b/lily/include/timing-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translation-property.hh b/lily/include/translation-property.hh index dc332df200..3750e927e4 100644 --- a/lily/include/translation-property.hh +++ b/lily/include/translation-property.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translator-change.hh b/lily/include/translator-change.hh index 508e3d38f0..992fcedf34 100644 --- a/lily/include/translator-change.hh +++ b/lily/include/translator-change.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translator-def.hh b/lily/include/translator-def.hh index 634f70db30..dbaea4d43d 100644 --- a/lily/include/translator-def.hh +++ b/lily/include/translator-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index ebda8bdfec..52d7995aea 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 019ea273ef..58500438be 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/transposed-music.hh b/lily/include/transposed-music.hh index 641c8a915b..75de24ff09 100644 --- a/lily/include/transposed-music.hh +++ b/lily/include/transposed-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/tuplet-engraver.hh b/lily/include/tuplet-engraver.hh index 64539a0f78..7505980fec 100644 --- a/lily/include/tuplet-engraver.hh +++ b/lily/include/tuplet-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index 2e352e6eea..cf1e2cedf0 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -1,11 +1,11 @@ /* plet-spanner.hh -- part of GNU LilyPond - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ -#ifndef Tuplet_spanner_HH -#define Tuplet_spanner_HH +#ifndef Tuplet_bracket_HH +#define Tuplet_bracket_HH #include "lily-guile.hh" @@ -16,7 +16,7 @@ todo: handle breaking elegantly. */ -class Tuplet_spanner +class Tuplet_bracket { public: DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); @@ -34,5 +34,5 @@ public: static Direction get_default_dir (Grob*); }; -#endif // Tuplet_spanner_HH +#endif // Tuplet_bracket_HH diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh index 379cfcbbb9..908e7b86d5 100644 --- a/lily/include/type-swallow-translator.hh +++ b/lily/include/type-swallow-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh index 94aa2ec9cc..32a39cd3fc 100644 --- a/lily/include/volta-spanner.hh +++ b/lily/include/volta-spanner.hh @@ -1,7 +1,7 @@ /* volta-spanner.hh -- part of GNU LilyPond - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #ifndef VOLTA_SPANNER_HH diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 4b6f455a55..4e6710cd69 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 4b534dac3c..852ef176d3 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/interpretation-context-handle.cc b/lily/interpretation-context-handle.cc index e5b056e601..d03d4bc8e0 100644 --- a/lily/interpretation-context-handle.cc +++ b/lily/interpretation-context-handle.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/item.cc b/lily/item.cc index f157b480a2..099257e001 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 35c4af6a35..9ffb77a381 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "key-item.hh" diff --git a/lily/key-item.cc b/lily/key-item.cc index a23b92eac8..4a3c30db99 100644 --- a/lily/key-item.cc +++ b/lily/key-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys keyplacement by Mats Bengtsson */ diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 7f2e9e171b..b379691f75 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "command-request.hh" diff --git a/lily/kpath.cc b/lily/kpath.cc index 022f929ec3..0f5531dc8e 100644 --- a/lily/kpath.cc +++ b/lily/kpath.cc @@ -3,7 +3,7 @@ kpath.cc -- glue kpathsea to lily. Need some ugly kludges for gcc 2.96 source file of the GNU LilyPond music typesetter -(c) 2000 Han-Wen Nienhuys +(c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/least-squares.cc b/lily/least-squares.cc index 4c63681fa5..8e9a5baf4f 100644 --- a/lily/least-squares.cc +++ b/lily/least-squares.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index d467a59e82..695601e8ca 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/lily-version.cc b/lily/lily-version.cc index 6da4880b58..081504324a 100644 --- a/lily/lily-version.cc +++ b/lily/lily-version.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ #include "config.h" diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc index e252710185..d1bddc5cf7 100644 --- a/lily/lilypond-version.cc +++ b/lily/lilypond-version.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/line-group-group-engraver.cc b/lily/line-group-group-engraver.cc index 8d0383c705..7a4f64c4a4 100644 --- a/lily/line-group-group-engraver.cc +++ b/lily/line-group-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "command-request.hh" diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index e921bd0a0f..3a1222d833 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "input-smob.hh" diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 051d91d16b..5ea4c1a687 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 2bad4ea824..0337c55b6f 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -1,7 +1,7 @@ /* local-key-engraver.cc -- implement Local_key_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 6fb078eda2..e815098eff 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "local-key-item.hh" #include "molecule.hh" diff --git a/lily/lookup.cc b/lily/lookup.cc index 1e24db5da7..62f449b08c 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index bcff3af02a..139dcc4290 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index 51e37f80f5..8f7770ecf9 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 9fff756ede..439d9602de 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index d3af55fbb9..0cbce00123 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -2,7 +2,7 @@ lyric-extender.cc -- implement Lyric_extender source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 4a759e8043..28551a700b 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "musical-request.hh" diff --git a/lily/main.cc b/lily/main.cc index 82f0e60a15..8713c7d741 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include @@ -11,16 +11,20 @@ #include #include +#include "config.h" + +#if HAVE_GETTEXT +#include +#endif + #include "lily-guile.hh" #include "lily-version.hh" - #include "all-font-metrics.hh" #include "getopt-long.hh" #include "misc.hh" #include "string.hh" #include "main.hh" #include "file-path.hh" -#include "config.h" #include "file-results.hh" #include "debug.hh" #include "lily-guile.hh" @@ -30,38 +34,64 @@ #include "kpath.hh" -#if HAVE_GETTEXT -#include -#endif +/* + Global options that can be overridden through command line. +*/ +/* Write dependencies file? */ +bool dependency_global_b = false; +/* Prepend to dependencies */ +String dependency_prefix_global; -bool verbose_global_b = false; +/* Names of header fields to be dumped to a separate file. */ +Array dump_header_fieldnames_global; + +/* Name of initialisation file. */ +String init_name_global; + +/* Do not calculate and write paper output? */ bool no_paper_global_b = false; + +/* Do not write timestamps in output? */ bool no_timestamps_global_b = false; -bool find_old_relative_b = false; -char const* output_global_ch = "tex"; -All_font_metrics *all_fonts_global_p; +/* Selected output format. + One of tex, ps, scm, as. */ +String output_format_global = "tex"; -String default_outname_base_global = "lelie"; -String outname_str_global; -String init_str_global; +/* Current output name. */ +String output_name_global; -int default_count_global; +/* Run in safe mode? -- FIXME: should be re-analised */ +bool safe_global_b = false; + +/* Verbose progress indication? */ +bool verbose_global_b = false; + + + +/* + Misc. global stuff. + */ + + +All_font_metrics *all_fonts_global_p; +int exit_status_global; File_path global_path; -Array global_dumped_header_fieldnames; +/* Number of current score output block. If there's more than one + score block, this counter will be added to the output filename. */ +int score_count_global; -bool safe_global_b = false; -bool experimental_features_global_b = false; -bool dependency_global_b = false; -int exit_status_i_; -Getopt_long * oparser_global_p = 0; +/* + File globals. + */ -String distill_inname_str (String name_str, String& ext_r); +/* The option parser */ +static Getopt_long *oparser_p_static = 0; /* Internationalisation kludge in two steps: @@ -71,23 +101,22 @@ String distill_inname_str (String name_str, String& ext_r); Note: these messages all start with lower case (ie, don't follow regular localisation guidelines). */ -Long_option_init theopts[] = { +static Long_option_init options_static[] = { {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, {0, "help", 'h', _i ("this help")}, {_i ("FIELD"), "header", 'H', _i ("write header field to BASENAME.FIELD")}, {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, {0, "dependencies", 'M', _i ("write Makefile dependencies for every input file")}, + {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")}, {0, "no-paper", 'm', _i ("produce MIDI output only")}, - {_i ("BASENAME"), "output", 'o', _i ("write output to BASENAME[-x].extension")}, - {0, "find-old-relative", 'Q', _i ("show all changes in relative syntax")}, + {_i ("NAME"), "output", 'o', _i ("write output to NAME")}, {0, "safe", 's', _i ("inhibit file output naming and exporting")}, {0, "no-timestamps", 'T', _i ("don't timestamp the output")}, - {0, "test", 't', _i ("switch on experimental features")}, {0, "version", 'v', _i ("print version number")}, {0, "verbose", 'V', _i("verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0,0,0, 0} + {0,0,0,0} }; void @@ -117,7 +146,7 @@ _( cout << '\n'; cout << _ ("Options:"); cout << '\n'; - cout << Long_option_init::table_str (theopts); + cout << Long_option_init::table_str (options_static); cout << '\n'; cout << _ ("This binary was compiled with the following options:") << " " << @@ -153,7 +182,7 @@ version () "lilypond"); cout << endl; - cout << _f ("Copyright (c) %s by", "1996--2000"); + cout << _f ("Copyright (c) %s by", "1996--2001"); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; @@ -165,7 +194,7 @@ notice () cout << '\n'; cout << _ ("GNU LilyPond -- The music typesetter"); cout << '\n'; - cout << _f ("Copyright (c) %s by", "1996--2000"); + cout << _f ("Copyright (c) %s by", "1996--2001"); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; @@ -244,6 +273,45 @@ setup_paths () } } +/** + Make input file name from command argument. + + Path describes file name with added default extension, + ".ly" if none. "-" is stdin. + */ +Path +distill_inname (String str) +{ + Path p = split_path (str); + if (str.empty_b () || str == "-") + p.base = "-"; + else + { + String orig_ext = p.ext; + char const *extensions[] = {"ly", "fly", "sly", "", 0}; + for (int i = 0; extensions[i]; i++) + { + p.ext = orig_ext; + if (*extensions[i] && !p.ext.empty_b ()) + p.ext += "."; + p.ext += extensions[i]; + if (!global_path.find (p.str ()).empty_b ()) + break; + } + /* Reshuffle extension */ + p = split_path (p.str ()); + } + return p; +} + +String +format_to_ext (String format) +{ + if (format == "tex") + /* .lytex change put off */ + return "tex"; // "lytex"; + return format; +} void main_prog (int, char**) @@ -258,60 +326,68 @@ main_prog (int, char**) cout << endl; call_constructors (); - default_outname_base_global = "lelie"; all_fonts_global_p = new All_font_metrics (global_path.str ()); - + int p=0; const char *arg ; - while ((arg= oparser_global_p->get_next_arg ())) + while ((arg = oparser_p_static->get_next_arg ()) || p == 0) { + String infile; - if (outname_str_global == "") - { - Midi_def::reset_default_count (); - Paper_def::reset_default_count (); - } - String f (arg); - String i; - f = distill_inname_str (f, i); - if (f == "-") - default_outname_base_global = "-"; + if (arg) + infile = arg; else - { - String a,b,c,d; - split_path (f, a, b, c, d); - default_outname_base_global = c; - } - if (outname_str_global.length_i ()) - default_outname_base_global = outname_str_global; - if (init_str_global.length_i ()) - i = init_str_global; + infile = "-"; + + // What/when was this supposed to do? + // It looks like it reset the outname_str_global for every new + // file, but only if user didn't specify a outname? Huh? + // if (outname_str_global == "") + { + Midi_def::reset_score_count (); + Paper_def::reset_score_count (); + } + + Path inpath = distill_inname (infile); + + /* By default, use base name of input file for output file name */ + Path outpath = inpath; + if (inpath.str () != "-") + outpath.ext = format_to_ext (output_format_global); + + /* By default, write output to cwd; do not copy directory part + of input file name */ + outpath.root = ""; + outpath.dir = ""; + + if (!output_name_global.empty_b ()) + outpath = split_path (output_name_global); + + String init; + if (!init_name_global.empty_b ()) + init = init_name_global; + else if (!inpath.ext.empty_b ()) + init = "init." + inpath.ext; else - i = "init" + i; - do_one_file (i, f); + init = "init.ly"; + + /* Burp: output name communication goes through _global */ + String save_output_name_global = output_name_global; + output_name_global = outpath.str (); + do_one_file (init, inpath.str ()); + output_name_global = save_output_name_global; + p++; } - if (!p) - { - String i; - if (init_str_global.length_i ()) - i = init_str_global; - else - i = "init.ly"; - default_outname_base_global = "-"; - if (outname_str_global.length_i ()) - default_outname_base_global = outname_str_global; - do_one_file (i, default_outname_base_global); - } - delete oparser_global_p; - exit( exit_status_i_); + delete oparser_p_static; + exit (exit_status_global); } int main (int argc, char **argv) { - debug_init (); // should be first + debug_init (); // should be first (can see that; but Why?) setup_paths (); /* @@ -324,40 +400,42 @@ main (int argc, char **argv) ly_init_kpath (argv[0]); - oparser_global_p = new Getopt_long(argc, argv,theopts); - while (Long_option_init const * opt = (*oparser_global_p)()) + oparser_p_static = new Getopt_long(argc, argv, options_static); + while (Long_option_init const * opt = (*oparser_p_static)()) { switch (opt->shortname_ch_) { case 'v': - version(); + version (); exit (0); // we print a version anyway. break; - case 't': - experimental_features_global_b = true; - progress_indication ("*** enabling experimental features, you're on your own now ***\n"); - break; case 'o': - outname_str_global = oparser_global_p->optional_argument_ch_C_; + { + String s = oparser_p_static->optional_argument_ch_C_; + Path p = split_path (s); + if (p.ext.empty_b ()) + p.ext = format_to_ext (output_format_global); + output_name_global = p.str (); + } break; case 'w': notice (); exit (0); break; case 'f': - output_global_ch = oparser_global_p->optional_argument_ch_C_; + output_format_global = oparser_p_static->optional_argument_ch_C_; break; - case 'Q': - find_old_relative_b= true; + case 'P': + dependency_prefix_global = oparser_p_static->optional_argument_ch_C_; break; case 'H': - global_dumped_header_fieldnames.push (oparser_global_p->optional_argument_ch_C_); + dump_header_fieldnames_global.push (oparser_p_static->optional_argument_ch_C_); break; case 'I': - global_path.push (oparser_global_p->optional_argument_ch_C_); + global_path.push (oparser_p_static->optional_argument_ch_C_); break; case 'i': - init_str_global = oparser_global_p->optional_argument_ch_C_; + init_name_global = oparser_p_static->optional_argument_ch_C_; break; case 'h': usage (); @@ -394,47 +472,4 @@ main (int argc, char **argv) return 0; // unreachable } -/** - make input file name from command arg. - - @input file name - - @output file name with added default extension. "" is stdin. - in reference argument: the extension. ".ly" if none - */ -String -distill_inname_str (String name_str, String& ext_r) -{ - String str = name_str; - if (str.length_i ()) - { - if (str != "-") - { - String a,b,c; - split_path (str,a,b,c,ext_r); - - // add extension if not present. - char const* extensions[] = {"", ".ly", ".fly", ".sly", "", 0}; - extensions[0] = ext_r.ch_C (); - for (int i = 0; extensions[i]; i++) - { - if (!global_path.find (a+b+c+extensions[i]).empty_b ()) - { - ext_r = extensions[i]; - break; - } - } - str = a+b+c+ext_r; - // in any case, assume (init).ly - if (!ext_r.length_i ()) - ext_r = ".ly"; - } - } - else - { - str = "-"; - ext_r = ".ly"; - } - return str; -} diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 70136ac143..e559ff8029 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #include diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc index 6f44501411..98deeaca3f 100644 --- a/lily/melisma-engraver.cc +++ b/lily/melisma-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/midi-def.cc b/lily/midi-def.cc index 685076461b..db149af33b 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include @@ -19,12 +19,6 @@ Midi_def::Midi_def() set_tempo (Moment (1, 4), 60); } -Midi_def::~Midi_def() -{ -} - - - int Midi_def::get_tempo_i (Moment one_beat_mom) { @@ -44,16 +38,16 @@ Midi_def::set_tempo (Moment one_beat_mom, int beats_per_minute_i) } -int Midi_def::default_count_i_=0; +int Midi_def::score_count_i_=0; int -Midi_def::get_next_default_count () const +Midi_def::get_next_score_count () const { - return default_count_i_++; + return score_count_i_++; } void -Midi_def::reset_default_count () +Midi_def::reset_score_count () { - default_count_i_ = 0; + score_count_i_ = 0; } diff --git a/lily/midi-item.cc b/lily/midi-item.cc index bf1bef9b96..c0d980d536 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "debug.hh" diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index f84544976f..976130a3f0 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -1,11 +1,13 @@ -// -// midi-stream.cc -// -// source file of the GNU LilyPond music typesetter -// -// (c) 1997--2000 Jan Nieuwenhuizen +/* + midi-stream.cc -- implement Midi_stream + + source file of the GNU LilyPond music typesetter + + (c) 1997--2001 Jan Nieuwenhuizen +*/ #include +#include "paper-stream.hh" #include "string.hh" #include "string-convert.hh" #include "main.hh" @@ -14,22 +16,15 @@ #include "midi-stream.hh" #include "debug.hh" -Midi_stream::Midi_stream (String filename_str) +Midi_stream::Midi_stream (String filename) { - filename_str_ = filename_str; - os_p_ = 0; - open (); + filename_str_ = filename; + os_p_ = open_file_stream (filename, ios::out|ios::bin); } Midi_stream::~Midi_stream () { - *os_p_ << flush; // ugh. Share with tex_stream. - if (!*os_p_) - { - warning (_ ("Error syncing file (disk full?)")); - exit_status_i_ = 1; - } - delete os_p_; + close_file_stream (os_p_); } Midi_stream& @@ -69,10 +64,3 @@ Midi_stream::operator << (int i) return *this; } -void -Midi_stream::open () -{ - os_p_ = new ofstream (filename_str_.ch_C (),ios::out|ios::bin); - if (!*os_p_) - error (_f ("can't open file: `%s'", filename_str_)); -} diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index be00d45a80..b99b611c69 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/misc.cc b/lily/misc.cc index 9ff95f2a02..1672a08787 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/molecule.cc b/lily/molecule.cc index c3cb95b66a..da4ef0cfcb 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/moment.cc b/lily/moment.cc index cc0f2dd25d..c2e84fa314 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index b651d9f34e..328b9a2d77 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,7 +1,7 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 9cb9063a6b..80849691be 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index b0998be9b8..1841c9d182 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ /* diff --git a/lily/music-list.cc b/lily/music-list.cc index 4761761884..f11985ca72 100644 --- a/lily/music-list.cc +++ b/lily/music-list.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "music-list.hh" diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index fbb2e12ba8..395b7589d3 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "scm-hash.hh" @@ -15,12 +15,13 @@ #include "global-translator.hh" #include "translator-def.hh" #include "main.hh" +#include "file-path.hh" #include "lily-guile.hh" #include "ly-smobs.icc" int -Music_output_def::get_next_default_count () const +Music_output_def::get_next_score_count () const { return 0; } @@ -120,20 +121,6 @@ Music_output_def::get_global_translator_p () return dynamic_cast (tg); } - - -String -Music_output_def::get_default_output () const -{ - if (safe_global_b || !scope_p_->elem_b ("output")) - return ""; - SCM s = scope_p_->scm_elem ("output"); - - return gh_string_p (s) ? ly_scm2string (s) : String (""); -} - - - int Music_output_def::print_smob (SCM s, SCM p, scm_print_state *) { @@ -145,17 +132,15 @@ Music_output_def::print_smob (SCM s, SCM p, scm_print_state *) ugh: should move into Music_output_def (complication: .midi and .tex need separate counts.) */ String -Music_output_def::base_output_str () +Music_output_def::outname_str () { - String str = get_default_output (); - - if (str.empty_b ()) + String out = output_name_global; + int def = get_next_score_count (); + if (def && out != "-") { - str = default_outname_base_global; - int def = get_next_default_count (); - if (def) - str += "-" + to_str (def); + Path p = split_path (out); + p.base += "-" + to_str (def); + out = p.str (); } - - return str; + return out; } diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 5ce5b1a8b9..2ef13f02f7 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "music-list.hh" diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc index 096eee3140..32c1962891 100644 --- a/lily/music-wrapper-iterator.cc +++ b/lily/music-wrapper-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc index c6f7f50b9a..72c161d487 100644 --- a/lily/music-wrapper.cc +++ b/lily/music-wrapper.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/music.cc b/lily/music.cc index bcee6a3d24..e3272b1989 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "input-smob.hh" diff --git a/lily/musical-request.cc b/lily/musical-request.cc index ef2b193979..a1ea36b4ed 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 763c9e90db..ff9cebe793 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index b19386cb30..846d4bd2af 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -78,7 +78,7 @@ My_lily_parser::parser_error (String s) { here_input().error (s); error_level_i_ = 1; - exit_status_i_ = 1; + exit_status_global = 1; } void diff --git a/lily/note-column.cc b/lily/note-column.cc index 81f90310ba..80e7b8c553 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include // ceil diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index 2a6336f89d..f0483ed031 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/note-head.cc b/lily/note-head.cc index bfd06f0807..c536b0f8ce 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 0ae73fb423..5fc28bbddb 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,7 +1,7 @@ /* head-grav.cc -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "rhythmic-head.hh" diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index ed76699feb..462045446c 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 75b56be3da..5729d0aa1c 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Jan Nieuwenhuizen + (c) 1996--2001 Jan Nieuwenhuizen */ #include "performer.hh" diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index 13e089e85b..7676c82e1a 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/output-property-music-iterator.cc b/lily/output-property-music-iterator.cc index 0cf119c3ea..882d9d63e3 100644 --- a/lily/output-property-music-iterator.cc +++ b/lily/output-property-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "input.hh" diff --git a/lily/paper-column.cc b/lily/paper-column.cc index cc09a3d1b1..985b080a07 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "moment.hh" #include "paper-column.hh" diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 12f787a633..8b365ab7eb 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include @@ -87,34 +87,33 @@ Paper_def::line_dimensions_int (int n) const -int Paper_def::default_count_i_ = 0; +int Paper_def::score_count_i_ = 0; int -Paper_def::get_next_default_count () const +Paper_def::get_next_score_count () const { - return default_count_i_ ++; + return score_count_i_ ++; } void -Paper_def::reset_default_count() +Paper_def::reset_score_count() { - default_count_i_ = 0; + score_count_i_ = 0; } Paper_outputter* Paper_def::paper_outputter_p () { - String basename = base_output_str (); - String outname = basename; - if (outname != "-") - outname += String (".") + output_global_ch; + String outname = outname_str (); progress_indication (_f ("paper output to %s...", outname == "-" ? String ("") : outname)); target_str_global_array.push (outname); Paper_outputter * po = new Paper_outputter (outname); - po->basename_ = basename; + Path p = split_path (outname); + p.ext = ""; + po->basename_ = p.str (); return po; } diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 1c55022e84..7fd502cf41 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -41,12 +41,12 @@ Paper_outputter::Paper_outputter (String name) lilypond -f scm x.ly guile -s x.scm */ - verbatim_scheme_b_ = output_global_ch == String ("scm"); + verbatim_scheme_b_ = output_format_global == "scm"; if (verbatim_scheme_b_) { *stream_p_ << "" - ";;; Usage: guile -s x.scm > x.tex\n" + ";;; Usage: guile -s x.scm > x.lytex\n" "(primitive-load-path 'standalone.scm)\n" ";(scm-tex-output)\n" "(scm-ps-output)\n" @@ -74,7 +74,7 @@ Paper_outputter::output_header () gh_define ("security-paranoia", SCM_BOOL_T); } - SCM exp = gh_list (ly_symbol2scm ((String (output_global_ch) + "-scm").ch_C()), + SCM exp = gh_list (ly_symbol2scm ((output_format_global + "-scm").ch_C()), ly_quote_scm (ly_symbol2scm ("all-definitions")), SCM_UNDEFINED); exp = scm_eval2 (exp, SCM_EOL); @@ -250,12 +250,12 @@ Paper_outputter::write_header_field_to_file (String filename, String key, String void Paper_outputter::write_header_fields_to_file (Scope * header) { - if (global_dumped_header_fieldnames.size ()) + if (dump_header_fieldnames_global.size ()) { SCM fields = header->to_alist (); - for (int i = 0; i < global_dumped_header_fieldnames.size (); i++) + for (int i = 0; i < dump_header_fieldnames_global.size (); i++) { - String key = global_dumped_header_fieldnames[i]; + String key = dump_header_fieldnames_global[i]; SCM val = gh_assoc (ly_symbol2scm (key.ch_C ()), fields); String s; /* Only write header field to file if it exists */ diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 82d2287446..49646fb56a 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "main.hh" @@ -115,13 +115,7 @@ Paper_score::process () if (paper_l_->scope_p_) outputter_l_->output_scope (paper_l_->scope_p_, "lilypondpaper"); - SCM scm; - if (experimental_features_global_b) - { - SCM scm = gh_list (ly_symbol2scm ("experimental-on"), SCM_UNDEFINED); - outputter_l_->output_scheme (scm); - } - scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED); + SCM scm = gh_list (ly_symbol2scm ("header-end"), SCM_UNDEFINED); outputter_l_->output_scheme (scm); line_l_->output_lines (); diff --git a/lily/paper-stream.cc b/lily/paper-stream.cc index 86f2ee5de8..8b805d15d4 100644 --- a/lily/paper-stream.cc +++ b/lily/paper-stream.cc @@ -3,25 +3,39 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ +#include +#include #include +#include "config.h" +#if HAVE_SYS_STAT_H +#include +#endif + #include "main.hh" #include "paper-stream.hh" +#include "file-path.hh" #include "debug.hh" const int MAXLINELEN = 200; ostream * -open_file_stream (String filename) +open_file_stream (String filename, int mode) { ostream *os; - if (filename.length_i () && (filename != "-")) - os = new ofstream (filename.ch_C ()); - else + if ((filename == "-")) os = new ostream (cout._strbuf); + else + { + Path p = split_path (filename); + if (!p.dir.empty_b ()) + if (mkdir (p.dir.ch_C (), 0777) == -1 && errno != EEXIST) + error (_f ("can't create directory: `%s'", p.dir)); + os = new ofstream (filename.ch_C (), mode); + } if (!*os) error (_f ("can't open file: `%s'", filename)); return os; @@ -34,9 +48,10 @@ close_file_stream (ostream *os) if (!*os) { warning (_ ("Error syncing file (disk full?)")); - exit_status_i_ = 1; + exit_status_global = 1; } delete os; + os = 0; } Paper_stream::Paper_stream (String filename) diff --git a/lily/parser.yy b/lily/parser.yy index 99d1a5d529..b35335cc71 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc index 526b70ab88..595e3cf822 100644 --- a/lily/part-combine-music-iterator.cc +++ b/lily/part-combine-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "part-combine-music.hh" diff --git a/lily/part-combine-music.cc b/lily/part-combine-music.cc index 7059eca24c..75edf8cbb8 100644 --- a/lily/part-combine-music.cc +++ b/lily/part-combine-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ diff --git a/lily/performance.cc b/lily/performance.cc index 9da4c7dc38..7418c30f86 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include @@ -20,6 +20,7 @@ #include "performance.hh" #include "score.hh" #include "file-results.hh" +#include "file-path.hh" #include "lily-version.hh" #include "killing-cons.tcc" @@ -74,11 +75,13 @@ Performance::output_header_track (Midi_stream& midi_stream) Midi_track midi_track; // perhaps multiple text events? + String id_str; String str = String (_("Creator: ")); if (no_timestamps_global_b) - str += gnu_lilypond_str (); + id_str = gnu_lilypond_str (); else - str += gnu_lilypond_version_str(); + id_str = gnu_lilypond_version_str(); + str += id_str; str += "\n"; /* @@ -89,7 +92,9 @@ Performance::output_header_track (Midi_stream& midi_stream) Midi_text creator (&creator_a); midi_track.add (Moment (0), &creator); - str = _("Automatically generated"); + /* Better not translate this */ + str = "Generated automatically by: "; + str += id_str; if (no_timestamps_global_b) str += ".\n"; else @@ -141,21 +146,21 @@ Performance::add_element (Audio_element *p) void Performance::process() { - String out = midi_l_->get_default_output (); - if (out.empty_b ()) + String out = output_name_global; + if (out == "-") + out = "lelie.midi"; + int def = midi_l_->get_next_score_count (); + if (def) { - - out = default_outname_base_global; - if (out == "-") - out = "lelie"; - int def = midi_l_->get_next_default_count (); - if (def) - { - out += "-" + to_str (def); - } - - out += ".midi"; + Path p = split_path (out); + p.base += "-" + to_str (def); + out = p.str (); } + + /* Maybe a bit crude, but we had this before */ + Path p = split_path (out); + p.ext = "midi"; + out = p.str (); Midi_stream midi_stream (out); progress_indication ( _f ("MIDI output to %s...", out)); diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index d7d7bae33f..5b70ea297f 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/performer.cc b/lily/performer.cc index f3d2a4eada..205fb3e353 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 8cabec4803..2e9a171a66 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,7 +1,7 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index eefb30b154..641a7fb0f7 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc index 86eb472980..4ab2d01f0a 100644 --- a/lily/pitch-squash-engraver.cc +++ b/lily/pitch-squash-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "staff-symbol-referencer.hh" diff --git a/lily/pitch.cc b/lily/pitch.cc index 576054389e..bbe75c3893 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "pitch.hh" diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc index fb1b6bce62..def0d3701b 100644 --- a/lily/pointer-group-interface.cc +++ b/lily/pointer-group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "group-interface.hh" diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index 4ece8f3919..d56ee274c8 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/property-inspect.cc b/lily/property-inspect.cc index 2ea7282385..30a6dc3372 100644 --- a/lily/property-inspect.cc +++ b/lily/property-inspect.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index bb7a40395f..9d61539a12 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "property-iterator.hh" diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 2878e9c9a8..3628ef7078 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "protected-scm.hh" diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index ae6773a6b2..770fa11d61 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index 2443dfd81a..bba68ba1ae 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include "engraver.hh" diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 5785e114cf..665b00e1c6 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc index 61efb38797..118279299b 100644 --- a/lily/request-chord-iterator.cc +++ b/lily/request-chord-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator-group.hh" diff --git a/lily/request.cc b/lily/request.cc index e9f6427cd1..7ad67285b1 100644 --- a/lily/request.cc +++ b/lily/request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include "request.hh" diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index 9b257a8067..0ebc5dde5e 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index a8f2b3ea90..013953e51a 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include // ceil. diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 599df04ace..7fbaa78e0d 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "item.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/rest.cc b/lily/rest.cc index 149c45ba76..f05f5c0f55 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "molecule.hh" diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index eb378b7410..a7b89c7c7f 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc index d3ac1a4867..4589fbec6c 100644 --- a/lily/rhythmic-head.cc +++ b/lily/rhythmic-head.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "rhythmic-head.hh" diff --git a/lily/rod.cc b/lily/rod.cc index 4071293a8d..52d71b3812 100644 --- a/lily/rod.cc +++ b/lily/rod.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include "rod.hh" diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc index cef407719a..6b9be2b972 100644 --- a/lily/scaled-font-metric.cc +++ b/lily/scaled-font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 56d48b775b..cd8841a5ea 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include diff --git a/lily/scope.cc b/lily/scope.cc index 7ada75b65d..8fec4384b1 100644 --- a/lily/scope.cc +++ b/lily/scope.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 71501fed7b..40ed1a3a5a 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 9c9d01e20e..ff25e4cef4 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Jan Nieuwenhuizen + (c) 1996--2001 Jan Nieuwenhuizen */ #include "score-performer.hh" diff --git a/lily/score.cc b/lily/score.cc index 417c3b3a44..f80ef7b2ea 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "ly-smobs.icc" diff --git a/lily/scores.cc b/lily/scores.cc index 84e9891994..c6d9d15994 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -3,8 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ +#include "config.h" + +#include +#include +#if HAVE_SYS_STAT_H +#include +#endif +#include + #include #include "main.hh" #include "score.hh" @@ -32,17 +41,20 @@ void write_dependency_file (String fn, Array targets, { const int WRAPWIDTH = 65; - progress_indication (_f ("Writing dependency file: `%s'...", fn.ch_C ())); + progress_indication (_f ("dependencies output to %s...", fn.ch_C ())); progress_indication ("\n"); ofstream f (fn.ch_C ()); if (!f) warning (_f ("can't open file: `%s'", fn)); - f << "# Automatically generated by " << gnu_lilypond_version_str () << '\n'; + f << "# Generated automatically by: " << gnu_lilypond_version_str () << '\n'; String out; for (int i=0; i < targets.size (); i ++) - out += targets[i] + " "; + out += dependency_prefix_global + targets[i] + " "; out += ": "; +#if 0 + struct stat stat_buf; +#endif for (int i=0; i < deps.size (); i ++) { if (out.length_i() > WRAPWIDTH) @@ -50,7 +62,18 @@ void write_dependency_file (String fn, Array targets, f << out << "\\\n"; out = " "; } - out += " " + deps[i]; + String dep = deps[i]; + if (!dependency_prefix_global.empty_b ()) + { +#if 0//thinko? + if (stat (dep.ch_C (), &stat_buf) == -1 && errno == ENOENT) + ; //make emacs happy +#else + if (dep.index_i ('/') < 0) +#endif + dep = dependency_prefix_global + dep; + } + out += " " + dep; } f << out << endl; } @@ -60,7 +83,10 @@ do_deps() { if (dependency_global_b) { - write_dependency_file (default_outname_base_global + ".dep", target_str_global_array, + Path p = split_path (output_name_global); + p.ext = "dep"; + write_dependency_file (p.str (), + target_str_global_array, inclusion_global_array); } } @@ -78,7 +104,7 @@ do_scores() if (is_p->errorlevel_i_) { is_p->warning (_("Score contains errors; will not process it")); - exit_status_i_ |= 1; + exit_status_global |= 1; } else { @@ -129,7 +155,7 @@ do_one_file (String init_str, String file_str) if (parser.error_level_i_) { - exit_status_i_ = 1; + exit_status_global = 1; } else do_scores (); diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 93e25140b8..185ae49cdf 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/script-column.cc b/lily/script-column.cc index da37ed12ff..2c7e6b24de 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include "script-column.hh" diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 5f1467ab0b..c8d677d26e 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,7 +1,7 @@ /* script-engraver.cc -- implement Script_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/script.cc b/lily/script.cc index c680f73d93..6ed6ee306c 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 0610762f2d..643d67b912 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 7b26a9b9a8..0e726c1d4f 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 42043f5c14..8a777a0df9 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc index ff0940e3d5..1538cb72ad 100644 --- a/lily/sequential-music-iterator.cc +++ b/lily/sequential-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "grace-iterator.hh" #include "translator-group.hh" diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 1fa32c04ba..f19e5471cc 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ #include // ceil. diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc index ed118ec11f..712e4745ea 100644 --- a/lily/simple-music-iterator.cc +++ b/lily/simple-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 5053db6a43..40ed6a0c86 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys TODO: - add support for different stretch/shrink constants? diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 791dbd6185..12e0b16c68 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator-group.hh" diff --git a/lily/slur-bezier-bow.cc b/lily/slur-bezier-bow.cc index 4d5c9bdae6..de36d7e5eb 100644 --- a/lily/slur-bezier-bow.cc +++ b/lily/slur-bezier-bow.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "debug.hh" diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 0692526657..e3f31f1786 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,7 +1,7 @@ /* slur-engraver.cc -- implement Slur_engraver - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/slur.cc b/lily/slur.cc index 52b96b6e9c..9c3fa7866a 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/spaceable-element.cc b/lily/spaceable-element.cc index fdfeb3ee1d..9a57db0f14 100644 --- a/lily/spaceable-element.cc +++ b/lily/spaceable-element.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 0950112705..e5e3f5c1f0 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 41f2a7bbd5..c4c6b100f0 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index c1f92a775d..5608a0cb60 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 7674d05dc1..cb026be67f 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 0d0dc9c6a4..50345c1341 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "span-bar.hh" diff --git a/lily/spanner.cc b/lily/spanner.cc index d6a3565729..6f45027f37 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ #include #include diff --git a/lily/spring.cc b/lily/spring.cc index c4f03890cd..476007d122 100644 --- a/lily/spring.cc +++ b/lily/spring.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 356bd2557b..1b28a06336 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "translator-group.hh" diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index 0f29bdc2e3..a9337fe80e 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index da1ae75483..d569d52abc 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ #include diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index 7db3226f6c..4980a34636 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "lookup.hh" diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index 7110c459be..2676c7f44e 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys , Glen Prideaux + (c) 2000--2001 Han-Wen Nienhuys , Glen Prideaux Similar to (and derived from) Instrument_name_engraver. */ diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index f49da3e650..374a3b1f1a 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "staff-symbol-referencer.hh" diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 5ff2b8f2a5..e053bda195 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/stem.cc b/lily/stem.cc index c87490d952..7633af05f4 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc index c807868387..851fddb88a 100644 --- a/lily/sustain-pedal.cc +++ b/lily/sustain-pedal.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include "grob.hh" diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc index 0a86e7163a..26719c8477 100644 --- a/lily/swallow-engraver.cc +++ b/lily/swallow-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "swallow-engraver.hh" diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc index 7cafeaf9ce..30cdba8bd5 100644 --- a/lily/swallow-perf.cc +++ b/lily/swallow-perf.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "swallow-perf.hh" diff --git a/lily/symbol-cache.cc b/lily/symbol-cache.cc index dc0d329d24..2cd999d356 100644 --- a/lily/symbol-cache.cc +++ b/lily/symbol-cache.cc @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 169537a5df..8f172865a3 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index cf792f086b..6f3223ad18 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ #include diff --git a/lily/template5.cc b/lily/template5.cc index 8a4e1c8b40..105aa44668 100644 --- a/lily/template5.cc +++ b/lily/template5.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index 2c0f70e5ac..413b45ce23 100644 --- a/lily/tempo-performer.cc +++ b/lily/tempo-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "command-request.hh" diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index b58467b016..cb668b4146 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/text-item.cc b/lily/text-item.cc index 29538a1f8b..25a0a0d3fb 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include @@ -20,39 +20,17 @@ /* - TEXT : STRING | (MARKUP SENTENCE) - MARKUP: PROPERTY | ABBREV - SENTENCE: TEXT | SENTENCE TEXT - PROPERTY: (key . value) - ABBREV: rows lines roman music bold italic named super sub text, or any font-style - */ - -/* - FIXME: - - rewrite routines and syntax to be like TEXT: STRING - | (head-expression* TEXT*) - ; - - head-expression is a list, containing a tag and a variable number of - arguments. If necessary, the number of arguments can be stored in a alist, + | (MARKUP? TEXT+) + ; - '( - (tag1 . argcount1) - (tag2 . argcount2) + HEAD: MARKUP-ITEM | (MARKUP-ITEM+) - ... etc + MARKUP-ITEM: PROPERTY | ABBREV | FONT-STYLE + PROPERTY: (key . value) + ABBREV: rows lines roman music bold italic named super sub text - ) - - or even entries like - - (tag . (argcount function-to-handle-the-tag )) - - use baselineskip for setting (lines ...) - */ Molecule @@ -65,7 +43,7 @@ Text_item::text2molecule (Grob *me, SCM text, SCM alist_chain) if (!gh_pair_p (gh_car (text)) && gh_string_p (gh_car (text))) return string2molecule (me, gh_car (text), alist_chain); else - return markup_sentence2molecule (me, text, alist_chain); + return markup_text2molecule (me, text, alist_chain); } return Molecule (); } @@ -134,61 +112,71 @@ Text_item::lookup_text (Grob *me, Font_metric*fm, SCM text) } Molecule -Text_item::markup_sentence2molecule (Grob *me, SCM markup_sentence, - SCM alist_chain) +Text_item::markup_text2molecule (Grob *me, SCM markup_text, + SCM alist_chain) { SCM sheet = me->paper_l ()->style_sheet_; SCM f = gh_cdr (scm_assoc (ly_symbol2scm ("markup-to-properties"), sheet)); - SCM markup = gh_car (markup_sentence); - SCM sentence = gh_cdr (markup_sentence); - + SCM markup = gh_car (markup_text); + SCM text = gh_cdr (markup_text); + +#if 1 SCM p = gh_cons (gh_call2 (f, sheet, markup), alist_chain); +#else + SCM pp = gh_call2 (f, sheet, markup); + gh_newline (); + scm_write (pp, scm_current_error_port ()); + gh_newline (); + SCM p = gh_cons (pp, alist_chain); +#endif + + Real staff_space = Staff_symbol_referencer::staff_space (me); Axis align = X_AXIS; SCM a = ly_assoc_chain (ly_symbol2scm ("align"), p); if (gh_pair_p (a) && gh_number_p (gh_cdr (a))) align = (Axis)gh_scm2int (gh_cdr (a)); - Real staff_space = Staff_symbol_referencer::staff_space (me); - Real kern = 0; + Real baseline_skip = 0; + SCM b = ly_assoc_chain (ly_symbol2scm ("baseline-skip"), p); + if (gh_pair_p (b) && gh_number_p (gh_cdr (b))) + baseline_skip = gh_scm2double (gh_cdr (b)) * staff_space; + + Array kern (2); + kern[0] = 0; // zucht + kern[1] = 0; SCM k = ly_assoc_chain (ly_symbol2scm ("kern"), p); if (gh_pair_p (k) && gh_number_p (gh_cdr (k))) - kern = gh_scm2double (gh_cdr (k)) * staff_space; + kern[align] = gh_scm2double (gh_cdr (k)) * staff_space; Real raise = 0; SCM r = ly_assoc_chain (ly_symbol2scm ("raise"), p); if (gh_pair_p (r) && gh_number_p (gh_cdr (r))) raise = gh_scm2double (gh_cdr (r)) * staff_space; -#if 0 - Offset o (align == X_AXIS ? kern : 0, - (align == Y_AXIS ? - kern : 0) + raise); -#else - Offset o (0, (align == Y_AXIS ? - kern : 0) + raise); -#endif - + Offset o (0, (align == Y_AXIS ? - kern[align] : 0) + raise); + Molecule mol; - while (gh_pair_p (sentence)) + while (gh_pair_p (text)) { - /* Ugh: this (kerning) only works if 'kern' is the first modifier of a - markup. I guess the only solution is to rewrite markup definition, - see above. */ - Molecule m = text2molecule (me, gh_car (sentence), p); - Real m_kern = 0; + Molecule m = text2molecule (me, gh_car (text), p); SCM m_p = SCM_EOL; - if (gh_pair_p (gh_car (sentence))) - m_p = gh_cons (gh_call2 (f, sheet, gh_caar (sentence)), alist_chain); + if (gh_pair_p (gh_car (text))) + m_p = gh_cons (gh_call2 (f, sheet, gh_caar (text)), alist_chain); SCM m_k = ly_assoc_chain (ly_symbol2scm ("kern"), m_p); + Real m_kern = kern[align]; if (gh_pair_p (m_k) && gh_number_p (gh_cdr (m_k))) m_kern = gh_scm2double (gh_cdr (m_k)) * staff_space; if (!m.empty_b ()) { m.translate (o); + if (align == Y_AXIS && baseline_skip) + m_kern += baseline_skip - m.extent (Y_AXIS)[UP]; mol.add_at_edge (align, align == X_AXIS ? RIGHT : DOWN, m, m_kern); } - sentence = gh_cdr (sentence); + text = gh_cdr (text); } return mol; } diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 4f339eb92c..07e9b00fbd 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "dimensions.hh" diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index ba1e420fc1..b4668ce372 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc index 70472b8020..37d3ecf7c3 100644 --- a/lily/tfm-reader.cc +++ b/lily/tfm-reader.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c diff --git a/lily/tfm.cc b/lily/tfm.cc index 4e7d22f4fa..0999e49146 100644 --- a/lily/tfm.cc +++ b/lily/tfm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc index 83c1f2a36f..3ab759ed81 100644 --- a/lily/thread-devnull-engraver.cc +++ b/lily/thread-devnull-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/tie-column.cc b/lily/tie-column.cc index dcb5e5be8b..bbd6b8d102 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 57f9baad36..75139c817d 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 5261055c87..211cfbb925 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Jan Nieuwenhuizen + (c) 1999--2001 Jan Nieuwenhuizen */ diff --git a/lily/tie.cc b/lily/tie.cc index 3b18810532..6a762fc3e0 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc index cea13bf68b..b9fbb76010 100644 --- a/lily/time-scaled-music-iterator.cc +++ b/lily/time-scaled-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/time-scaled-music.cc b/lily/time-scaled-music.cc index ed3961b27e..6ff67f2963 100644 --- a/lily/time-scaled-music.cc +++ b/lily/time-scaled-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 9a4e2b4ee4..caabdb6e25 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "time-signature.hh" diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index 0f65b322b4..d1f3599d78 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ #include "audio-item.hh" diff --git a/lily/time-signature.cc b/lily/time-signature.cc index aa65da6e20..cf1efd7e94 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2000 Han-Wen Nienhuys + (c) 1996--2001 Han-Wen Nienhuys */ diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc index 468dc0eb3b..da097bc7d5 100644 --- a/lily/timing-engraver.cc +++ b/lily/timing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator-group.hh" #include "command-request.hh" diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 16fe82b6e6..11b5d69c6f 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc index 4418310186..4e57c28fa5 100644 --- a/lily/translator-ctors.cc +++ b/lily/translator-ctors.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator.hh" diff --git a/lily/translator-def.cc b/lily/translator-def.cc index 668d5a70ea..a54b1715d1 100644 --- a/lily/translator-def.cc +++ b/lily/translator-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 1ae75fc8b9..4a60731dd4 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "music-output-def.hh" @@ -414,7 +414,7 @@ type_check_assignment (SCM val, SCM sym, SCM type_symbol) SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); SCM type_name = gh_call1 (typefunc, type_p); - scm_puts (_f ("Failed typecheck for `%s', value `%s' must be of type `%s'", + scm_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'", ly_symbol2string (sym).ch_C (), ly_scm2string (ly_write2scm( val)).ch_C (), ly_scm2string (type_name).ch_C ()).ch_C (), diff --git a/lily/translator.cc b/lily/translator.cc index 0345c2c370..41111b075e 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/lily/transposed-music.cc b/lily/transposed-music.cc index a059b2b5bd..c8aa3780e9 100644 --- a/lily/transposed-music.cc +++ b/lily/transposed-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc new file mode 100644 index 0000000000..a835f21c5b --- /dev/null +++ b/lily/tuplet-bracket.cc @@ -0,0 +1,277 @@ +/* + plet-spanner.cc -- implement Tuplet_bracket + + source file of the GNU LilyPond music typesetter + + (c) 1997--2001 Jan Nieuwenhuizen +*/ + + +#include "beam.hh" +#include "box.hh" +#include "debug.hh" +#include "font-interface.hh" +#include "molecule.hh" +#include "paper-column.hh" +#include "paper-def.hh" +#include "text-item.hh" +#include "tuplet-spanner.hh" +#include "stem.hh" +#include "note-column.hh" +#include "dimensions.hh" +#include "group-interface.hh" +#include "directional-element-interface.hh" +#include "spanner.hh" + +void +Tuplet_bracket::set_interface (Grob*me) +{ + me->set_interface (ly_symbol2scm ("tuplet-bracket")); +} + +/* + TODO: use stem->beam fields to find Beams. Autobeams aren't found + through the engraver mechanism. */ +MAKE_SCHEME_CALLBACK(Tuplet_bracket,brew_molecule,1); +SCM +Tuplet_bracket::brew_molecule (SCM smob) +{ + Grob *me= unsmob_grob (smob); + Molecule mol; + + // Default behaviour: number always, bracket when no beam! + bool par_beam = to_boolean (me->get_grob_property ("parallel-beam")); + bool bracket_visibility = !par_beam; + bool number_visibility = true; + + SCM bracket = me->get_grob_property ("tuplet-bracket-visibility"); + if (gh_boolean_p (bracket)) + { + bracket_visibility = gh_scm2bool (bracket); + } + else if (bracket == ly_symbol2scm ("if-no-beam")) + bracket_visibility = !par_beam; + + SCM numb = me->get_grob_property ("tuplet-number-visibility"); + if (gh_boolean_p (numb)) + { + number_visibility = gh_scm2bool (numb); + } + else if (bracket == ly_symbol2scm ("if-no-beam")) + number_visibility = !par_beam; + + if (gh_pair_p (me->get_grob_property ("columns"))) + { + Link_array column_arr= + Pointer_group_interface__extract_elements (me, (Grob*)0, "columns"); + + Real ncw = column_arr.top ()->extent(column_arr.top (), X_AXIS).length (); + Real w = dynamic_cast(me)->spanner_length () + ncw; + + Real staff_space = 1.0; + Direction dir = Directional_element_interface::get (me); + Real dy = gh_scm2double (me->get_grob_property ("delta-y")); + SCM number = me->get_grob_property ("text"); + if (gh_string_p (number) && number_visibility) + { + SCM properties = Font_interface::font_alist_chain (me); + Molecule num = Text_item::text2molecule (me, number, properties); + num.align_to (X_AXIS, CENTER); + num.translate_axis (w/2, X_AXIS); + num.align_to (Y_AXIS, CENTER); + num.translate_axis (dir * staff_space, Y_AXIS); + + num.translate_axis (dy/2, Y_AXIS); + + mol.add_molecule (num); + } + + if (bracket_visibility) + { + Real lt = me->paper_l ()->get_var ("stafflinethickness"); + + SCM thick = me->get_grob_property ("thick"); + SCM gap = me->get_grob_property ("number-gap"); + + SCM at =gh_list(ly_symbol2scm ("tuplet"), + gh_double2scm (1.0), + gap, + gh_double2scm (w), + gh_double2scm (dy), + gh_double2scm (gh_scm2double (thick)* lt), + gh_int2scm (dir), + SCM_UNDEFINED); + + Box b; + mol.add_molecule (Molecule (b, at)); + } + } + return mol.smobbed_copy (); +} + + + + +/* + use first -> last note for slope, and then correct for disturbing + notes in between. */ +void +Tuplet_bracket::calc_position_and_height (Grob*me,Real *offset, Real * dy) +{ + Link_array column_arr= + Pointer_group_interface__extract_elements (me, (Grob*)0, "columns"); + + + Grob * commony = me->common_refpoint (me->get_grob_property ("columns"), Y_AXIS); + Grob * commonx = me->common_refpoint (me->get_grob_property ("columns"), X_AXIS); + + Direction d = Directional_element_interface::get (me); + + /* + Use outer non-rest columns to determine slope + */ + int l = 0; + while (l = l && Note_column::rest_b(column_arr[r])) + r--; + + if (l < r) + { + *dy = column_arr[r]->extent (commony, Y_AXIS) [d] + - column_arr[l]->extent (commony, Y_AXIS) [d] ; + } + else + * dy = 0; + + + *offset = - d * infinity_f; + + if (!column_arr.size ()) + return; + + Real x0 = column_arr[0]->relative_coordinate (commonx, X_AXIS); + Real x1 = column_arr.top ()->relative_coordinate (commonx, X_AXIS); + + Real factor = column_arr.size () > 1 ? 1/(x1 - x0) : 1.0; + + for (int i = 0; i < column_arr.size (); i++) + { + Real notey = column_arr[i]->extent (commony, Y_AXIS)[d] + - me->relative_coordinate (commony, Y_AXIS); + + Real x = column_arr[i]->relative_coordinate (commonx, X_AXIS) - x0; + Real tuplety = *dy * x * factor; + + if (notey * d > (*offset + tuplety) * d) + *offset = notey - tuplety; + } +} + +/* + use first -> last note for slope, +*/ +void +Tuplet_bracket::calc_dy (Grob*me,Real * dy) +{ + Link_array column_arr= + Pointer_group_interface__extract_elements (me, (Grob*)0, "columns"); + + /* + ugh. refps. + */ + Direction d = Directional_element_interface::get (me); + *dy = column_arr.top ()->extent (column_arr.top (), Y_AXIS) [d] + - column_arr[0]->extent (column_arr[0], Y_AXIS) [d]; +} +MAKE_SCHEME_CALLBACK(Tuplet_bracket,after_line_breaking,1); + +SCM +Tuplet_bracket::after_line_breaking (SCM smob) +{ + Grob * me = unsmob_grob (smob); + Link_array column_arr= + Pointer_group_interface__extract_elements (me, (Note_column*)0, "columns"); + Spanner *sp = dynamic_cast (me); + + + if (!column_arr.size ()) + { + me->suicide (); + return SCM_UNSPECIFIED; + } + + Direction d = Directional_element_interface::get (me); + if (!d) + { + d = Tuplet_bracket::get_default_dir (me); + Directional_element_interface::set (me, d); + + } + Real dy, offset; + + calc_position_and_height (me,&offset,&dy); + + me->set_grob_property ("delta-y", gh_double2scm (dy)); + + me->translate_axis (offset, Y_AXIS); + + if (scm_ilength (me->get_grob_property ("beams")) == 1) + { + SCM bs = me->get_grob_property ("beams"); + Grob *b = unsmob_grob (gh_car (bs)); + Spanner * beam_l = dynamic_cast (b); + if (!sp->broken_b () + && sp->get_bound (LEFT)->column_l () == beam_l->get_bound (LEFT)->column_l () + && sp->get_bound (RIGHT)->column_l () == beam_l->get_bound (RIGHT)->column_l ()) + me->set_grob_property ("parallel-beam", SCM_BOOL_T); + } + return SCM_UNSPECIFIED; +} + + +Direction +Tuplet_bracket::get_default_dir (Grob*me) +{ + Direction d = UP; + SCM dir_sym =me->get_grob_property ("dir-forced"); + if (isdir_b (dir_sym)) + { + d= to_dir (dir_sym); + if (d != CENTER) + return d; + } + + d = UP ; + for (SCM s = me->get_grob_property ("columns"); gh_pair_p (s); s = gh_cdr (s)) + { + Grob * nc = unsmob_grob (gh_car (s)); + if (Note_column::dir (nc) < 0) + { + d = DOWN; + break; + } + } + + return d; +} + +void +Tuplet_bracket::add_beam (Grob*me, Grob *b) +{ + me->add_dependency (b); + Pointer_group_interface::add_element (me, "beams",b); +} + +void +Tuplet_bracket::add_column (Grob*me, Item*n) +{ + Pointer_group_interface::add_element (me, "columns",n); + me->add_dependency (n); + + add_bound_item (dynamic_cast (me), n); +} + + diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index d6bcec2460..8781845df6 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ @@ -75,15 +75,19 @@ Tuplet_engraver::create_grobs () continue; Spanner* glep = new Spanner (get_property ("TupletBracket")); - Tuplet_spanner::set_interface (glep); + Tuplet_bracket::set_interface (glep); if (i >= started_span_p_arr_.size ()) started_span_p_arr_.push (glep); else started_span_p_arr_[i] = glep; - int d = gh_scm2int (time_scaled_music_arr_[i]->get_mus_property ("denominator")); - glep->set_grob_property ("text", ly_str02scm (to_str (d).ch_C())); + SCM proc = get_property ("tupletNumberFormatFunction"); + if (gh_procedure_p( proc)) + { + SCM t = gh_apply (proc, gh_list (time_scaled_music_arr_[i]->self_scm (), SCM_UNDEFINED)); + glep->set_grob_property ("text", t); + } announce_grob (glep, time_scaled_music_arr_ [i]); } @@ -102,13 +106,13 @@ Tuplet_engraver::acknowledge_grob (Grob_info i) { for (int j =0; j (i.elem_l_)); + Tuplet_bracket::add_column (started_span_p_arr_[j], dynamic_cast(i.elem_l_)); } else if (Beam::has_interface (i.elem_l_)) { for (int j = 0; j < started_span_p_arr_.size (); j++) if (started_span_p_arr_[j]) - Tuplet_spanner::add_beam (started_span_p_arr_[j],i.elem_l_); + Tuplet_bracket::add_beam (started_span_p_arr_[j],i.elem_l_); } } diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc index 1f5a9ca00a..f73ef586be 100644 --- a/lily/type-swallow-translator.cc +++ b/lily/type-swallow-translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "type-swallow-translator.hh" diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index 8ad34fe331..1c2136c625 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2001 Han-Wen Nienhuys */ diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 59449e1f0e..cee4a10387 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "translator-group.hh" #include "paper-column.hh" diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc index b3414f531d..6ad506a925 100644 --- a/lily/voice-devnull-engraver.cc +++ b/lily/voice-devnull-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2001 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index e4dae39b63..f21f8aebba 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 Han-Wen Nienhuys */ diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc index eeb1f83aa4..df0d1e6349 100644 --- a/lily/volta-spanner.cc +++ b/lily/volta-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/lily/warn.cc b/lily/warn.cc index b371ddabe8..1788539e40 100644 --- a/lily/warn.cc +++ b/lily/warn.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/ly/engraver.ly b/ly/engraver.ly index ccfb55813e..aad446c46e 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -291,7 +291,9 @@ ChordNamesVoiceContext = \translator { \consistsend "Axis_group_engraver"; \consists "Separating_line_group_engraver"; \consists "Chord_name_engraver"; + \consists "Skip_req_swallow_translator"; } + ChordNamesContext = \translator { \type "Engraver_group_engraver"; \name ChordNames; @@ -414,6 +416,8 @@ ScoreContext = \translator { pedalUnaChordaStrings = #'("una chorda" "" "tre chorde") pedalSostenutoStrings = #'() % FIXME + tupletNumberFormatFunction = #denominator-tuplet-formatter + keyAccidentalOrder = #'( (6 . -1) (2 . -1) (5 . -1 ) (1 . -1) (4 . -1) (0 . -1) (3 . -1) (3 . 1) (0 . 1) (4 . 1) (1 . 1) (5 . 1) (2 . 1) (6 . 1) diff --git a/ly/property.ly b/ly/property.ly index d73cf04da2..4ae2d3b4e2 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -20,32 +20,43 @@ tieDown = \property Voice.Tie \override #'direction = #-1 tieBoth = \property Voice.Tie \revert #'direction cadenzaOn = \property Score.timing = ##f -cadenzaOff = { \property Score.timing = ##t - \property Score.measurePosition = #(make-moment 0 1) - } +cadenzaOff = { + \property Score.timing = ##t + \property Score.measurePosition = #(make-moment 0 1) +} oneVoice = { - \stemBoth - \tieBoth - \shiftOff + \stemBoth + \slurBoth + \tieBoth + \shiftOff +} + +voiceOne = { + \stemUp + \slurUp + \tieUp } -voiceOne = { \stemUp - \tieUp +voiceTwo = { + \stemDown + \slurDown + \tieDown } -voiceTwo = { \stemDown - \tieDown - } voiceThree = { - \stemUp - \shiftOn + \stemUp + \slurUp + \tieUp + \shiftOn } voiceFour = { - \stemDown - \shiftOn + \stemDown + \slurDown + \tieDown + \shiftOn } slurDotted = \property Voice.Slur \override #'dashed = #1 diff --git a/make/GNUmakefile b/make/GNUmakefile index b4e188d328..e62590a7c8 100644 --- a/make/GNUmakefile +++ b/make/GNUmakefile @@ -1,8 +1,11 @@ # file make/Makefile depth = .. -STEPMAKE_TEMPLATES=makedir -BLURBS=BLURB # COPERTINA FLAPTEKST +STEPMAKE_TEMPLATES=makedir install +##BLURBS=BLURB # COPERTINA FLAPTEKST + +INSTALLATION_DIR=$(datadir)/make +INSTALLATION_FILES=$(DIST_FILES) include $(depth)/make/stepmake.make diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 83a0972f8b..b68d7f6132 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -1,20 +1,38 @@ export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) -# Huh, PATHSEP, but still '/' for dirsep? -# Doesn't make sense. -ifeq (0,1) +export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS):: +export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd):: +export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE) + +export LILYPONDPREFIX:=$(depth)/ + + +the-script-dir=$(wildcard $(script-dir)) -export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP) -export TEXINPUTS:=$(topdir)/mf/out/$(PATHSEP)$(topdir)/tex/$(PATHSEP)$(topdir)/ps/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(pwd)$(PATHSEP)$(PATHSEP) -export LILYINCLUDE:=$(topdir)/ps$(PATHSEP)$(topdir)/scm$(PATHSEP)$(topdir)/ly$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(PATHSEP)$(TEX_TFMDIR)$(PATHSEP)$(LILYINCLUDE) +ifneq ($(the-script-dir),) + +$(message running from source tree stepmake) + +ABC2LY = $(script-dir)/abc2ly.py +CONVERT_LY = $(script-dir)/convert-ly.py +LY2DVI = $(script-dir)/ly2dvi.py +LILYPOND_BOOK = $(script-dir)/lilypond-book.py +LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ +PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh +PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh else -export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS):: -export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd):: -export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE) +$(message running from installed stepmake) + +ABC2LY = $(shell $(SHELL) -c 'type -p abc2ly') +LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi') +CONVERT_LY = $(shell $(SHELL) -c 'type -p convert-ly') +LILYPOND_BOOK = $(shell $(SHELL) -c 'type -p lilypond-book') +LILYPOND_BOOK_INCLUDES = -I. -I.. -I$(outdir) +PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs') +PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs') endif -export LILYPONDPREFIX:=$(depth)/ diff --git a/make/ly-rules.make b/make/ly-rules.make index 49a0f6dd12..92839d41a0 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -5,21 +5,24 @@ $(outdir)/%.latex: %.doc rm -f $@ - LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I $(pwd) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $< +# LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) $< + $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) $< chmod -w $@ # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --srcdir builds $(outdir)/%.texi: %.tely rm -f $@ - LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I $(pwd) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ --dependencies --format=texi $< +# LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi $< + $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi $< chmod -w $@ # nexi: no-lily texi # for plain info doco: don't run lily $(outdir)/%.nexi: %.tely rm -f $@ - LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) --no-lily -I $(pwd) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $< +# LILYPONDPREFIX=$(LILYPONDPREFIX)/.. $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --no-lily $< + $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --no-lily $< mv $(@D)/$(*F).texi $@ chmod -w $@ diff --git a/make/ly.make b/make/ly.make new file mode 100644 index 0000000000..b7d4b7e581 --- /dev/null +++ b/make/ly.make @@ -0,0 +1,67 @@ +#!/usr/bin/make +# +# Mutopia Makefile Project +# +# Rename this file to GNUmakefile, and issue `make help' +# + + +# +# Magic: find and include LilyPond's StepMake rules +# +# 0: follow LILYPONDPREFIX +# 1: try source tree +# 2: try installed tree in $HOME +# 3: try system installed tree +# +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=/make +ifneq ($(make-root),) +$(message running from $(make-root)) +depth=$(make-root)/.. +LOCALSTEPMAKE_TEMPLATES=ly mutopia +include $(make-root)/stepmake.make +else +$(error can't find LilyPond's stepmake installation) +endif +# + + +# +# Mutopia/user targets. +# This needs some work. +# + +# +# Name of mutopia project +# +name=book +tarball=$(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 $< + +# +# 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 diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make index 2c82d19e3a..382871d39f 100644 --- a/make/mutopia-rules.make +++ b/make/mutopia-rules.make @@ -1,12 +1,12 @@ $(outdir)/%.gif: $(outdir)/%.ps - sh $(buildscript-dir)/ps-to-gifs.sh $< + sh $(PS_TO_GIFS) $< -mv $(name-stem)-page*.gif $(outdir)/ touch $@ $(outdir)/%.png: $(outdir)/%.ps - sh $(buildscript-dir)/ps-to-pngs.sh $< + sh $(PS_TO_PNGS) $< -mv $(name-stem)-page*.png $(outdir)/ touch $@ @@ -18,24 +18,24 @@ $(outdir)/%.ly.txt: %.abc ln -f $< $@ $(outdir)/%.ly: %.abc - $(PYTHON) $(script-dir)/abc2ly.py -o $@ $< + $(PYTHON) $(ABC2LY) -o $@ $< $(outdir)/%.dvi: $(outdir)/%.ly - $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir) $< + $(PYTHON) $(LY2DVI) --outdir=$(outdir) --dependencies $< -mv $(basename $( 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 "\ + update $(outdir)/.ps\n\ + -book update booklet $(outdir)/-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\ + ps update PostScript of all examples\n\ + scores update PostScript of all scores\n\ +"\ +# diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make index 154917110b..b09753c60d 100644 --- a/make/mutopia-vars.make +++ b/make/mutopia-vars.make @@ -3,6 +3,8 @@ include $(make-dir)/lilypond-vars.make LY_FILES = $(wildcard *.ly) +SCORE_LY_FILES = $(shell fgrep -l score *.ly) + FLY_FILES = $(wildcard *.fly) SLY_FILES = $(wildcard *.sly) @@ -29,3 +31,5 @@ name-stem= $(notdir $(basename $<)) OUT_FILES = $(addprefix $(outdir)/,$(M4_FILES:%.m4=%)) \ $(addprefix $(outdir)/,$(LYM4_FILES:%.lym4=%.ly)) + +score_ps = $(addprefix $(outdir)/, $(addsuffix .ps.gz, $($SCORE_LY_FILES))) \ No newline at end of file diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf index fdf9b0eb3f..38f62a7758 100644 --- a/mf/feta-autometric.mf +++ b/mf/feta-autometric.mf @@ -4,7 +4,7 @@ % source file of the Feta (not an acronym for Font-En-Tja) % pretty-but-neat music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % Jan Nieuwenhuizen % % these macros help create ascii logging output diff --git a/mf/feta-beum.mf b/mf/feta-beum.mf index 17cf755a95..936d9cf680 100644 --- a/mf/feta-beum.mf +++ b/mf/feta-beum.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen % mode_setup; diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index 877d03cc59..eccb52238c 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen % & Han-Wen Nienhuys % diff --git a/mf/feta-braces11.mf b/mf/feta-braces11.mf index 29ad26a6ae..fd8453098f 100644 --- a/mf/feta-braces11.mf +++ b/mf/feta-braces11.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces11"; diff --git a/mf/feta-braces13.mf b/mf/feta-braces13.mf index 013ecad689..92b47b8166 100644 --- a/mf/feta-braces13.mf +++ b/mf/feta-braces13.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces13"; diff --git a/mf/feta-braces16.mf b/mf/feta-braces16.mf index 06f05f40ed..d11edfc9c6 100644 --- a/mf/feta-braces16.mf +++ b/mf/feta-braces16.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces16"; diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf index c7b944e733..9dde058f03 100644 --- a/mf/feta-braces20.mf +++ b/mf/feta-braces20.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces20"; diff --git a/mf/feta-braces23.mf b/mf/feta-braces23.mf index 6e4ca0c712..99d2d46f87 100644 --- a/mf/feta-braces23.mf +++ b/mf/feta-braces23.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces23"; diff --git a/mf/feta-braces26.mf b/mf/feta-braces26.mf index c75ee3544e..c2c0e6850b 100644 --- a/mf/feta-braces26.mf +++ b/mf/feta-braces26.mf @@ -4,7 +4,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % font_identifier:="feta-braces26"; diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index b5f172dbe2..fadde1ec0e 100644 --- a/mf/feta-eindelijk.mf +++ b/mf/feta-eindelijk.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen fet_begingroup("rests"); diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index f7b7341288..26c91cf95b 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -5,7 +5,7 @@ % source file of the Feta (defintively not an abbreviation for Font-En-Tja) % music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index c1e3235257..847045bb44 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys , +% (c) 1997--2001 Han-Wen Nienhuys , % Jan Nieuwenhuizen , % Juergen Reuter diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf index a7664589ef..1cd8e52acc 100644 --- a/mf/feta-nummer-code.mf +++ b/mf/feta-nummer-code.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen fet_begingroup("number") diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index 060e4537c5..769348609e 100644 --- a/mf/feta-slag.mf +++ b/mf/feta-slag.mf @@ -4,7 +4,7 @@ % source file of the Feta (defintively not an abbreviation for Font-En-Tja) % music font % -% (c) 1998--2000 Jan Nieuwenhuizen +% (c) 1998--2001 Jan Nieuwenhuizen % % this file is included by feta-scripts.mf diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf index 3b129a8bdb..fc6298daa6 100644 --- a/mf/feta-sleur.mf +++ b/mf/feta-sleur.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2000 Jan Nieuwenhuizen +% (c) 1997--2001 Jan Nieuwenhuizen % & Han-Wen Nienhuys % % see Documentation/fonts.tex diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index b3d77bb108..ad008adc34 100644 --- a/mf/feta-toevallig.mf +++ b/mf/feta-toevallig.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2000 Han-Wen Nienhuys +% (c) 1997--2001 Han-Wen Nienhuys % diff --git a/midi2ly/duration-convert.cc b/midi2ly/duration-convert.cc index a7b7594ff3..b915c87727 100644 --- a/midi2ly/duration-convert.cc +++ b/midi2ly/duration-convert.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include diff --git a/midi2ly/duration-iter.cc b/midi2ly/duration-iter.cc index fbc8bf4988..12c2fa832b 100644 --- a/midi2ly/duration-iter.cc +++ b/midi2ly/duration-iter.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include diff --git a/midi2ly/duration.cc b/midi2ly/duration.cc index 2780baec6d..5289273358 100644 --- a/midi2ly/duration.cc +++ b/midi2ly/duration.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen Han-Wen Nienhuys diff --git a/midi2ly/include/duration-convert.hh b/midi2ly/include/duration-convert.hh index 7211cd9053..683c6eb19b 100644 --- a/midi2ly/include/duration-convert.hh +++ b/midi2ly/include/duration-convert.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/midi2ly/include/duration-iter.hh b/midi2ly/include/duration-iter.hh index 9f441694b6..d3320c3317 100644 --- a/midi2ly/include/duration-iter.hh +++ b/midi2ly/include/duration-iter.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ diff --git a/midi2ly/include/duration.hh b/midi2ly/include/duration.hh index f43bf2ecb5..22f4fb4530 100644 --- a/midi2ly/include/duration.hh +++ b/midi2ly/include/duration.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Jan Nieuwenhuizen + (c) 1997--2001 Jan Nieuwenhuizen */ diff --git a/midi2ly/include/plet.hh b/midi2ly/include/plet.hh index e538b99a3c..c05709e3ab 100644 --- a/midi2ly/include/plet.hh +++ b/midi2ly/include/plet.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ diff --git a/midi2ly/main.cc b/midi2ly/main.cc index 0a6716d165..38ce2703a6 100644 --- a/midi2ly/main.cc +++ b/midi2ly/main.cc @@ -59,7 +59,7 @@ version () "midi2ly"); cout << endl; - cout << _f ("Copyright (c) %s by", "1996--2000"); + cout << _f ("Copyright (c) %s by", "1996--2001"); cout << "Han-Wen Nienhuys \n" << "Jan Nieuwenhuizen \n"; } @@ -267,9 +267,9 @@ main (int argc_i, char* argv_sz_a[]) if (!output_str.length_i ()) { - String d, dir, base, ext; - split_path (arg_sz, d, dir, base, ext); - output_str = base + ext + ".ly"; + Path p = split_path (arg_sz); + + output_str = p.base + p.ext + ".ly"; } score_p->output (output_str); diff --git a/midi2ly/plet.cc b/midi2ly/plet.cc index 8ffdf5d763..df6efdd842 100644 --- a/midi2ly/plet.cc +++ b/midi2ly/plet.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "plet.hh" diff --git a/mutopia/Coriolan/GNUmakefile b/mutopia/Coriolan/GNUmakefile index 529facd769..e8eca2d4d9 100644 --- a/mutopia/Coriolan/GNUmakefile +++ b/mutopia/Coriolan/GNUmakefile @@ -3,9 +3,8 @@ depth = ../.. # do Coriolan if you have plenty RAM / CPU / quotum -examples= +# examples=coriolan -examples= LOCALSTEPMAKE_TEMPLATES=mutopia include $(depth)/make/stepmake.make @@ -14,8 +13,6 @@ parts=$(patsubst %.ly,%,$(wildcard *-part.ly)) tarball=coriolan mutopia-examples=coriolan $(parts) -mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz) -mutopia: - $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter) + diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index 07f834a6cf..18dedd5e05 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -7,8 +7,8 @@ bassiGroup = \context PianoStaff = bassi_group \notes < \staffCombinePianoStaffProperties \context Staff=oneBassi { \property Staff.midiInstrument = #"cello" - \property Staff.instrument = #'((kern . 0.5) - (lines "Violoncello" (rows " e") (rows "Contrabasso"))) + \property Staff.instrument = #'(lines + "Violoncello" " e" "Contrabasso") \property Staff.instr = #"Vc." \clef "bass"; diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index b3e1ad1967..34eb038cba 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -7,11 +7,10 @@ clarinettiStaff = \context Staff = clarinetti < \property Staff.midiInstrument = #"clarinet" - \property Staff.instrument = #`((kern . 0.5) - (lines "2 Clarinetti" (rows "(B" ,text-flat ")"))) + \property Staff.instrument = #`(lines + "2 Clarinetti" (rows "(B" ,text-flat ")")) - \property Staff.instr = #`((kern . 0.5) - (lines "Cl." (rows "(B" ,text-flat ")"))) + \property Staff.instr = #`(lines "Cl." (rows "(B" ,text-flat ")")) % urg: can't; only My_midi_lexer: () parses pitch? %\property Staff.transposing = "bes" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 644a66753e..0bdc166596 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -7,11 +7,10 @@ corniStaff = \context Staff = corni < \property Staff.midiInstrument = #"french horn" - \property Staff.instrument = #`((kern . 0.5) - (lines "2 Corni" (rows "(E" ,text-flat ")"))) + \property Staff.instrument = #`(lines + "2 Corni" (rows "(E" ,text-flat ")")) - \property Staff.instr = #`((kern . 0.5) - (lines "Cor." (rows "(E" ,text-flat ")"))) + \property Staff.instr = #`(lines "Cor." (rows "(E" ,text-flat ")")) % urg: can't; only My_midi_lexer: () parses pitch? %\property Staff.transposing = "es" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index c01276cf7e..1e91be78b4 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -137,8 +137,8 @@ timpani = \notes \relative c { timpaniStaff = \context Staff = timpani < \property Staff.midiInstrument = #"timpani" - \property Staff.instrument = #'((kern . 0.5) - (lines "2 Timpani" "(C-G)")) + \property Staff.instrument = #'(lines + "2 Timpani" "(C-G)") \property Staff.instr = #"Timp." \clef "bass"; \Time diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 39e21e435b..775dd7fe3f 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -8,10 +8,8 @@ trombeStaff = \context Staff = trombe < \context Staff=trombe { \property Staff.midiInstrument = #"trumpet" - \property Staff.instrument = #`((kern . 0.5) - (lines "2 Trombe" (rows "(C)"))) - \property Staff.instr = #`((kern . 0.5) - (lines "Tbe." (rows "(C)"))) + \property Staff.instrument = #`(lines "2 Trombe" (rows "(C)")) + \property Staff.instr = #`(lines "Tbe." (rows "(C)")) \notes { \key c \major; } \End diff --git a/po/de.po b/po/de.po index 3c1a256a87..c261683547 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2000-12-17 15:35+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 \n" "Language-Team: LANGUAGE \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:26 scores.cc:38 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" @@ -103,23 +103,28 @@ msgstr "Ich kann das Zeichen `%s' nicht finden" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:153 +#: all-font-metrics.cc:155 #, c-format msgid "can't find font: `%s'" msgstr "Kann Schrift `%s' nicht finden" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 #, fuzzy msgid "Loading default font" msgstr "Kann die Schrift %s nicht finden, lade die Standardschrift." @@ -129,20 +134,29 @@ 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:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "(Suchpfad: `%s')" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" +msgstr "Balken mit weniger als zwei Hälsen" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -153,33 +167,24 @@ msgstr "Kann nicht beide Enden von %s finden" msgid "already have a beam" msgstr "Habe schon einen Balken" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 #, fuzzy msgid "unterminated beam" msgstr "Unbeendeter Bindestrich" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "Ein Notenhals muss rhythmische Struktur haben." -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "Notenhals passt nicht in den Balken" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "Der Balken bagann hier" -#: beam.cc:83 -#, fuzzy -msgid "beam has less than two stems" -msgstr "Balken mit weniger als zwei Hälsen" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -204,37 +209,30 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:119 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "Unbeendeter Bindestrich" - -#: chord-tremolo-iterator.cc:42 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "Keiner darf eine Wiederholungsklammer drucken" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" +#: chord-tremolo-engraver.cc:141 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "Unbeendeter Bindestrich" + +#: chord-tremolo-iterator.cc:48 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "Keiner darf eine Wiederholungsklammer drucken" + #: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Zu viele aneinanderstoßende Notenspalten. Ich ignoriere sie." -#: cross-staff.cc:24 -#, fuzzy -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" -"minVerticalAlign != maxVerticalAlign: Balken/Bindebögen zwischen den " -"Systemen sind möglichischerweise unvollständig" - #: debug.cc:26 #, fuzzy msgid "floating point exception" @@ -249,40 +247,40 @@ msgstr "Kann die Speicher msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "Ich kann kein (De)crescendo bis zum Ende finden" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 #, fuzzy msgid "already have a crescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a decrescendo" msgstr "Habe schon einen Balken" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 #, fuzzy msgid "unterminated (de)crescendo" msgstr "Nichtbeendetes Crescendo" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "Unbeendete Linienfortführung" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 #, fuzzy msgid "no one to print a repeat brace" msgstr "Keiner darf eine Wiederholungsklammer drucken" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -318,13 +316,8 @@ msgstr "Unbeendeter Bindestrich" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:49 -#, fuzzy, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "Falscher Typ von Identifier: " - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" @@ -360,104 +353,102 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "EXT" msgstr "EXT" -#: main.cc:75 +#: main.cc:105 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "Benutze das Ausgabeformat EXT" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:106 msgid "this help" msgstr "Diese Hilfe" -#: main.cc:77 +#: main.cc:107 #, fuzzy msgid "FIELD" msgstr "DATEI" -#: main.cc:77 +#: main.cc:107 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:108 main.cc:111 msgid "DIR" msgstr "DIR" -#: main.cc:78 +#: main.cc:108 msgid "add DIR to search path" msgstr "Hänge DIR an den Suchpfad an" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:109 msgid "FILE" msgstr "DATEI" -#: main.cc:79 +#: main.cc:109 msgid "use FILE as init file" msgstr "Verwende FILE als Initialisierungsdatei" -#: main.cc:80 +#: main.cc:110 msgid "write Makefile dependencies for every input file" msgstr "Schreibe Makefile-Abhängigkeiten für jede Eingabedatei" -#: main.cc:81 +#: main.cc:111 +msgid "prepend DIR to dependencies" +msgstr "" + +#: main.cc:112 #, fuzzy msgid "produce MIDI output only" msgstr "Nur Midiausgabe" -#: main.cc:82 -msgid "BASENAME" +#: main.cc:113 +#, fuzzy +msgid "NAME" msgstr "BASENAME" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:113 +#, fuzzy +msgid "write output to NAME" msgstr "Schreibe die Ausgabe in BASENAME[-x].Erweiterung" -#: main.cc:83 -msgid "show all changes in relative syntax" -msgstr "Zeige alle Veränderungen in relativer Syntax" - -#: main.cc:84 +#: main.cc:114 msgid "inhibit file output naming and exporting" msgstr "Unterdrücke die automatische Benennung von Ausgabedateien und Export" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:115 msgid "don't timestamp the output" msgstr "Keine Datumsangabe auf der Ausgabe" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "Schalte experimentelle Möglichkeiten an" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:116 msgid "print version number" msgstr "Zeige die Versionsnummer" -#: main.cc:88 +#: main.cc:117 #, fuzzy msgid "verbose" msgstr "Sei geschwätzig" -#: main.cc:89 main.cc:106 +#: 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:106 +#: main.cc:135 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." -#: main.cc:108 +#: main.cc:137 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Setze Musik oder spiele MIDI von DATEI" -#: main.cc:112 +#: 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" @@ -467,20 +458,20 @@ msgstr "" "Notenblätter erzeugen. Dazu verwendet es eine eigene Beschreibungssprache.\n" "lilyPond ist Teil des GNU-Projekts\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:147 msgid "Options:" msgstr "Optionen:" -#: main.cc:122 +#: 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:141 +#: main.cc:123 main.cc:170 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Melde Fehler an" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:178 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -493,17 +484,17 @@ msgstr "" "einhalten. Wenn Sie das Programm mit `%s --warranty starten, bekommen\n" "Sie mehr Informationen.\n" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:185 main.cc:197 #, c-format msgid "Copyright (c) %s by" msgstr "Urheberrechte (Copyright) (c) %s bei" -#: main.cc:166 +#: main.cc:195 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Der Notensatz des GNU-Projekts" -#: main.cc:71 main.cc:174 +#: 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" @@ -551,15 +542,15 @@ msgstr "Unsinnige Dauer" msgid "silly pitch" msgstr "unsinnige Tonhöhe" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 #, fuzzy msgid "Error syncing file (disk full?)" msgstr "Fehler beim Abspeichern der Datei (Platte voll?)" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "Kann Partiturkontext nicht finden" +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponieren um %s macht Vorzecihen größer als zwei" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -573,17 +564,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, fuzzy, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponieren um %s macht Vorzecihen größer als zwei" +msgid "can't find `%s' context" +msgstr "Kann Partiturkontext nicht finden" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "name ist ein Schlüsselbegriff (keyword) (`%s')" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "Fehler am Dateiende(EOF): %s" @@ -602,16 +593,16 @@ msgstr "Klammern passen nicht zusammen" msgid "Junking request: `%s'" msgstr "Uralt-Bitte: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, fuzzy, c-format msgid "paper output to %s..." msgstr "Ausgabe auf Papier auf %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", bei " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." @@ -620,41 +611,41 @@ msgstr "Schreibe Datei mit Abh msgid "Preprocessing elements..." msgstr "Verarbeite Element vor..." -#: paper-score.cc:105 +#: paper-score.cc:112 #, fuzzy msgid "Outputting Score, defined at: " msgstr "Gebe Partitur aus, definiert bei: " +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "Kann ein `%s' weder finden noch erzeugen" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "Stück ... " -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "Erstellt von: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "Automatisch generiert" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "von der musiaklischen Definition: %s" @@ -664,7 +655,17 @@ msgstr "von der musiaklischen Definition: %s" msgid "MIDI output to %s..." msgstr "MIDI-Ausgabe nach %s..." -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "Unbeendeter Bindebogen" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "Kann nicht beide Enden von %s finden" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -674,15 +675,14 @@ msgstr "Kann keine k msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, fuzzy, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Falsche Type für Besitz-Wert" @@ -697,42 +697,42 @@ msgstr "Zu viele kollidierende Pausen." msgid "too many notes for rest collision" msgstr "Zu viele Noten für kollidierende Pausen." -#: score-engraver.cc:177 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Unbeschränkter Abstand `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "Interpretiere die Noten..." -#: score.cc:81 +#: score.cc:92 #, fuzzy msgid "Need music in a score" msgstr "Ich brauche Noten in einer Partitur" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 #, fuzzy msgid "Errors found/*, not processing score*/" msgstr "Habe Fehler gefunden, /* die Partitur wird nicht verarbeitet */" -#: score.cc:101 +#: score.cc:112 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "verstrichene Zeit %.2f Sekunden" -#: scores.cc:34 +#: score-engraver.cc:177 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." +msgid "unbound spanner `%s'" +msgstr "Unbeschränkter Abstand `%s'" + +#: scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "Ausgabe auf Papier auf %s..." -#: scores.cc:79 +#: scores.cc:106 #, fuzzy msgid "Score contains errors; will not process it" msgstr "Partitur enthält Fehler; ich werde sie nicht weiterverarbeiten" -#: scores.cc:122 +#: scores.cc:152 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "Unbekannte Sonder-Zeichenkette" @@ -748,15 +748,6 @@ msgstr "Ich wei msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ich saufe zu viel" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "Unbeendeter Bindebogen" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "Kann nicht beide Enden von %s finden" - #: slur.cc:49 #, fuzzy msgid "Putting slur over rest. Ignoring." @@ -766,18 +757,31 @@ msgstr "Setze Bindebogen msgid "Slur over rest?" msgstr "Bindebogen übe den Rest?" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "Unbeendeter Bindebogen" + +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "Kann nicht beide Enden von %s finden" + +#: stem.cc:116 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "" +"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Setze Note auf unpassenden Hals (Typ = %d)" -#: stem.cc:117 -#, fuzzy -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:117 +msgid "Text_spanner too small" msgstr "" -"Dubiose Größe des Notenhalses: Überprüfe die Eingabe auf schmale Balken" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "Kann nicht beide Enden von %s finden" @@ -787,14 +791,15 @@ msgstr "Kann nicht beide Enden von %s finden" msgid "already have a text spanner" msgstr "Habe schon einen Balken" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "Unbeendete Linienfortführung" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "Kann ASCII-Zeichen `%d' nicht finden" #: tfm-reader.cc:105 #, c-format @@ -806,11 +811,6 @@ msgstr "TFM header von `%s' hat nur %u Wort(e)" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM-Datei hat %u Parameter. Das ist mehr als die" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "Kann ASCII-Zeichen `%d' nicht finden" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Es wurden keine Haltebögen erzeugt!" @@ -863,21 +863,19 @@ msgstr "Kann ein `%s', genannt `%s' weder finden noch erzeugen" msgid "can't find or create: `%s'" msgstr "Kann ein `%s' weder finden noch erzeugen" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -898,112 +896,112 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "Älteste noch unterstütze Version der Eingabe: %s" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "Falsche Type für Besitz-Wert" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "Setze kürzeste Dauer (?)" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "Um Text zu verarbeiten, muß ich im Text-(Lyrics)-Modus sein" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "Keine Dauer: %d" -#: parser.yy:1563 +#: parser.yy:1584 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "Für Noten muß ich im Noten-(Note)-Modus sein" -#: parser.yy:1659 +#: parser.yy:1680 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "Für Akkorde muß ich im Akkord-(Chord)-Modus sein" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "Während eines Kommentar war die Datei zu Ende (EOF gefunden)" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "Unbekannter Identifier: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 #, fuzzy msgid "Missing end quote" msgstr "Endnote fehlt" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "Erwarte Weiß" -#: lexer.ll:241 +#: lexer.ll:243 #, fuzzy msgid "Can't evaluate Scheme in safe mode" msgstr "Kann Scheme nicht interpretieren, wenn ich im sicheren Modus bin" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "Ungültiger Buchstabe `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "Unbekannte Sonder-Zeichenkette" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "Falsche Version von Mudela: (s /%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1223,6 +1221,29 @@ msgstr "% Automatisch generiert" msgid "% from input file: " msgstr "% aus Eingabedatei: " +#, fuzzy +#~ msgid "not a forced distance; cross-staff spanners may be broken" +#~ msgstr "" +#~ "minVerticalAlign != maxVerticalAlign: Balken/Bindebögen zwischen den " +#~ "Systemen sind möglichischerweise unvollständig" + +#, fuzzy +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "Falscher Typ von Identifier: " + +#~ msgid "show all changes in relative syntax" +#~ msgstr "Zeige alle Veränderungen in relativer Syntax" + +#~ msgid "switch on experimental features" +#~ msgstr "Schalte experimentelle Möglichkeiten an" + +#~ msgid "Automatically generated" +#~ msgstr "Automatisch generiert" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "Schreibe Datei mit Abhängigkeiten: `%s'..." + #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Falsche Type für Besitz-Wert" diff --git a/po/fr.po b/po/fr.po index 5ea9e6a350..574266208d 100644 --- 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: 2000-12-17 15:35+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 \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:26 scores.cc:38 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'" @@ -103,23 +103,28 @@ msgstr "impossible de trouver le caract msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:153 +#: all-font-metrics.cc:155 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 #, fuzzy msgid "Loading default font" msgstr "Impossible de trouver la police `%s', chargement la police par défaut" @@ -129,20 +134,29 @@ 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:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137 #, fuzzy, c-format msgid "(search path: `%s')" msgstr "chemin de recherche= %s" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" +msgstr "barre avec moins de deux tiges" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -153,33 +167,24 @@ msgstr "impossible de trouver le caract msgid "already have a beam" msgstr "Il y a déjà une barre" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 #, fuzzy msgid "unterminated beam" msgstr "Barre non terminée" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "La tige doit avoir une structure rythmique." -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "la tige ne rentre pas dans la barre" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "la barre a commencé ici" -#: beam.cc:83 -#, fuzzy -msgid "beam has less than two stems" -msgstr "barre avec moins de deux tiges" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -204,33 +209,29 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:119 -msgid "unterminated chord tremolo" -msgstr "" - -#: chord-tremolo-iterator.cc:42 -msgid "no one to print a tremolos" -msgstr "" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format 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 +msgid "unterminated chord tremolo" +msgstr "" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "" + #: collision.cc:116 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Trop de colonnes de notes superposées. Je les ignore." -#: cross-staff.cc:24 -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" - #: debug.cc:26 #, fuzzy msgid "floating point exception" @@ -245,39 +246,39 @@ msgstr "impossible de positionner mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ne peut pas trouver un (de)crescendo à la fin" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 #, fuzzy msgid "already have a crescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a decrescendo" msgstr "Il y a déjà une barre" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminé" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -311,13 +312,8 @@ msgstr "" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:49 -#, fuzzy, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "Mauvais type d'indentifiant: " - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" @@ -353,103 +349,99 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "EXT" msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:106 msgid "this help" msgstr "cette aide" -#: main.cc:77 +#: main.cc:107 #, fuzzy msgid "FIELD" msgstr "FICHIER" -#: main.cc:77 +#: main.cc:107 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:108 main.cc:111 msgid "DIR" msgstr "REP" -#: main.cc:78 +#: main.cc:108 #, fuzzy msgid "add DIR to search path" msgstr "ajoute REP au chemin de recherche" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:109 msgid "FILE" msgstr "FICHIER" -#: main.cc:79 +#: main.cc:109 #, fuzzy msgid "use FILE as init file" msgstr "utilise FICHIER comme fichier d'initialisation" -#: main.cc:80 +#: main.cc:110 msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:81 +#: 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:82 -msgid "BASENAME" -msgstr "" - -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:113 +msgid "NAME" msgstr "" -#: main.cc:83 -msgid "show all changes in relative syntax" +#: main.cc:113 +msgid "write output to NAME" msgstr "" -#: main.cc:84 +#: main.cc:114 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:115 msgid "don't timestamp the output" msgstr "" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:116 msgid "print version number" msgstr "afficher le numéro de version" -#: main.cc:88 +#: main.cc:117 msgid "verbose" msgstr "" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:118 msgid "show warranty and copyright" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:135 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Usage: %s [OPTION]... [FICHIER]..." -#: main.cc:108 +#: main.cc:137 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:112 +#: main.cc:141 #, fuzzy msgid "" "LilyPond is a music typesetter. It produces beautiful sheet music\n" @@ -460,21 +452,21 @@ msgstr "" "paritions à partir de description de gaut niveau en entrée. Lilypond\n" "fait partie du projet GNU.\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:147 msgid "Options:" msgstr "Options: " -#: main.cc:122 +#: 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:141 +#: main.cc:123 main.cc:170 #, fuzzy, c-format msgid "Report bugs to %s" msgstr "Rapporter les bugs à" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:178 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -482,17 +474,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:185 main.cc:197 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s par" -#: main.cc:166 +#: main.cc:195 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:71 main.cc:174 +#: 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" @@ -527,15 +519,15 @@ msgstr "" msgid "silly pitch" msgstr "" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 #, fuzzy msgid "Error syncing file (disk full?)" msgstr ")" -#: music-output-def.cc:72 -#, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "ne peut pas trouver `%s'" +#: musical-request.cc:29 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -549,17 +541,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "" +#: music-output-def.cc:115 +#, fuzzy, c-format +msgid "can't find `%s' context" +msgstr "ne peut pas trouver `%s'" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "" @@ -577,16 +569,16 @@ msgstr "" msgid "Junking request: `%s'" msgstr "" -#: paper-def.cc:116 +#: paper-def.cc:109 #, fuzzy, c-format msgid "paper output to %s..." msgstr "Sortie papier vers %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", à " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "impossible d'ouvrir le fichier: `%s'" @@ -595,41 +587,41 @@ msgstr "impossible d'ouvrir le fichier: `%s'" msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "" +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "ne peut pas trouver ou créer `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "" -#: performance.cc:50 +#: performance.cc:51 #, fuzzy msgid "Track ... " msgstr "Piste ... " -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "Auteur: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "Généré automatiquement" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "" @@ -639,7 +631,17 @@ msgstr "" msgid "MIDI output to %s..." msgstr "" -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "Barre non terminée" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "impossible de trouver le caractères numéro %d" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -649,15 +651,14 @@ msgstr "ne peut pas trouver le fichier: `%s'" msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, fuzzy, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Mauvais type pour la valeur de la propriété" @@ -670,39 +671,39 @@ msgstr "" msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:177 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "traducteur inconnu `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "" -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "" -#: score.cc:101 +#: score.cc:112 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "temps ecoulé: %.2f secondes" -#: scores.cc:34 +#: score-engraver.cc:177 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "impossible d'ouvrir le fichier: `%s'" +msgid "unbound spanner `%s'" +msgstr "traducteur inconnu `%s'" -#: scores.cc:79 +#: scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "Sortie papier vers %s..." + +#: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:122 +#: scores.cc:152 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "chaîne d'échappement inconnue: `\\%s'" @@ -717,15 +718,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "impossible de trouver le caractères numéro %d" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "" @@ -734,17 +726,30 @@ msgstr "" msgid "Slur over rest?" msgstr "" -#: stem-engraver.cc:115 -#, c-format -msgid "Adding note head to incompatible stem (type = %d)" +#: slur-engraver.cc:127 +msgid "unterminated slur" msgstr "" -#: stem.cc:117 +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "impossible de trouver le caractères numéro %d" + +#: stem.cc:116 #, fuzzy msgid "Weird stem size; check for narrow beams" msgstr "décallage de barre bizarre, check your knees" -#: text-spanner-engraver.cc:95 +#: stem-engraver.cc:115 +#, c-format +msgid "Adding note head to incompatible stem (type = %d)" +msgstr "" + +#: text-spanner.cc:117 +msgid "Text_spanner too small" +msgstr "" + +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "impossible de trouver le caractères numéro %d" @@ -754,14 +759,15 @@ msgstr "impossible de trouver le caract msgid "already have a text spanner" msgstr "Il y a déjà une barre" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "Barre non terminée" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ne peut pas trouver le caractère ascii `%d'" #: tfm-reader.cc:105 #, c-format @@ -773,11 +779,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ne peut pas trouver le caractère ascii `%d'" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Aucune liaison n'a été crée" @@ -829,21 +830,19 @@ msgstr "ne peut pas trouver ou cr msgid "can't find or create: `%s'" msgstr "ne peut pas trouver ou créer `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -864,110 +863,110 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "Plus ancienne version supportée: %s" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "Mauvais type pour la valeur de la propriété" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "Positionne la plus petite durée (?)" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "il fayt être en mode Parole pour les paroles" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "pas une durée: %d" -#: parser.yy:1563 +#: parser.yy:1584 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "il faut être en mode Note pour les notes" -#: parser.yy:1659 +#: parser.yy:1680 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "il faut être en mode Accord pour les accords" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "EOF trouvé dans un commentaire" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "indentifiant non défini: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "blanche attendue" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:433 +#: lexer.ll:439 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "caractères illégal: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "chaîne d'échappement inconnue: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "version de mudela incorrecte: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1184,6 +1183,17 @@ msgstr "% G msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "Mauvais type d'indentifiant: " + +#~ msgid "Automatically generated" +#~ msgstr "Généré automatiquement" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "impossible d'ouvrir le fichier: `%s'" + #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Mauvais type pour la valeur de la propriété" diff --git a/po/it.po b/po/it.po index cc09a30495..30007b91f1 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2000-12-17 15:35+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: \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:26 scores.cc:38 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'" @@ -101,23 +101,28 @@ msgstr "non riesco a trovare il carattere `%s'" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:153 +#: all-font-metrics.cc:155 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "non trovo il file: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "" @@ -126,20 +131,29 @@ 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:107 +#: 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'" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" +msgstr "beam con meno di due gambi" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 #, fuzzy msgid "can't find start of beam" @@ -149,33 +163,24 @@ msgstr "non trovo le estremit msgid "already have a beam" msgstr "" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 #, fuzzy msgid "unterminated beam" msgstr "beam non terminato" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "I gambi devono avere una struttura ritmica." -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "il gambo non rientra nel beam" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "" -#: beam.cc:83 -#, fuzzy -msgid "beam has less than two stems" -msgstr "beam con meno di due gambi" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -200,34 +205,30 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:119 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "beam non terminato" - -#: chord-tremolo-iterator.cc:42 -msgid "no one to print a tremolos" -msgstr "" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" +#: chord-tremolo-engraver.cc:141 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "beam non terminato" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "" + #: collision.cc:116 #, fuzzy msgid "Too many clashing notecolumns. Ignoring them." msgstr "Troppe collisioni tra colonne di note. Le ignoro." -#: cross-staff.cc:24 -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" - #: debug.cc:26 #, fuzzy msgid "floating point exception" @@ -242,39 +243,39 @@ msgstr "non posso settare mem-checking" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "non trovo un (de)crescendo fino alla fine" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 #, fuzzy msgid "already have a crescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a decrescendo" msgstr "crescendo non terminato" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 #, fuzzy msgid "unterminated (de)crescendo" msgstr "crescendo non terminato" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "extender non terminato" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -309,13 +310,8 @@ msgstr "beam non terminato" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:49 -#, fuzzy, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "Tipo di identificatore sbagliato: " - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" @@ -351,98 +347,90 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "EXT" msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:106 msgid "this help" msgstr "" -#: main.cc:77 +#: main.cc:107 msgid "FIELD" msgstr "" -#: main.cc:77 +#: main.cc:107 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:108 main.cc:111 msgid "DIR" msgstr "" -#: main.cc:78 +#: main.cc:108 #, fuzzy msgid "add DIR to search path" msgstr " -I, --include=DIR aggiunge DIR ai path di ricerca\n" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:109 msgid "FILE" msgstr "" -#: main.cc:79 +#: main.cc:109 #, fuzzy msgid "use FILE as init file" msgstr " -i, --init=NOMEFILE usa NOMEFILE come file iniziale\n" -#: main.cc:80 +#: 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:81 +#: 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:82 -msgid "BASENAME" +#: main.cc:113 +msgid "NAME" msgstr "" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:113 +msgid "write output to NAME" msgstr "" -#: main.cc:83 -#, fuzzy -msgid "show all changes in relative syntax" -msgstr "" -" -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi " -"relativa\n" - -#: main.cc:84 +#: 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:85 main.cc:103 +#: 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:86 -#, fuzzy -msgid "switch on experimental features" -msgstr " -t, --test usa le caratteristiche sperimentali\n" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:116 msgid "print version number" msgstr "" -#: main.cc:88 +#: main.cc:117 msgid "verbose" msgstr "" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:118 #, fuzzy msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" @@ -450,38 +438,38 @@ msgstr " -w, --warranty mostra la garanzia e il copyright\n" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:135 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Uso: %s [OPZIONE]... [FILE]..." -#: main.cc:108 +#: main.cc:137 #, fuzzy msgid "Typeset music and or play MIDI from FILE" msgstr "Stampa partitura oppure suona una song MIDI da FILE o " -#: main.cc:112 +#: 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:118 main.cc:119 +#: main.cc:119 main.cc:147 msgid "Options:" msgstr "Opzioni: " -#: main.cc:122 +#: 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:141 +#: main.cc:123 main.cc:170 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:178 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -489,17 +477,17 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:185 main.cc:197 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s di" -#: main.cc:166 +#: main.cc:195 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- Il tipografo musicale del progetto GNU" -#: main.cc:71 main.cc:174 +#: 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" @@ -549,15 +537,15 @@ msgstr "indicazione durata priva di senso" msgid "silly pitch" msgstr "indicazione altezza priva di senso" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 #, fuzzy msgid "Error syncing file (disk full?)" msgstr "errore nel sincronizzare il file (disco pieno?)" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "non trovo `%s'" +msgid "Transposition by %s makes accidental larger than two" +msgstr "la trasposizine di %s rende le alterazioni più che doppie" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -571,17 +559,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, fuzzy, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "la trasposizine di %s rende le alterazioni più che doppie" +msgid "can't find `%s' context" +msgstr "non trovo `%s'" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, fuzzy, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Il nome dell'identificatore è una parola chiave (`%s')" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "errore alla fine del file: %s" @@ -600,16 +588,16 @@ msgstr "le bretelle no si accoppiano" msgid "Junking request: `%s'" msgstr "Cosa? Non è una richiesta: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, fuzzy, c-format msgid "paper output to %s..." msgstr "L'output stampato è inviato a %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", a " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "scrivo il file delle dipendenze: `%s'..." @@ -618,42 +606,42 @@ msgstr "scrivo il file delle dipendenze: `%s'..." msgid "Preprocessing elements..." msgstr "Pre-elaborazione..." -#: paper-score.cc:105 +#: paper-score.cc:112 #, fuzzy msgid "Outputting Score, defined at: " msgstr "emetto lo Score, definito a: " +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "non trovo e non posso creare `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "" -#: performance.cc:50 +#: performance.cc:51 #, fuzzy msgid "Track ... " msgstr "traccia " -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "Autore: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "Generato automaticamente" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "della definizione musicale: %s" @@ -663,7 +651,17 @@ msgstr "della definizione musicale: %s" msgid "MIDI output to %s..." msgstr "L'output MIDI è inviato a %s..." -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "slur non terminato" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "non trovo le estremità di %s" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -673,15 +671,14 @@ msgstr "non risco a trovare una ruling note a %s" msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, fuzzy, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Tipo sbagliato per il valore di una proprietà" @@ -695,42 +692,42 @@ msgstr "Troppi crescendi" msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:177 -#, fuzzy, c-format -msgid "unbound spanner `%s'" -msgstr "Spanner non legato `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "Interpretazione della musica..." -#: score.cc:81 +#: score.cc:92 #, fuzzy msgid "Need music in a score" msgstr "ho bisogno di musica nello spartito" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 #, fuzzy msgid "Errors found/*, not processing score*/" msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/" -#: score.cc:101 +#: score.cc:112 #, fuzzy, c-format msgid "elapsed time: %.2f seconds" msgstr "durata: %.2f secondi" -#: scores.cc:34 +#: score-engraver.cc:177 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "scrivo il file delle dipendenze: `%s'..." +msgid "unbound spanner `%s'" +msgstr "Spanner non legato `%s'" + +#: scores.cc:44 +#, fuzzy, c-format +msgid "dependencies output to %s..." +msgstr "L'output stampato è inviato a %s..." -#: scores.cc:79 +#: scores.cc:106 #, fuzzy msgid "Score contains errors; will not process it" msgstr "lo spartito contiene errori; non lo elaborerò" -#: scores.cc:122 +#: scores.cc:152 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "stringa di escape sconosciuta: `\\%s'" @@ -745,15 +742,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "slur non terminato" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "non trovo le estremità di %s" - #: slur.cc:49 #, fuzzy msgid "Putting slur over rest. Ignoring." @@ -764,17 +752,30 @@ msgstr "Metto uno slur sulla pausa." msgid "Slur over rest?" msgstr "Metto uno slur sulla pausa." +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "slur non terminato" + +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "non trovo le estremità di %s" + +#: stem.cc:116 +#, fuzzy +msgid "Weird stem size; check for narrow beams" +msgstr "dimensione del gambo poco ortodossa; check for narrow beams" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:117 -#, fuzzy -msgid "Weird stem size; check for narrow beams" -msgstr "dimensione del gambo poco ortodossa; check for narrow beams" +#: text-spanner.cc:117 +msgid "Text_spanner too small" +msgstr "" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "non trovo le estremità di %s" @@ -784,14 +785,15 @@ msgstr "non trovo le estremit msgid "already have a text spanner" msgstr "crescendo non terminato" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "extender non terminato" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "non riesco a trovare il carattere `%s'" #: tfm-reader.cc:105 #, c-format @@ -803,11 +805,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "non riesco a trovare il carattere `%s'" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" @@ -859,21 +856,19 @@ msgstr "non trovo e non posso creare '%s' chiamato '%s'" msgid "can't find or create: `%s'" msgstr "non trovo e non posso creare `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -894,111 +889,111 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "Tipo sbagliato per il valore di una proprietà" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "indicazione durata priva di senso" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 #, fuzzy msgid "Have to be in Lyric mode for lyrics" msgstr "bisogna essere in Lyric mode per i testi" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "non è una durata: %d" -#: parser.yy:1563 +#: parser.yy:1584 #, fuzzy msgid "Have to be in Note mode for notes" msgstr "bisogna essere in Note mode per le note" -#: parser.yy:1659 +#: parser.yy:1680 #, fuzzy msgid "Have to be in Chord mode for chords" msgstr "bisogna essere in Chord mode per gli accordi" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "ho trovato un EOF in un commento" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "indentificatore non definito: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 #, fuzzy msgid "Missing end quote" msgstr "apice finale mancante" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "aspettavo uno spazio bianco" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:433 +#: lexer.ll:439 #, fuzzy, c-format msgid "invalid character: `%c'" msgstr "carattere illegale: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "stringa di escape sconosciuta: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "versione di mudela errata: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1224,6 +1219,27 @@ msgstr "% Generato automaticamente" msgid "% from input file: " msgstr "% dal file di input: " +#, fuzzy +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "Tipo di identificatore sbagliato: " + +#, fuzzy +#~ msgid "show all changes in relative syntax" +#~ msgstr "" +#~ " -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi " +#~ "relativa\n" + +#, fuzzy +#~ msgid "switch on experimental features" +#~ msgstr " -t, --test usa le caratteristiche sperimentali\n" + +#~ msgid "Automatically generated" +#~ msgstr "Generato automaticamente" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "scrivo il file delle dipendenze: `%s'..." + #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "Tipo sbagliato per il valore di una proprietà" diff --git a/po/ja.po b/po/ja.po index 915c1d6a5d..2c69202163 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.2.17\n" -"POT-Creation-Date: 2000-12-17 15:35+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 \n" "Language-Team: Japanese \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:26 scores.cc:38 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'" @@ -101,23 +101,28 @@ msgstr " msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:153 +#: all-font-metrics.cc:155 #, fuzzy, c-format msgid "can't find font: `%s'" msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹" @@ -126,20 +131,29 @@ msgstr " msgid "can't find default font: `%s'" msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "(¸¡º÷¥Ñ¥¹: `%s')" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "Äü¤á¤Þ¤·¤¿" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹" +#: beam.cc:84 +#, fuzzy +msgid "beam has less than two stems" +msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -149,35 +163,26 @@ msgstr "" msgid "already have a beam" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 #, fuzzy msgid "unterminated beam" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 #, fuzzy msgid "stem must have Rhythmic structure" msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 #, fuzzy msgid "stem doesn't fit in beam" msgstr "ÉäÈø¤¬³Ã¤ÎÃæ¤Ë¤ª¤µ¤Þ¤ê¤Þ¤»¤ó" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 #, fuzzy msgid "beam was started here" msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿" -#: beam.cc:83 -#, fuzzy -msgid "beam has less than two stems" -msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "¿âľÊý¸þ¤Î°ÌÃ֤Ȥ·¤Æ¤ª¤«¤·¤Ê³Ã" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -202,36 +207,30 @@ msgstr " msgid "none of these in my family" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: chord-tremolo-engraver.cc:119 -#, fuzzy -msgid "unterminated chord tremolo" -msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" - -#: chord-tremolo-iterator.cc:42 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "̵¸ú¤Ê°ú¤­»»: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" +#: chord-tremolo-engraver.cc:141 +#, fuzzy +msgid "unterminated chord tremolo" +msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" + +#: chord-tremolo-iterator.cc:48 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" + #: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£" -#: cross-staff.cc:24 -#, fuzzy -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" -"minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿" - #: debug.cc:26 msgid "floating point exception" msgstr "ÉâÆ°¾®¿ôÅÀÎã³°" @@ -245,39 +244,39 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 #, fuzzy msgid "can't find start of (de)crescendo" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 #, fuzzy msgid "already have a crescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 #, fuzzy msgid "already have a decrescendo" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 #, fuzzy msgid "unterminated (de)crescendo" msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "¥¨¥¯¥¹¥Æ¥ó¥À¤¬º¸Â¦¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤»¤ó¡£¥¨¥¯¥¹¥Æ¥ó¥ÀÍ×µá¤ò̵»ë¤·¤Þ¤¹¡£" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -310,13 +309,8 @@ msgstr " msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "º¸Â¦¤Ë·Ò¤²¤ë¥Ï¥¤¥Õ¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£¥Ï¥¤¥Õ¥ó¤ÎÍ×µá¤ò̵»ë¤·¤Þ¤¹" -#: identifier.cc:49 -#, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "´Ö°ã¤Ã¤¿¼±Ê̻ҷ¿¡¢¤³¤³¤ËÍè¤ë¤Ù¤­¤â¤Î¤Ï: `%s'" - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:136 scores.cc:142 #, fuzzy, c-format msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" @@ -352,102 +346,100 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "EXT" msgstr "EXT" -#: main.cc:75 +#: main.cc:105 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:106 msgid "this help" msgstr "¤³¤Î¥Ø¥ë¥×" -#: main.cc:77 +#: main.cc:107 #, fuzzy msgid "FIELD" msgstr "FILE" -#: main.cc:77 +#: main.cc:107 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:108 main.cc:111 msgid "DIR" msgstr "DIR" -#: main.cc:78 +#: main.cc:108 msgid "add DIR to search path" msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:109 msgid "FILE" msgstr "FILE" -#: main.cc:79 +#: main.cc:109 msgid "use FILE as init file" msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: main.cc:80 +#: main.cc:110 msgid "write Makefile dependencies for every input file" msgstr "Á´¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î Makefile °Í¸´Ø·¸¤ò½ñ¤­¹þ¤à" -#: main.cc:81 +#: main.cc:111 +msgid "prepend DIR to dependencies" +msgstr "" + +#: main.cc:112 msgid "produce MIDI output only" msgstr "MIDI ½ÐÎϤÎÀ¸À®¤Î¤ß" -#: main.cc:82 -msgid "BASENAME" +#: main.cc:113 +#, fuzzy +msgid "NAME" msgstr "BASENAME" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:113 +#, fuzzy +msgid "write output to NAME" msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à" -#: main.cc:83 -msgid "show all changes in relative syntax" -msgstr "´ØÏ¢¤¹¤ëʸˡ¤«¤éÁ´¤Æ¤ÎÊѹ¹¤òɽ¼¨" - -#: main.cc:84 +#: main.cc:114 msgid "inhibit file output naming and exporting" msgstr "̾Á°ÉÕ¤±¤È¥¨¥¯¥¹¥Ý¡¼¥È¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤òÍÞÀ©¤¹¤ë" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:115 msgid "don't timestamp the output" msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "¼Â¸³Åª¤Êµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:116 msgid "print version number" msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨" -#: main.cc:88 +#: main.cc:117 #, fuzzy msgid "verbose" msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:118 msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:135 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." -#: main.cc:108 +#: main.cc:137 msgid "Typeset music and or play MIDI from FILE" msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë" -#: main.cc:112 +#: 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" @@ -457,20 +449,20 @@ msgstr "" "Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£LilyPond ¤Ï GNU " "¥×¥í¥¸¥§¥¯¥È¤Î°ìÉô¤Ç¤¹¡£\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:147 msgid "Options:" msgstr "¥ª¥×¥·¥ç¥ó:" -#: main.cc:122 +#: main.cc:151 msgid "This binary was compiled with the following options:" msgstr "¤³¤Î¥Ð¥¤¥Ê¥ê¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Þ¤·¤¿" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:170 #, c-format msgid "Report bugs to %s" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:178 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -486,17 +478,17 @@ msgstr "" "¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n" "`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:185 main.cc:197 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s by" -#: main.cc:166 +#: main.cc:195 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- The GNU Project music typesetter" -#: main.cc:71 main.cc:174 +#: 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" @@ -561,14 +553,14 @@ msgstr " msgid "silly pitch" msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 msgid "Error syncing file (disk full?)" msgstr "¥Õ¥¡¥¤¥ë¤ÎƱĴ¥¨¥é¡¼ (¥Ç¥£¥¹¥¯¤¬°ìÇÕ?)" -#: music-output-def.cc:72 -#, fuzzy, c-format -msgid "can't find `%s' context" -msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" +#: musical-request.cc:29 +#, c-format +msgid "Transposition by %s makes accidental larger than two" +msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -582,17 +574,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 -#, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿" +#: music-output-def.cc:115 +#, fuzzy, c-format +msgid "can't find `%s' context" +msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "¼±ÊÌ»Ò̾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s" @@ -610,16 +602,16 @@ msgstr " msgid "Junking request: `%s'" msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, c-format msgid "paper output to %s..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", at " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." @@ -628,40 +620,40 @@ msgstr " msgid "Preprocessing elements..." msgstr "Í×ÁǤòÁ°½èÍýÃæ..." -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "ÉèÌ̤ò½ÐÎϤ·¤Þ¤¹¡£¤³¤³¤ÇÄêµÁ: " +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, fuzzy, c-format msgid "I'm one myself: `%s'" msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤½¤Î¤â¤Î¤Ç¤¹" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, fuzzy, c-format msgid "none of these in my family: `%s'" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "¥È¥é¥Ã¥¯ ..." -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "ºî¶Ê¼Ô: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "¼«Æ°À¸À®¤µ¤ì¤¿" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s" @@ -671,7 +663,17 @@ msgstr " msgid "MIDI output to %s..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -681,15 +683,14 @@ msgstr " msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, fuzzy, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" @@ -702,39 +703,39 @@ msgstr " msgid "too many notes for rest collision" msgstr "µÙÉä¤Î¾×ÆͤËÂФ·¤Æ²»É䤬¿¤¹¤®¤Þ¤¹" -#: score-engraver.cc:177 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "³Ú¶Ê¤Î²ò¼áÃæ..." -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬ÍפǤ¹" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "¥¨¥é¡¼¤òȯ¸«/*, ³ÚÉè¤ò½èÍý¤·¤Þ¤»¤ó*/" -#: score.cc:101 +#: score.cc:112 #, c-format msgid "elapsed time: %.2f seconds" msgstr "·Ð²á»þ´Ö: %.2f ÉÃ" -#: scores.cc:34 +#: score-engraver.cc:177 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥¹¥Ñ¥Ê `%s'" + +#: scores.cc:44 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." +msgid "dependencies output to %s..." +msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: scores.cc:79 +#: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "³ÚÉè¤Ë¥¨¥é¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹ -- ½èÍý¤·¤Þ¤»¤ó" -#: scores.cc:122 +#: scores.cc:152 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" @@ -750,15 +751,6 @@ msgstr " msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£" @@ -767,16 +759,29 @@ msgstr " msgid "Slur over rest?" msgstr "¥¹¥é¡¼¤¬µÙÉä¤ò¤Þ¤¿¤¤¤Ç¤¤¤ë?" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼" + +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" + +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)" -#: stem.cc:117 -msgid "Weird stem size; check for narrow beams" -msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤" +#: text-spanner.cc:117 +msgid "Text_spanner too small" +msgstr "" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" @@ -786,14 +791,15 @@ msgstr " msgid "already have a text spanner" msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" #: tfm-reader.cc:105 #, c-format @@ -805,11 +811,6 @@ msgstr "`%s' msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!" @@ -861,21 +862,19 @@ msgstr "`%2$s' msgid "can't find or create: `%s'" msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -896,107 +895,107 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "°ìÈָŤ¤ÆþÎϲÄǽ¥Ð¡¼¥¸¥ç¥ó: %s" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 msgid "Have to be in Lyric mode for lyrics" msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d" -#: parser.yy:1563 +#: parser.yy:1584 msgid "Have to be in Note mode for notes" msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1659 +#: parser.yy:1680 msgid "Have to be in Chord mode for chords" msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "½ªÎ»¥¯¥ª¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "¶õÇò¤¬É¬ÍפǤ¹" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1207,6 +1206,27 @@ msgstr "% Automatically generated" msgid "% from input file: " msgstr "% from input file: " +#, fuzzy +#~ msgid "not a forced distance; cross-staff spanners may be broken" +#~ msgstr "" +#~ "minVerticalAlign != maxVerticalAlign: ÆâÉôŪ¤Ê beams/slurs ¤¬²õ¤ì¤Þ¤·¤¿" + +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "´Ö°ã¤Ã¤¿¼±Ê̻ҷ¿¡¢¤³¤³¤ËÍè¤ë¤Ù¤­¤â¤Î¤Ï: `%s'" + +#~ msgid "show all changes in relative syntax" +#~ msgstr "´ØÏ¢¤¹¤ëʸˡ¤«¤éÁ´¤Æ¤ÎÊѹ¹¤òɽ¼¨" + +#~ msgid "switch on experimental features" +#~ msgstr "¼Â¸³Åª¤Êµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë" + +#~ msgid "Automatically generated" +#~ msgstr "¼«Æ°À¸À®¤µ¤ì¤¿" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..." + #, fuzzy #~ msgid "Wrong type for property" #~ msgstr "°À­ÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹" diff --git a/po/lilypond.pot b/po/lilypond.pot index 745a5966d3..d2b4ff2d0f 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-12-17 15:35+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 \n" "Language-Team: LANGUAGE \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:26 scores.cc:38 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 "" @@ -100,23 +100,28 @@ msgstr "" msgid "Error parsing AFM file: %s" msgstr "" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:153 +#: all-font-metrics.cc:155 #, c-format msgid "can't find font: `%s'" msgstr "" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "" @@ -125,20 +130,28 @@ msgstr "" msgid "can't find default font: `%s'" msgstr "" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "" +#: beam.cc:84 +msgid "beam has less than two stems" +msgstr "" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "" @@ -147,30 +160,22 @@ msgstr "" msgid "already have a beam" msgstr "" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 msgid "unterminated beam" msgstr "" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 msgid "stem must have Rhythmic structure" msgstr "" -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "" -#: beam.cc:83 -msgid "beam has less than two stems" -msgstr "" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "" - #: break-align-item.cc:131 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -195,30 +200,26 @@ msgstr "" msgid "none of these in my family" msgstr "" -#: chord-tremolo-engraver.cc:119 -msgid "unterminated chord tremolo" -msgstr "" - -#: chord-tremolo-iterator.cc:42 -msgid "no one to print a tremolos" -msgstr "" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: collision.cc:116 -msgid "Too many clashing notecolumns. Ignoring them." +#: chord-tremolo-engraver.cc:141 +msgid "unterminated chord tremolo" msgstr "" -#: cross-staff.cc:24 -msgid "not a forced distance; cross-staff spanners may be broken" +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "" + +#: collision.cc:116 +msgid "Too many clashing notecolumns. Ignoring them." msgstr "" #: debug.cc:26 @@ -233,35 +234,35 @@ msgstr "" msgid "NaN" msgstr "" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 msgid "already have a crescendo" msgstr "" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 msgid "already have a decrescendo" msgstr "" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 msgid "unterminated (de)crescendo" msgstr "" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -293,13 +294,8 @@ msgstr "" msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" -#: identifier.cc:49 -#, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "" - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "" @@ -335,119 +331,115 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "EXT" msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "use output format EXT (scm, ps, tex or as)" msgstr "" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:106 msgid "this help" msgstr "" -#: main.cc:77 +#: main.cc:107 msgid "FIELD" msgstr "" -#: main.cc:77 +#: main.cc:107 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:108 main.cc:111 msgid "DIR" msgstr "" -#: main.cc:78 +#: main.cc:108 msgid "add DIR to search path" msgstr "" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:109 msgid "FILE" msgstr "" -#: main.cc:79 +#: main.cc:109 msgid "use FILE as init file" msgstr "" -#: main.cc:80 +#: main.cc:110 msgid "write Makefile dependencies for every input file" msgstr "" -#: main.cc:81 -msgid "produce MIDI output only" +#: main.cc:111 +msgid "prepend DIR to dependencies" msgstr "" -#: main.cc:82 -msgid "BASENAME" +#: main.cc:112 +msgid "produce MIDI output only" msgstr "" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:113 +msgid "NAME" msgstr "" -#: main.cc:83 -msgid "show all changes in relative syntax" +#: main.cc:113 +msgid "write output to NAME" msgstr "" -#: main.cc:84 +#: main.cc:114 msgid "inhibit file output naming and exporting" msgstr "" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:115 msgid "don't timestamp the output" msgstr "" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:116 msgid "print version number" msgstr "" -#: main.cc:88 +#: main.cc:117 msgid "verbose" msgstr "" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:118 msgid "show warranty and copyright" msgstr "" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:135 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "" -#: main.cc:108 +#: main.cc:137 msgid "Typeset music and or play MIDI from FILE" msgstr "" -#: main.cc:112 +#: 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:118 main.cc:119 +#: main.cc:119 main.cc:147 msgid "Options:" msgstr "" -#: main.cc:122 +#: main.cc:151 msgid "This binary was compiled with the following options:" msgstr "" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:170 #, c-format msgid "Report bugs to %s" msgstr "" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:178 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -455,16 +447,16 @@ msgid "" "certain conditions. Invoke as `%s --warranty' for more information.\n" msgstr "" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:185 main.cc:197 #, c-format msgid "Copyright (c) %s by" msgstr "" -#: main.cc:166 +#: main.cc:195 msgid "GNU LilyPond -- The music typesetter" msgstr "" -#: main.cc:71 main.cc:174 +#: 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" @@ -499,13 +491,13 @@ msgstr "" msgid "silly pitch" msgstr "" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 msgid "Error syncing file (disk full?)" msgstr "" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, c-format -msgid "can't find `%s' context" +msgid "Transposition by %s makes accidental larger than two" msgstr "" #: music.cc:222 @@ -520,17 +512,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" +msgid "can't find `%s' context" msgstr "" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "" @@ -548,16 +540,16 @@ msgstr "" msgid "Junking request: `%s'" msgstr "" -#: paper-def.cc:116 +#: paper-def.cc:109 #, c-format msgid "paper output to %s..." msgstr "" -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr "" -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, c-format msgid "writing header field %s to %s..." msgstr "" @@ -566,40 +558,40 @@ msgstr "" msgid "Preprocessing elements..." msgstr "" -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "" +#: paper-stream.cc:36 +#, c-format +msgid "can't create directory: `%s'" +msgstr "" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "" -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "" -#: performance.cc:92 -msgid "Automatically generated" -msgstr "" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "" @@ -609,7 +601,15 @@ msgstr "" msgid "MIDI output to %s..." msgstr "" -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +msgid "unterminated phrasing slur" +msgstr "" + +#: phrasing-slur-engraver.cc:134 +msgid "can't find start of phrasing slur" +msgstr "" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, c-format msgid "can't find start of piano pedal: %s" @@ -619,15 +619,14 @@ msgstr "" msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "" @@ -640,39 +639,39 @@ msgstr "" msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:177 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "" -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "" -#: score.cc:101 +#: score.cc:112 #, c-format msgid "elapsed time: %.2f seconds" msgstr "" -#: scores.cc:34 +#: score-engraver.cc:177 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + +#: scores.cc:44 #, c-format -msgid "Writing dependency file: `%s'..." +msgid "dependencies output to %s..." msgstr "" -#: scores.cc:79 +#: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:122 +#: scores.cc:152 #, c-format msgid "Now processing: `%s'" msgstr "" @@ -687,14 +686,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "" - -#: slur-engraver.cc:143 -msgid "can't find start of slur" -msgstr "" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "" @@ -703,16 +694,28 @@ msgstr "" msgid "Slur over rest?" msgstr "" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "" + +#: slur-engraver.cc:142 +msgid "can't find start of slur" +msgstr "" + +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "" -#: stem.cc:117 -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:117 +msgid "Text_spanner too small" msgstr "" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 msgid "can't find start of text spanner" msgstr "" @@ -720,12 +723,13 @@ msgstr "" msgid "already have a text spanner" msgstr "" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 msgid "unterminated text spanner" msgstr "" -#: text-spanner.cc:115 -msgid "Text_spanner too small" +#: tfm.cc:77 +#, c-format +msgid "can't find ascii character: %d" msgstr "" #: tfm-reader.cc:105 @@ -738,11 +742,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, c-format -msgid "can't find ascii character: %d" -msgstr "" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" @@ -794,21 +793,19 @@ msgstr "" msgid "can't find or create: `%s'" msgstr "" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -829,106 +826,106 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 msgid "Must have duration object" msgstr "" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 msgid "Have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "" -#: parser.yy:1563 +#: parser.yy:1584 msgid "Have to be in Note mode for notes" msgstr "" -#: parser.yy:1659 +#: parser.yy:1680 msgid "Have to be in Chord mode for chords" msgstr "" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:597 +#: lexer.ll:602 #, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" diff --git a/po/nl.po b/po/nl.po index 10482e6c3a..c35e8b2d43 100644 --- 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: 2000-12-17 15:35+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 \n" "Language-Team: Dutch \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:26 scores.cc:38 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'" @@ -110,12 +110,17 @@ msgstr "kan teken niet vinden genaamd: `%s'" msgid "Error parsing AFM file: %s" msgstr "Fout bij ontleden AFM bestand: %s" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" -msgstr "checksum fout van font bestand: `%s'" +msgstr "checksum fout voor font bestand: `%s'" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "komt niet overeen met: `%s'" + +#: all-font-metrics.cc:91 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." @@ -123,12 +128,12 @@ msgstr "" "Bouw alle .afm bestanden opnieuw en verwijder alle .pk en .tfm bestanden. " "Voer nog eens uit met -V om font paden te tonen." -#: all-font-metrics.cc:153 +#: all-font-metrics.cc:155 #, c-format msgid "can't find font: `%s'" msgstr "kan font niet vinden: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "Laad verstek font" @@ -137,20 +142,28 @@ 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:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "(zoekpad: `%s')" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "Geef op" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "Kan niet wisselen van vertaler, ben al hier" +#: beam.cc:84 +msgid "beam has less than two stems" +msgstr "waardestreep heeft minder dan twee stokken" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "rare verticale waardestreep verplaatsing" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "kan start van waardestreep niet vinden" @@ -159,30 +172,22 @@ msgstr "kan start van waardestreep niet vinden" msgid "already have a beam" msgstr "heb al een waardestreep" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 msgid "unterminated beam" msgstr "onbeëindigde waardestreep" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 msgid "stem must have Rhythmic structure" msgstr "stok moet Ritmische structuur hebben" -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "stok past niet in waardestreep" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "waardestreep werd hier gestart" -#: beam.cc:83 -msgid "beam has less than two stems" -msgstr "waardestreep heeft minder dan twee stokken" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "rare verticale waardestreep verplaatsing" - #: break-align-item.cc:131 #, c-format msgid "unknown spacing pair `%s', `%s'" @@ -207,32 +212,28 @@ msgstr "Ben er zelf een" msgid "none of these in my family" msgstr "geen van deze in mijn gezin" -#: chord-tremolo-engraver.cc:119 -msgid "unterminated chord tremolo" -msgstr "onbeëindigd akkoordtremolo" - -#: chord-tremolo-iterator.cc:42 -msgid "no one to print a tremolos" -msgstr "niemand om tremolos af te drukken" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" +#: chord-tremolo-engraver.cc:141 +msgid "unterminated chord tremolo" +msgstr "onbeëindigd akkoordtremolo" + +#: chord-tremolo-iterator.cc:48 +msgid "no one to print a tremolos" +msgstr "niemand om tremolos af te drukken" + #: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "Te veel botsende nootkolommen. Negeer ze." -#: cross-staff.cc:24 -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "geen opgelegde aftstand: spanners tussen notenbalken kunnen breken" - #: debug.cc:26 msgid "floating point exception" msgstr "zwevende komma exceptie" @@ -245,36 +246,36 @@ msgstr "kan geheugen controle niet zetten!" msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "kan start van (de)crescendo niet vinden" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 msgid "already have a crescendo" msgstr "heb al een crescendo" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 msgid "already have a decrescendo" msgstr "heb al een decrescendo" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 msgid "unterminated (de)crescendo" msgstr "onbeëindigd (de)crescendo" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "onbeëindigde extender" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "" "Niets om extender aan linkerkant aan vast te maken. Negeer extender verzoek." -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "niemand om een herhalings haak af te drukken" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "kon geen enkel font vinden dat voldoet aan " @@ -307,13 +308,8 @@ msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "" "Niets om streepje aan linkerkant aan vast te maken. Negeer streepje verzoek." -#: identifier.cc:49 -#, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "verkeerd type identifier, verwachtte: `%s'" - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" @@ -349,99 +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:75 +#: main.cc:105 msgid "EXT" msgstr "EXT" -#: main.cc:75 +#: 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:76 main.cc:95 +#: main.cc:95 main.cc:106 msgid "this help" msgstr "deze hulp" -#: main.cc:77 +#: main.cc:107 msgid "FIELD" msgstr "VELD" -#: main.cc:77 +#: main.cc:107 msgid "write header field to BASENAME.FIELD" msgstr "schrijf kop veld naar BASISNAAM.VELD" -#: main.cc:78 +#: main.cc:108 main.cc:111 msgid "DIR" msgstr "DIR" -#: main.cc:78 +#: main.cc:108 msgid "add DIR to search path" msgstr "voeg DIR toe aan zoekpad" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:109 msgid "FILE" msgstr "BESTAND" -#: main.cc:79 +#: main.cc:109 msgid "use FILE as init file" msgstr "gebruik BESTAND als initialisatiebestand" -#: main.cc:80 +#: main.cc:110 msgid "write Makefile dependencies for every input file" msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand" -#: main.cc:81 +#: 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:82 -msgid "BASENAME" -msgstr "BASISNAAM" - -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" -msgstr "schrijf uitvoer naar BASISNAAM[-x].extensie" +#: main.cc:113 +msgid "NAME" +msgstr "NAAM" -#: main.cc:83 -msgid "show all changes in relative syntax" -msgstr "toon veranderingen voor relatieve mode" +#: main.cc:113 +msgid "write output to NAME" +msgstr "schrijf uitvoer naar NAAM" -#: main.cc:84 +#: main.cc:114 msgid "inhibit file output naming and exporting" msgstr "verbied naamgeving van uitvoer bestand en exportering" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:115 msgid "don't timestamp the output" msgstr "geen tijdsstempel in de uitvoer" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "zet experimentele kunstjes aan" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:116 msgid "print version number" msgstr "druk versienummer af" -#: main.cc:88 +#: main.cc:117 msgid "verbose" msgstr "breedsprakig" -#: main.cc:89 main.cc:106 +#: 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:106 +#: main.cc:135 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." -#: main.cc:108 +#: main.cc:137 msgid "Typeset music and or play MIDI from FILE" msgstr "Zet muziek en of speel MIDI van BESTAND" -#: main.cc:112 +#: 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" @@ -451,22 +443,22 @@ msgstr "" "uitgaande van een hoog niveau beschrijving bestand. LilyPond \n" "maakt deel uit van het GNU Project.\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:147 msgid "Options:" msgstr "Opties:" -#: main.cc:122 +#: 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:141 +#: 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 of " -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:178 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -478,16 +470,16 @@ msgstr "" "onder bepaalde voorwaarden. Roep aan als `%s --warranty' voor meer\n" "informatie.\n" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:185 main.cc:197 #, c-format msgid "Copyright (c) %s by" msgstr "Copyright (c) %s " -#: main.cc:166 +#: main.cc:195 msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- De Muziekzetter" -#: main.cc:71 main.cc:174 +#: 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" @@ -535,14 +527,14 @@ msgstr "rare duur" msgid "silly pitch" msgstr "rare toonhoogte" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 msgid "Error syncing file (disk full?)" msgstr "Fout by synchroniseren van bestand (disk vol?)" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, c-format -msgid "can't find `%s' context" -msgstr "kan `%s' context niet vinden" +msgid "Transposition by %s makes accidental larger than two" +msgstr "Transponering van %s geeft tripel kruizen/mollen" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -556,17 +548,17 @@ msgstr "ly_set_mus_property (): Geen symbool" msgid "ly_set_mus_property (): not of type Music" msgstr "ly_set_mus_property (): niet van type Muziek" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "Transponering van %s geeft tripel kruizen/mollen" +msgid "can't find `%s' context" +msgstr "kan `%s' context niet vinden" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "Identifier naam is een sleutelwoord: `%s'" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "fout bij EOF: %s" @@ -584,16 +576,16 @@ msgstr "Haakjes paren niet" msgid "Junking request: `%s'" msgstr "Schroot verzoek: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, c-format msgid "paper output to %s..." msgstr "papier uitvoer naar %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", bij " -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, c-format msgid "writing header field %s to %s..." msgstr "Schijven van kop veld %s naar bestand %s..." @@ -602,40 +594,40 @@ msgstr "Schijven van kop veld %s naar bestand %s..." msgid "Preprocessing elements..." msgstr "Voorbewerken van elementen..." -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "Uitvoer van Score, gedefinieerd op: " +#: paper-stream.cc:36 +#, c-format +msgid "can't create directory: `%s'" +msgstr "kan directory niet scheppen: `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, c-format msgid "I'm one myself: `%s'" msgstr "Ben er zelf een: `%s'" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, c-format msgid "none of these in my family: `%s'" msgstr "geen van deze in mijn gezin: `%s'" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "Spoor ... " -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "Schepper: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "Automatisch gegenerederd" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "van muzikale definitie: %s" @@ -645,7 +637,15 @@ msgstr "van muzikale definitie: %s" msgid "MIDI output to %s..." msgstr "MIDI uitvoer naar %s..." -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +msgid "unterminated phrasing slur" +msgstr "onbeëindigde fraseringsboog" + +#: phrasing-slur-engraver.cc:134 +msgid "can't find start of phrasing slur" +msgstr "kan start van fraseringsboog niet vinden" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, c-format msgid "can't find start of piano pedal: %s" @@ -655,8 +655,7 @@ msgstr "kan start van piano pedaal niet vinden: %s" msgid "Pitch arguments out of range" msgstr "Toonhoogte argumenten buiten schaal" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" @@ -665,7 +664,7 @@ msgstr "" "%s is verouderd. Gebruik\n" " \\property %s.%s \\override #'%s = #%s" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "Verkeerd type voor property: %s, type: %s, gevonden: %s, type: %s" @@ -678,39 +677,39 @@ msgstr "te veel botsende rusten" msgid "too many notes for rest collision" msgstr "te veel noten voor bosting met rusten" -#: score-engraver.cc:177 -#, c-format -msgid "unbound spanner `%s'" -msgstr "ongebonden spanner `%s'" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "Vertolken van muziek..." -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "Heb muziek nodig in een partituur" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "Fouten gevonden, /*verwerk partituur niet */" -#: score.cc:101 +#: score.cc:112 #, c-format msgid "elapsed time: %.2f seconds" msgstr "duur: %.2f seconden" -#: scores.cc:34 +#: score-engraver.cc:177 +#, c-format +msgid "unbound spanner `%s'" +msgstr "ongebonden spanner `%s'" + +#: scores.cc:44 #, c-format -msgid "Writing dependency file: `%s'..." -msgstr "Schijven van afhankelijkheden bestand: `%s'..." +msgid "dependencies output to %s..." +msgstr "afhankelijkheden uitvoer naar %s..." -#: scores.cc:79 +#: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "Partituur bevat fouten; zal hem niet verwerken" -#: scores.cc:122 +#: scores.cc:152 #, c-format msgid "Now processing: `%s'" msgstr "Nu wordt verwerkt: `%s'" @@ -725,14 +724,6 @@ msgstr "Weet niet hoe articulatie te vertolken `%s'" msgid "Separation_item: I've been drinking too much" msgstr "Separation_item: Ik heb te veel gedronken" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "onbeëindigde bindingsboog" - -#: slur-engraver.cc:143 -msgid "can't find start of slur" -msgstr "kan start van bindingsboog niet vinden" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "Zet bindingsboog over rust. Negeer." @@ -741,16 +732,28 @@ msgstr "Zet bindingsboog over rust. Negeer." msgid "Slur over rest?" msgstr "Boogje over rust?" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "onbeëindigde bindingsboog" + +#: slur-engraver.cc:142 +msgid "can't find start of slur" +msgstr "kan start van bindingsboog niet vinden" + +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)" -#: stem.cc:117 -msgid "Weird stem size; check for narrow beams" -msgstr "Vreemde stoklengte; controleer op krappe waardestrepen" +#: text-spanner.cc:117 +msgid "Text_spanner too small" +msgstr "Text_spanner te klein" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 msgid "can't find start of text spanner" msgstr "kan start van tekst spanner niet vinden" @@ -758,13 +761,14 @@ msgstr "kan start van tekst spanner niet vinden" msgid "already have a text spanner" msgstr "heb al een tekst spanner" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 msgid "unterminated text spanner" msgstr "onbeëindigde tekst spanner" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "Text_spanner te klein" +#: tfm.cc:77 +#, c-format +msgid "can't find ascii character: %d" +msgstr "kan ascii teken niet vinden: %d" #: tfm-reader.cc:105 #, c-format @@ -777,11 +781,6 @@ msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" "%s: TFM bestand heeft %u parameters, wat meer is dan de %u die ik aan kan" -#: tfm.cc:77 -#, c-format -msgid "can't find ascii character: %d" -msgstr "kan ascii teken niet vinden: %d" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "Geen overbindingen geschapen!" @@ -833,22 +832,20 @@ msgstr "kan niet vinden of scheppen `%s' genaamd `%s'" msgid "can't find or create: `%s'" msgstr "kan niet vinden of scheppen: `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" "Kan geen type-controle vinden voor property `%s'. Misschien een tikfout?" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" -msgstr "Type contole gefaald voor `%s', waarde `%s' moet type hebben: `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" +msgstr "Type contole gefaald voor `%s'; waarde `%s' moet type hebben: `%s'" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "ly-get-trans-property: verwacht een Translator_group argument" @@ -869,107 +866,107 @@ msgstr "Heb ook al een gestopte spanner. Geef op." msgid "Oldest supported input version: %s" msgstr "Oudst ondersteunde invoerversie: %s" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "Verkeerd type voor property waarde" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" "Meer alternatieven dan herhalingen. Schroot overvloedige alternatieven." -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "Tweede argument moet een symbool zijn" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "Eerste argument moet een procedure zijn met 1 argument" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "Verwacht string voor script definitie" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "Kan richting voor dit verzoek niet specificeren" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "Verwacht musical-pitch waarde" -#: parser.yy:1359 +#: parser.yy:1364 msgid "Must have duration object" msgstr "Moet duur object hebben" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 msgid "Have to be in Lyric mode for lyrics" msgstr "Moet in Lyric modus zijn voor liedteksten" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "geen duur: %d" -#: parser.yy:1563 +#: parser.yy:1584 msgid "Have to be in Note mode for notes" msgstr "Moet in Note modus zijn voor noten" -#: parser.yy:1659 +#: parser.yy:1680 msgid "Have to be in Chord mode for chords" msgstr "Moet in Chord modus zijn voor accoorden" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "heb integer getal arg nogig" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "Moet positieve integer zijn" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "EOF gevonden in een kommentaar" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "\\maininput niet toegestaan buiten init bestanden" -#: lexer.ll:202 +#: lexer.ll:203 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "verkeerde of ongedefiniëerde identifier: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "Aanhalingsteken sluiten mist" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "wit verwacht" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "Kan Scheme niet evalueren in veilige modus" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "ongeldig teken: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "onbekende ontsnapte string: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "verkeerde lilypond versie: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "Overweeg de invoer te converteren met het convert-ly script" diff --git a/po/ru.po b/po/ru.po index daa64e7b53..acdd915656 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-12-17 15:35+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 \n" "Language-Team: Russian \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:26 scores.cc:38 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'" @@ -100,23 +100,28 @@ msgstr " msgid "Error parsing AFM file: %s" msgstr "ïÛÉÂËÁ ÐÒÉ ÁÎÁÌÉÚÅ ÆÁÊÌÁ AFM" -#: all-font-metrics.cc:87 +#: all-font-metrics.cc:84 #, c-format msgid "checksum mismatch for font file: `%s'" msgstr "" -#: all-font-metrics.cc:92 +#: all-font-metrics.cc:86 +#, c-format +msgid "does not match: `%s'" +msgstr "" + +#: all-font-metrics.cc:91 msgid "" " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V " "to show font paths." msgstr "" -#: all-font-metrics.cc:153 +#: all-font-metrics.cc:155 #, c-format msgid "can't find font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ: `%s'" -#: all-font-metrics.cc:154 +#: all-font-metrics.cc:156 msgid "Loading default font" msgstr "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ" @@ -125,20 +130,28 @@ msgstr " msgid "can't find default font: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ: `%s'" -#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:107 +#: all-font-metrics.cc:172 includable-lexer.cc:50 scores.cc:137 #, c-format msgid "(search path: `%s')" msgstr "(ÐÕÔØ ÐÏÉÓËÁ: `%s')" -#: all-font-metrics.cc:173 parser.yy:1642 +#: all-font-metrics.cc:173 parser.yy:1663 msgid "Giving up" msgstr "óÄÁÀÓØ" #: auto-change-iterator.cc:43 change-iterator.cc:59 -#: part-combine-music-iterator.cc:85 +#: part-combine-music-iterator.cc:97 msgid "Can't switch translators, I'm there already" msgstr "îÅ ÍÏÇÕ ÐÅÒÅËÌÀÞÉÔØ ÐÅÒÅ×ÏÄÞÉËÏ×, Ñ ÕÖÅ ÔÁÍ" +#: beam.cc:84 +msgid "beam has less than two stems" +msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" + +#: beam.cc:635 +msgid "weird beam vertical offset" +msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + #: beam-engraver.cc:91 beam-engraver.cc:124 msgid "can't find start of beam" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" @@ -147,30 +160,22 @@ msgstr " msgid "already have a beam" msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ" -#: beam-engraver.cc:224 +#: beam-engraver.cc:222 msgid "unterminated beam" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÇÒÕÐÐÉÒÏ×ËÁ ÛÔÉÌÅÊ" -#: beam-engraver.cc:262 chord-tremolo-engraver.cc:178 +#: beam-engraver.cc:260 chord-tremolo-engraver.cc:195 msgid "stem must have Rhythmic structure" msgstr "ÛÔÉÌØ ÄÏÌÖÅÎ ÉÍÅÔØ ÒÉÔÍÏ×ÕÀ ÓÔÒÕËÔÕÒÕ" -#: beam-engraver.cc:274 +#: beam-engraver.cc:272 msgid "stem doesn't fit in beam" msgstr "ÛÔÉÌØ ÎÅ ×ÌÅÚÁÅÔ × ÇÒÕÐÐÉÒÏ×ËÕ" -#: beam-engraver.cc:275 +#: beam-engraver.cc:273 msgid "beam was started here" msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÎÁÞÉÎÁÌÁÓØ ÚÄÅÓØ" -#: beam.cc:83 -msgid "beam has less than two stems" -msgstr "ÇÒÕÐÐÉÒÏ×ËÁ ÍÅÎÅÅ Ä×ÕÈ ÛÔÉÌÅÊ" - -#: beam.cc:506 -msgid "weird beam vertical offset" -msgstr "ÄÉËÏÅ ×ÅÒÔÉËÁÌØÎÏÅ ÓÍÅÝÅÎÉÅ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" - #: break-align-item.cc:131 #, fuzzy, c-format msgid "unknown spacing pair `%s', `%s'" @@ -195,35 +200,29 @@ msgstr " msgid "none of these in my family" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: chord-tremolo-engraver.cc:119 -msgid "unterminated chord tremolo" -msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" - -#: chord-tremolo-iterator.cc:42 -#, fuzzy -msgid "no one to print a tremolos" -msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" - -#: chord.cc:365 +#: chord.cc:369 #, c-format msgid "invalid subtraction: not part of chord: %s" msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÞÉÔÁÎÉÅ: ÎÅ ÞÁÓÔØ ÁËËÏÒÄÁ: %s" -#: chord.cc:394 +#: chord.cc:398 #, c-format msgid "invalid inversion pitch: not part of chord: %s" msgstr "" +#: chord-tremolo-engraver.cc:141 +msgid "unterminated chord tremolo" +msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" + +#: chord-tremolo-iterator.cc:48 +#, fuzzy +msgid "no one to print a tremolos" +msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" + #: collision.cc:116 msgid "Too many clashing notecolumns. Ignoring them." msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÐÅÒÅÓÅËÁÀÝÉÈÓÑ ÓÔÏÌÂÃÏ× ÎÏÔ. éÇÎÏÒÉÒÕÀ." -#: cross-staff.cc:24 -#, fuzzy -msgid "not a forced distance; cross-staff spanners may be broken" -msgstr "" -"minVerticalAlign != maxVerticalAlign: ÍÅÖÄÕÓÔÒÏÞÎÙÅ ÌÉÇÉ ÍÏÇÕÔ ÂÙÔØ ÎÅ×ÅÒÎÙÍÉ" - #: debug.cc:26 msgid "floating point exception" msgstr "ÉÓËÌÀÞÅÎÉÅ ÁÒÉÆÍÅÔÉËÉ Ó ÐÌÁ×ÁÀÝÅÊ ÚÁÐÑÔÏÊ" @@ -236,35 +235,35 @@ msgstr " msgid "NaN" msgstr "NaN" -#: dynamic-engraver.cc:198 span-dynamic-performer.cc:86 +#: dynamic-engraver.cc:194 span-dynamic-performer.cc:86 msgid "can't find start of (de)crescendo" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÎÁÞÁÌÏ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: dynamic-engraver.cc:220 +#: dynamic-engraver.cc:219 msgid "already have a crescendo" msgstr "ËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:221 +#: dynamic-engraver.cc:220 msgid "already have a decrescendo" msgstr "ÄÅËÒÅÝÅÎÄÏ ÕÖÅ ÅÓÔØ" -#: dynamic-engraver.cc:298 +#: dynamic-engraver.cc:303 msgid "unterminated (de)crescendo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ (ÄÅ)ËÒÅÝÅÎÄÏ" -#: extender-engraver.cc:98 +#: extender-engraver.cc:97 msgid "unterminated extender" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" -#: extender-engraver.cc:110 +#: extender-engraver.cc:109 msgid "Nothing to connect extender to on the left. Ignoring extender request." msgstr "îÅËÕÄÁ ÐÒÉÓÏÅÄÉÎÉÔØ ÒÁÓÛÉÒÉÔÅÌØ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÒÁÓÛÉÒÉÔÅÌÑ." -#: folded-repeat-iterator.cc:70 +#: folded-repeat-iterator.cc:78 msgid "no one to print a repeat brace" msgstr "ÎÅËÏÍÕ ÒÉÓÏ×ÁÔØ ÓËÏÂÕ ÐÏ×ÔÏÒÁ" -#: font-interface.cc:199 +#: font-interface.cc:220 msgid "couldn't find any font satisfying " msgstr "" @@ -297,13 +296,8 @@ msgstr " msgid "Nothing to connect hyphen to on the left. Ignoring hyphen request." msgstr "îÅ Ë ÞÅÍÕ ÐÒÉÓÏÅÄÉÎÉÔØ ÐÅÒÅÎÏÓ ÓÌÅ×Á. éÇÎÏÒÉÒÕÀ ÚÁÐÒÏÓ ÐÅÒÅÎÏÓÁ." -#: identifier.cc:49 -#, c-format -msgid "wrong identifier type, expected: `%s'" -msgstr "ÎÅ×ÅÒÎÙÊ ÔÉÐ ÐÅÒÅÍÅÎÎÏÊ, ÏÖÉÄÁÌÓÑ: `%s'" - #: includable-lexer.cc:48 lily-guile.cc:139 midi-score-parser.cc:24 -#: scores.cc:106 scores.cc:112 +#: scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" @@ -339,102 +333,100 @@ msgstr "" msgid "Huh? Melismatic note found to have associated lyrics." msgstr "" -#: main.cc:75 +#: main.cc:105 msgid "EXT" msgstr "òáóû" -#: main.cc:75 +#: main.cc:105 #, fuzzy msgid "use output format EXT (scm, ps, tex or as)" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ×ÙÈÏÄÎÏÊ ÆÏÒÍÁÔ òáóû" -#: main.cc:76 main.cc:95 +#: main.cc:95 main.cc:106 msgid "this help" msgstr "ÜÔÁ ÓÐÒÁ×ËÁ" -#: main.cc:77 +#: main.cc:107 #, fuzzy msgid "FIELD" msgstr "æáêì" -#: main.cc:77 +#: main.cc:107 msgid "write header field to BASENAME.FIELD" msgstr "" -#: main.cc:78 +#: main.cc:108 main.cc:111 msgid "DIR" msgstr "ëáô" -#: main.cc:78 +#: main.cc:108 msgid "add DIR to search path" msgstr "ÄÏÂÁ×ÉÔØ ëáô Ë ÐÕÔÉ ÐÏÉÓËÁ" -#: main.cc:79 main.cc:98 +#: main.cc:98 main.cc:109 msgid "FILE" msgstr "æáêì" -#: main.cc:79 +#: main.cc:109 msgid "use FILE as init file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ æáêì ËÁË ÆÁÊÌ ÉÎÉÃÉÁÌÉÚÁÃÉÉ" -#: main.cc:80 +#: main.cc:110 msgid "write Makefile dependencies for every input file" msgstr "ÚÁÐÉÓÙ×ÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ Makefile ÄÌÑ ËÁÖÄÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: main.cc:81 +#: main.cc:111 +msgid "prepend DIR to dependencies" +msgstr "" + +#: main.cc:112 msgid "produce MIDI output only" msgstr "ÐÒÏÉÚ×ÏÄÉÔØ ×Ù×ÏÄ ÔÏÌØËÏ MIDI" -#: main.cc:82 -msgid "BASENAME" +#: main.cc:113 +#, fuzzy +msgid "NAME" msgstr "ïóîï÷á" -#: main.cc:82 -msgid "write output to BASENAME[-x].extension" +#: main.cc:113 +#, fuzzy +msgid "write output to NAME" msgstr "ÚÁÐÉÓÙ×ÁÔØ ×Ù×ÏÄ × ïóîï÷á[-x].ÒÁÓÛÉÒÅÎÉÅ" -#: main.cc:83 -msgid "show all changes in relative syntax" -msgstr "ÐÏËÁÚÙ×ÁÔØ ×ÓÅ ÉÚÍÅÎÅÎÉÑ × ÏÔÎÏÓÉÔÅÌØÎÏÍ ÓÉÎÔÁËÓÉÓÅ" - -#: main.cc:84 +#: main.cc:114 msgid "inhibit file output naming and exporting" msgstr "ÓËÒÙÔØ ÉÍÅÎÏ×ÁÎÉÅ É ÜËÓÐÏÒÔ ×Ù×ÏÄÁ × ÆÁÊÌ" -#: main.cc:85 main.cc:103 +#: main.cc:103 main.cc:115 msgid "don't timestamp the output" msgstr "ÎÅ ÏÔÍÅÞÁÔØ ÄÁÔÕ É ×ÒÅÍÑ ×Ù×ÏÄÁ" -#: main.cc:86 -msgid "switch on experimental features" -msgstr "×ËÌÀÞÉÔØ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ" - -#: main.cc:87 main.cc:104 +#: main.cc:104 main.cc:116 msgid "print version number" msgstr "×Ù×ÏÄÉÔØ ÎÏÍÅÒ ×ÅÒÓÉÉ" -#: main.cc:88 +#: main.cc:117 #, fuzzy msgid "verbose" msgstr "ÂÙÔØ ÂÏÌÔÌÉ×ÙÍ" -#: main.cc:89 main.cc:106 +#: main.cc:106 main.cc:118 msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" #. #. No version number or newline here. It confuses help2man #. -#: main.cc:106 +#: main.cc:135 #, c-format msgid "Usage: %s [OPTION]... [FILE]..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." -#: main.cc:108 +#: main.cc:137 msgid "Typeset music and or play MIDI from FILE" msgstr "îÁÂÉÒÁÔØ ÍÕÚÙËÕ É/ÉÌÉ ÐÒÏÉÇÒÙ×ÁÔØ MIDI ÉÚ æáêìÁ" -#: main.cc:112 +#: 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" @@ -444,20 +436,20 @@ msgstr "" "ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" -#: main.cc:118 main.cc:119 +#: main.cc:119 main.cc:147 msgid "Options:" msgstr "ïÐÃÉÉ:" -#: main.cc:122 +#: main.cc:151 msgid "This binary was compiled with the following options:" msgstr "üÔÏÔ ÉÓÐÏÌÎÑÅÍÙÊ ÆÁÊÌ ÂÙÌ ÓÏÂÒÁÎ ÓÏ ÓÌÅÄÕÀÝÉÍÉ ÏÐÃÉÑÍÉ:" -#: main.cc:123 main.cc:141 +#: main.cc:123 main.cc:170 #, c-format msgid "Report bugs to %s" msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s" -#: main.cc:55 main.cc:149 +#: main.cc:55 main.cc:178 #, c-format msgid "" "This is free software. It is covered by the GNU General Public License,\n" @@ -469,17 +461,17 @@ msgstr "" "ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%s --warranty' ÄÌÑ\n" "ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: main.cc:62 main.cc:156 main.cc:168 +#: main.cc:62 main.cc:185 main.cc:197 #, c-format msgid "Copyright (c) %s by" msgstr "÷ÓÅ ÐÒÁ×Á ÚÁÝÉÝÅÎÙ (c) %s by" -#: main.cc:166 +#: main.cc:195 #, fuzzy msgid "GNU LilyPond -- The music typesetter" msgstr "GNU LilyPond -- îÁÂÏÒÝÉË ÍÕÚÙËÉ ðÒÏÅËÔÁ GNU" -#: main.cc:71 main.cc:174 +#: 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" @@ -514,14 +506,14 @@ msgstr " msgid "silly pitch" msgstr "ÇÌÕÐÙÊ ÔÏÎ" -#: midi-stream.cc:29 paper-stream.cc:36 +#: midi-stream.cc:29 paper-stream.cc:50 msgid "Error syncing file (disk full?)" msgstr "ïÛÉÂËÁ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÆÁÊÌÁ (ÄÉÓË ÐÅÒÅÐÏÌÎÅÎ?)" -#: music-output-def.cc:72 +#: musical-request.cc:29 #, c-format -msgid "can't find `%s' context" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" +msgid "Transposition by %s makes accidental larger than two" +msgstr "" #: music.cc:222 msgid "ly_get_mus_property (): Not a Music" @@ -535,17 +527,17 @@ msgstr "" msgid "ly_set_mus_property (): not of type Music" msgstr "" -#: musical-request.cc:29 +#: music-output-def.cc:115 #, c-format -msgid "Transposition by %s makes accidental larger than two" -msgstr "" +msgid "can't find `%s' context" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ËÏÎÔÅËÓÔ `%s'" -#: my-lily-lexer.cc:132 +#: my-lily-lexer.cc:137 #, c-format msgid "Identifier name is a keyword: `%s'" msgstr "éÍÑ ËÏÍÁÎÄÙ Ñ×ÌÑÅÔÓÑ ËÌÀÞÅ×ÙÍ ÓÌÏ×ÏÍ: `%s'" -#: my-lily-lexer.cc:151 +#: my-lily-lexer.cc:157 #, c-format msgid "error at EOF: %s" msgstr "ÏÛÍÂËÁ × ËÏÎÃÅ ÆÁÊÌÁ: %s" @@ -563,16 +555,16 @@ msgstr " msgid "Junking request: `%s'" msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÚÁÐÒÏÓ: `%s'" -#: paper-def.cc:116 +#: paper-def.cc:109 #, c-format msgid "paper output to %s..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: mudela-stream.cc:93 paper-outputter.cc:93 performance.cc:97 +#: mudela-stream.cc:93 paper-outputter.cc:94 performance.cc:102 msgid ", at " msgstr ", ×" -#: paper-outputter.cc:239 +#: paper-outputter.cc:240 #, fuzzy, c-format msgid "writing header field %s to %s..." msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." @@ -581,40 +573,40 @@ msgstr " msgid "Preprocessing elements..." msgstr "ðÒÅÄ×ÁÒÉÔÅÌØÎÏ ÏÂÒÁÂÁÔÙ×ÁÀ ÜÌÅÍÅÎÔÙ..." -#: paper-score.cc:105 +#: paper-score.cc:112 msgid "Outputting Score, defined at: " msgstr "" +#: paper-stream.cc:36 +#, fuzzy, c-format +msgid "can't create directory: `%s'" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" + #. #. We could change the current translator's id, but that would make #. errors hard to catch #. #. last->translator_id_str_ = change_l ()->change_to_id_str_; #. -#: part-combine-music-iterator.cc:104 +#: part-combine-music-iterator.cc:116 #, fuzzy, c-format msgid "I'm one myself: `%s'" msgstr "ñ ÅÄÉÎÓÔ×ÅÎÎÙÊ" -#: part-combine-music-iterator.cc:107 +#: part-combine-music-iterator.cc:119 #, fuzzy, c-format msgid "none of these in my family: `%s'" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: performance.cc:50 +#: performance.cc:51 msgid "Track ... " msgstr "äÏÒÏÖËÁ ..." -#. perhaps multiple text events? -#: performance.cc:77 +#: performance.cc:79 msgid "Creator: " msgstr "óÏÚÄÁÔÅÌØ: " -#: performance.cc:92 -msgid "Automatically generated" -msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ" - -#: performance.cc:106 +#: performance.cc:111 #, c-format msgid "from musical definition: %s" msgstr "ÉÚ ÍÕÚÙËÁÌØÎÏÊ ÎÏÔÁÃÉÉ %s" @@ -624,7 +616,17 @@ msgstr " msgid "MIDI output to %s..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: piano-pedal-engraver.cc:144 piano-pedal-engraver.cc:156 +#: phrasing-slur-engraver.cc:119 +#, fuzzy +msgid "unterminated phrasing slur" +msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" + +#: phrasing-slur-engraver.cc:134 +#, fuzzy +msgid "can't find start of phrasing slur" +msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + +#: piano-pedal-engraver.cc:142 piano-pedal-engraver.cc:154 #: piano-pedal-performer.cc:87 #, fuzzy, c-format msgid "can't find start of piano pedal: %s" @@ -634,15 +636,14 @@ msgstr " msgid "Pitch arguments out of range" msgstr "" -#. warning () ? -#: property-engraver.cc:124 +#: property-engraver.cc:121 #, c-format msgid "" "%s is deprecated. Use\n" " \\property %s.%s \\override #'%s = #%s" msgstr "" -#: property-engraver.cc:150 +#: property-engraver.cc:145 #, c-format msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s" msgstr "" @@ -655,39 +656,39 @@ msgstr " msgid "too many notes for rest collision" msgstr "" -#: score-engraver.cc:177 -#, c-format -msgid "unbound spanner `%s'" -msgstr "" - -#: score.cc:67 +#: score.cc:78 msgid "Interpreting music..." msgstr "éÎÔÅÒÐÒÅÔÉÒÕÀ ÍÕÚÙËÕ..." -#: score.cc:81 +#: score.cc:92 msgid "Need music in a score" msgstr "" #. should we? hampers debugging. -#: score.cc:94 +#: score.cc:105 msgid "Errors found/*, not processing score*/" msgstr "îÁÊÄÅÎÙ ÏÛÉÂËÉ/*, ÎÅ ÏÂÒÁÂÁÔÙ×ÁÀ ÎÏÔÙ*/" -#: score.cc:101 +#: score.cc:112 #, c-format msgid "elapsed time: %.2f seconds" msgstr "ÚÁÔÒÁÞÅÎÎÏÅ ×ÒÅÍÑ: %.2f ÓÅËÕÎÄ" -#: scores.cc:34 +#: score-engraver.cc:177 +#, c-format +msgid "unbound spanner `%s'" +msgstr "" + +#: scores.cc:44 #, fuzzy, c-format -msgid "Writing dependency file: `%s'..." -msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." +msgid "dependencies output to %s..." +msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: scores.cc:79 +#: scores.cc:106 msgid "Score contains errors; will not process it" msgstr "" -#: scores.cc:122 +#: scores.cc:152 #, fuzzy, c-format msgid "Now processing: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" @@ -703,15 +704,6 @@ msgstr "" msgid "Separation_item: I've been drinking too much" msgstr "Single_malt_grouping_item: Ñ ÌÉÛËÏÍ ÍÎÏÇÏ ×ÙÐÉÌ" -#: slur-engraver.cc:128 -msgid "unterminated slur" -msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" - -#: slur-engraver.cc:143 -#, fuzzy -msgid "can't find start of slur" -msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" - #: slur.cc:49 msgid "Putting slur over rest. Ignoring." msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ." @@ -720,16 +712,29 @@ msgstr " msgid "Slur over rest?" msgstr "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ?" +#: slur-engraver.cc:127 +msgid "unterminated slur" +msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÌÉÇÁ" + +#: slur-engraver.cc:142 +#, fuzzy +msgid "can't find start of slur" +msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" + +#: stem.cc:116 +msgid "Weird stem size; check for narrow beams" +msgstr "" + #: stem-engraver.cc:115 #, c-format msgid "Adding note head to incompatible stem (type = %d)" msgstr "äÏÂÁ×ÌÑÀ ÎÏÔÕ Ë ÎÅÓÏ×ÍÅÓÔÉÍÏÍÕ ÛÔÉÌÀ (ÔÉÐ = %d)" -#: stem.cc:117 -msgid "Weird stem size; check for narrow beams" +#: text-spanner.cc:117 +msgid "Text_spanner too small" msgstr "" -#: text-spanner-engraver.cc:95 +#: text-spanner-engraver.cc:94 #, fuzzy msgid "can't find start of text spanner" msgstr "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ" @@ -739,14 +744,15 @@ msgstr " msgid "already have a text spanner" msgstr "ÕÖÅ ÉÍÅÅÍ ÇÒÕÐÐÕ ÛÔÉÌÅÊ" -#: text-spanner-engraver.cc:167 +#: text-spanner-engraver.cc:169 #, fuzzy msgid "unterminated text spanner" msgstr "ÎÅÚÁ×ÅÒÛÅÎÎÙÊ ÒÁÓÛÉÒÉÔÅÌØ" -#: text-spanner.cc:115 -msgid "Text_spanner too small" -msgstr "" +#: tfm.cc:77 +#, fuzzy, c-format +msgid "can't find ascii character: %d" +msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" #: tfm-reader.cc:105 #, c-format @@ -758,11 +764,6 @@ msgstr "" msgid "%s: TFM file has %u parameters, which is more than the %u I can handle" msgstr "" -#: tfm.cc:77 -#, fuzzy, c-format -msgid "can't find ascii character: %d" -msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÓÉÍ×ÏÌ ASCII: `%d'" - #: tie-engraver.cc:212 tie-performer.cc:173 msgid "No ties were created!" msgstr "" @@ -814,21 +815,19 @@ msgstr "" msgid "can't find or create: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÉÌÉ ÓÏÚÄÁÔØ: `%s'" -#. warning () ? -#: translator-group.cc:405 +#: translator-group.cc:403 #, c-format msgid "" "Can't find property type-check for `%s'. Perhaps you made a typing error?" msgstr "" -#. warning () ? -#: translator-group.cc:420 +#: translator-group.cc:417 #, c-format -msgid "Failed typecheck for `%s', value `%s' must be of type `%s'" +msgid "Type check for `%s' failed; value `%s' must be of type `%s'" msgstr "" #. programming_error? -#: translator-group.cc:440 +#: translator-group.cc:436 msgid "ly-get-trans-property: expecting a Translator_group argument" msgstr "" @@ -849,107 +848,107 @@ msgstr "" msgid "Oldest supported input version: %s" msgstr "" -#: parser.yy:467 +#: parser.yy:471 msgid "Wrong type for property value" msgstr "" -#: parser.yy:668 +#: parser.yy:666 msgid "More alternatives than repeats. Junking excess alternatives." msgstr "" -#: parser.yy:732 +#: parser.yy:730 msgid "Second argument must be a symbol" msgstr "÷ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÓÉÍ×ÏÌÏÍ" -#: parser.yy:737 +#: parser.yy:735 msgid "First argument must be a procedure taking 1 argument" msgstr "" -#: parser.yy:1217 +#: parser.yy:1211 msgid "Expecting string as script definition" msgstr "" -#: parser.yy:1227 +#: parser.yy:1221 msgid "Can't specify direction for this request" msgstr "îÅ ÍÏÇÕ ÕËÁÚÁÔØ ÎÁÐÒÁ×ÌÅÎÉÅ ÄÌÑ ÜÔÏÇÏ ÚÁÐÒÏÓÁ" -#: parser.yy:1348 +#: parser.yy:1353 msgid "Expecting musical-pitch value" msgstr "" -#: parser.yy:1359 +#: parser.yy:1364 #, fuzzy msgid "Must have duration object" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÎÁÉÍÅÎØÛÕÀ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ" -#: parser.yy:1368 parser.yy:1376 parser.yy:1640 +#: parser.yy:1373 parser.yy:1381 parser.yy:1661 msgid "Have to be in Lyric mode for lyrics" msgstr "äÏÌÖÅÎ ÂÙÔØ × ìÉÒÉÞÅÓËÏÍ ÒÅÖÉÍÅ ÄÌÑ ÌÉÒÉËÉ" -#: parser.yy:1525 parser.yy:1554 +#: parser.yy:1546 parser.yy:1575 #, c-format msgid "not a duration: %d" msgstr "ÎÅ ÐÒÏÄÏÌÖÉÔÅÌØÎÏÓÔØ: %d" -#: parser.yy:1563 +#: parser.yy:1584 msgid "Have to be in Note mode for notes" msgstr "äÏÌÖÅÎ ÂÙÔØ × îÏÔÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÎÏÔ" -#: parser.yy:1659 +#: parser.yy:1680 msgid "Have to be in Chord mode for chords" msgstr "äÏÌÖÅÎ ÂÙÔØ × áËËÏÒÄÎÏÍ ÒÅÖÉÍÅ ÄÌÑ ÁËËÏÒÄÏ×" -#: parser.yy:1821 parser.yy:1839 +#: parser.yy:1842 parser.yy:1860 msgid "need integer number arg" msgstr "" -#: parser.yy:1825 +#: parser.yy:1846 msgid "Must be positive integer" msgstr "" -#: lexer.ll:164 +#: lexer.ll:165 msgid "EOF found inside a comment" msgstr "ëÏÎÅà ÆÁÊÌÁ ×ÎÕÔÒÉ ËÏÍÍÅÎÔÁÒÉÑ" -#: lexer.ll:178 +#: lexer.ll:179 msgid "\\maininput disallowed outside init files" msgstr "" -#: lexer.ll:202 +#: lexer.ll:203 #, fuzzy, c-format msgid "wrong or undefined identifier: `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÍÅÔËÁ/ËÏÍÁÎÄÁ: `%s'" #. backup rule -#: lexer.ll:207 +#: lexer.ll:208 msgid "Missing end quote" msgstr "ïÔÓÕÔÓ×ÕÅÔ ÚÁËÌÀÞÉÔÅÌØÎÁÑ ËÁ×ÙÞËÁ" #. backup rule -#: lexer.ll:229 lexer.ll:233 +#: lexer.ll:230 lexer.ll:234 msgid "white expected" msgstr "× ÔÏ ×ÒÅÍÑ ËÁË ÏÖÉÄÁÌÏÓØ" -#: lexer.ll:241 +#: lexer.ll:243 msgid "Can't evaluate Scheme in safe mode" msgstr "îÅ ÍÏÇÕ ×ÙÐÏÌÎÑÔØ ËÏÄ ÓÈÅÍÙ × ÂÅÚÏÐÁÓÎÏÍ ÒÅÖÉÍÅ" -#: lexer.ll:433 +#: lexer.ll:439 #, c-format msgid "invalid character: `%c'" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: lexer.ll:515 +#: lexer.ll:520 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `\\%s'" -#: lexer.ll:597 +#: lexer.ll:602 #, fuzzy, c-format msgid "incorrect lilypond version: %s (%s, %s)" msgstr "ÎÅ×ÅÒÎÁÑ ×ÅÒÓÉÑ mudela: %s (%s, %s)" -#: lexer.ll:598 +#: lexer.ll:603 msgid "Consider converting the input with the convert-ly script" msgstr "" @@ -1159,6 +1158,27 @@ msgstr "% msgid "% from input file: " msgstr "% ÉÚ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ: " +#, fuzzy +#~ msgid "not a forced distance; cross-staff spanners may be broken" +#~ msgstr "" +#~ "minVerticalAlign != maxVerticalAlign: ÍÅÖÄÕÓÔÒÏÞÎÙÅ ÌÉÇÉ ÍÏÇÕÔ ÂÙÔØ ÎÅ×ÅÒÎÙÍÉ" + +#~ msgid "wrong identifier type, expected: `%s'" +#~ msgstr "ÎÅ×ÅÒÎÙÊ ÔÉÐ ÐÅÒÅÍÅÎÎÏÊ, ÏÖÉÄÁÌÓÑ: `%s'" + +#~ msgid "show all changes in relative syntax" +#~ msgstr "ÐÏËÁÚÙ×ÁÔØ ×ÓÅ ÉÚÍÅÎÅÎÉÑ × ÏÔÎÏÓÉÔÅÌØÎÏÍ ÓÉÎÔÁËÓÉÓÅ" + +#~ msgid "switch on experimental features" +#~ msgstr "×ËÌÀÞÉÔØ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ" + +#~ msgid "Automatically generated" +#~ msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ" + +#, fuzzy +#~ msgid "Writing dependency file: `%s'..." +#~ msgstr "úÁÐÉÓÙ×ÁÀ ÆÁÊÌ ÚÁ×ÉÓÉÍÏÓÔÅÊ: `%s'..." + #~ msgid "Wrong type for property" #~ msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ÄÌÑ Ó×ÏÊÓÔ×Á" diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 73a01b0360..bcb394ab3e 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;;; ;;; specify generic beam begin and end times diff --git a/scm/backend-documentation-lib.scm b/scm/backend-documentation-lib.scm index 9802360423..5cdad802be 100644 --- a/scm/backend-documentation-lib.scm +++ b/scm/backend-documentation-lib.scm @@ -2,7 +2,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Han-Wen Nienhuys +;;; (c) 2000--2001 Han-Wen Nienhuys ;;; Jan Nieuwenhuizen diff --git a/scm/c++.scm b/scm/c++.scm index f3d795b7da..8cd3d7b2bf 100644 --- a/scm/c++.scm +++ b/scm/c++.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; (c) 1998--2001 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;;; Note: this file can't be used without LilyPond executable diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 933048f83b..7597413ded 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;;; @@ -278,10 +278,10 @@ (pitch->text pitch)) (define (pitch->chord-name-text-banter pitch) - (pitch->text-banter)) + (pitch->text-banter pitch)) (define (pitch->note-name-text-banter pitch) - (pitch->text-banter)) + (pitch->text-banter pitch)) (define (step->text pitch) (string-append diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm index e69c04884f..a74265b9a7 100644 --- a/scm/documentation-lib.scm +++ b/scm/documentation-lib.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Han-Wen Nienhuys +;;; (c) 2000--2001 Han-Wen Nienhuys ;;; Jan Nieuwenhuizen (define (uniqued-alist alist acc) diff --git a/scm/engraver-documentation-lib.scm b/scm/engraver-documentation-lib.scm index bd18c440f8..b21356f96e 100644 --- a/scm/engraver-documentation-lib.scm +++ b/scm/engraver-documentation-lib.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Han-Wen Nienhuys +;;; (c) 2000--2001 Han-Wen Nienhuys ;;; Jan Nieuwenhuizen diff --git a/scm/font.scm b/scm/font.scm index 869df85fdf..7c50827b44 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;;; (define style-to-font-alist @@ -322,11 +322,22 @@ and warn if the selected font is not unique. )) (define (markup-to-properties sheet markup) - ;;(display "markup: `") - ;;(write markup) - ;;(display "'\n") + ;; (display "markup: `") + ;; (write markup) + ;; (display "'\n") + (if (pair? markup) - (list markup) + (if (and (symbol? (car markup)) (not (pair? (cdr markup)))) + (if (equal? '() (cdr markup)) + (markup-to-properties sheet (car markup)) + (list markup)) + + (if (equal? '() (cdr markup)) + (markup-to-properties sheet (car markup)) + (append (markup-to-properties sheet (car markup)) + (markup-to-properties sheet (cdr markup))))) + + ;; markup is single abbreviation (let ((entry (assoc markup ;; assoc-chain? (append (cdr (assoc 'abbreviation-alist sheet)) @@ -335,6 +346,7 @@ and warn if the selected font is not unique. (cdr entry) (list (cons markup #t)))))) + ; fixme, how's this supposed to work? ; and why don't we import font-setting from elt? (define (style-to-font-name sheet style) diff --git a/scm/generate-documentation.scm b/scm/generate-documentation.scm index cbc19bae28..b7f9142437 100644 --- a/scm/generate-documentation.scm +++ b/scm/generate-documentation.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Han-Wen Nienhuys +;;; (c) 2000--2001 Han-Wen Nienhuys ;;; Jan Nieuwenhuizen ;;; File entry point for generated documentation diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index e610eb5a03..67f74adc87 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen @@ -47,6 +47,7 @@ In the case of alignment grobs, this should contain only one number.") (grob-property-description 'bar-size number? "size of a bar line.") (grob-property-description 'bars list? "list of barline pointers.") (grob-property-description 'barsize-procedure procedure? "Procedure that computes the size of a bar line.") +(grob-property-description 'baseline-skip number? "Baseline skip to use for multiple lines of text.") (grob-property-description 'bass list? " musical-pitch, optional.") (grob-property-description 'beam ly-grob? "pointer to the beam, if applicable.") (grob-property-description 'beam-space-function procedure? "function returning space given multiplicity.") @@ -165,6 +166,7 @@ FIXME: in Tie this is a pair of grob pointers, pointing to the two heads of the (grob-property-description 'ideal-distances list? "(OBJ . (DIST . STRENGTH)) pairs.") (grob-property-description 'interfaces list? "list of symbols indicating the interfaces supported by this object. Is initialized from the @code{meta} field.") (grob-property-description 'inversion list? " musical-pitch, optional.") +(grob-property-description 'invisible-staff boolean? "is staff invisible?") (grob-property-description 'items-worth-living list? "list of interesting items. If empty in a particular system, clear that system.") (grob-property-description 'kern number? "amount of extra white space to add. @@ -252,19 +254,14 @@ one end of the stem.") Scheme markup text. It is defined as follows: @example - -TEXT : STRING | (MARKUP SENTENCE) -SENTENCE: TEXT | SENTENCE TEXT -MARKUP: PROPERTY | ABBREV -PROPERTY: (key . value) -ABBREV: rows lines roman music bold italic named super sub text, or any font-style +text: string | (head? text+) +head: markup | (markup+) +markup-item: property | abbrev | @var{fontstyle} +property: (@var{key} . @var{value}) +abbrev: @code{rows lines roman music bold italic named super sub text} @end example -So, TEXT is either a string, or a list of which the CAR is a MARKUP. -MARKUP is either a CONS: an grob property '(key . value) or a symbol: -a predefined abbreviation for a list of grob properties. - The following abbreviations are currently defined: @table @samp diff --git a/scm/interface-description.scm b/scm/interface-description.scm index 7d5ee12eaa..e7253de63f 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen @@ -445,7 +445,7 @@ font-point-size font-relative-size) (lily-interface 'text-interface "A scheme markup text" - '(text align lookup raise kern magnify))) + '(text align baseline-skip lookup raise kern magnify))) (define dot-column-interface (lily-interface @@ -679,7 +679,8 @@ If you want to space your music wider, use something like: position 0." '( staff-space - line-count + line-count + invisible-staff ))) (define stem-tremolo-interface diff --git a/scm/lily.scm b/scm/lily.scm index dcc2b805ff..f8b1a671ed 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; (c) 1998--2001 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;;; Library funtions @@ -73,10 +73,14 @@ "clef.scm" "slur.scm" "font.scm" + "music-functions.scm" "auto-beam.scm" "generic-property.scm" "basic-properties.scm" "chord-name.scm" "grob-description.scm" - "script.scm" "midi.scm" + "script.scm" + "midi.scm" ))) + + diff --git a/scm/midi.scm b/scm/midi.scm index fbfdff6cd7..ed637bfd13 100644 --- a/scm/midi.scm +++ b/scm/midi.scm @@ -2,7 +2,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;; define factor of total volume per dynamic marking diff --git a/scm/music-functions.scm b/scm/music-functions.scm new file mode 100644 index 0000000000..b708b44768 --- /dev/null +++ b/scm/music-functions.scm @@ -0,0 +1,10 @@ + +(define (denominator-tuplet-formatter mus) + (number->string (ly-get-mus-property mus 'denominator))) + +(define (fraction-tuplet-formatter mus) + (string-append (number->string (ly-get-mus-property mus 'numerator)) + ":" + (number->string (ly-get-mus-property mus 'denominator)) + )) + diff --git a/scm/music-property-description.scm b/scm/music-property-description.scm index a7f04601be..e4a2284265 100644 --- a/scm/music-property-description.scm +++ b/scm/music-property-description.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 2ccf6c576e..b2668b4004 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; (c) 1998--2001 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys diff --git a/scm/ps.scm b/scm/ps.scm index fee2173983..b80308eb62 100644 --- a/scm/ps.scm +++ b/scm/ps.scm @@ -2,7 +2,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 1998--2000 Jan Nieuwenhuizen +;;; (c) 1998--2001 Jan Nieuwenhuizen ;;; Han-Wen Nienhuys diff --git a/scm/slur.scm b/scm/slur.scm index b188a2a517..c15dd9bf33 100644 --- a/scm/slur.scm +++ b/scm/slur.scm @@ -3,7 +3,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 2000 Jan Nieuwenhuizen +;;; (c) 2000--2001 Jan Nieuwenhuizen ;;; (define (attached-to-stem slur dir) diff --git a/scm/standalone.scm b/scm/standalone.scm index c4d75ac23e..6596a700c0 100644 --- a/scm/standalone.scm +++ b/scm/standalone.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Jan Nieuwenhuizen +;;;; (c) 1998--2001 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys (define standalone (not (defined? 'ly-gulp-file))) diff --git a/scm/tex.scm b/scm/tex.scm index 0cf48cd80d..7da4ad9a04 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -2,7 +2,7 @@ ;;; ;;; source file of the GNU LilyPond music typesetter ;;; -;;; (c) 1998--2000 Jan Nieuwenhuizen +;;; (c) 1998--2001 Jan Nieuwenhuizen ;;; Han-Wen Nienhuys @@ -103,7 +103,7 @@ (define (header creator generate) (string-append - "%created by: " creator generate "\n")) + "% Generated automatically by: " creator generate "\n")) (define (invoke-char s i) (string-append diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index 549b54fad9..610f63a298 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -289,6 +289,9 @@ pair of numbers, signifying the time signature. For example #'(4 . 4) is a 4/4t Switch off for cadenzas.") (translator-property-description 'transposing integer? "Transpose the MIDI output. Set this property to the number of half-steps to transpose by.") (translator-property-description 'tremoloFlags integer? "Number of tremolo flags to add if none is specified.") +(translator-property-description 'tupletNumberFormatFunction procedure? + "Function taking a music as input, producing a string. This function is called to determine the text to print on a tuplet bracket.") + (translator-property-description 'tupletInvisible boolean? " If set to true, tuplet bracket creation is switched off entirely. This has the same effect as setting both diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index ea8f9ce871..849aeab201 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -520,7 +520,8 @@ def compose_full_body (body, opts): optstring = string.join (opts, ' ') optstring = re.sub ('\n', ' ', optstring) body = r""" -%% Generated by lilypond-book.py; options are %s %%ughUGH not original options +%% Generated automatically by: lilypond-book.py +%% options are %s %%ughUGH not original options \include "paper%d.ly" \paper { linewidth = %f \pt; } """ % (optstring, music_size, l) + body @@ -802,7 +803,7 @@ def schedule_lilypond_block (chunk): (type, body, opts) = chunk assert type == 'lilypond' file_body = compose_full_body (body, opts) - basename = `abs(hash (file_body))` + basename = 'lily-' + `abs(hash (file_body))` for o in opts: m = re.search ('filename="(.*?)"', o) if m: @@ -895,6 +896,7 @@ def system (cmd): return st def compile_all_files (chunks): + global foutn eps = [] tex = [] png = [] @@ -923,10 +925,25 @@ def compile_all_files (chunks): x = os.path.join (g_here_dir, x) return ' -I %s' % x - incs = map (incl_opt, include_path) + incs = map (incl_opt, include_path) lilyopts = string.join (incs, ' ' ) + if do_deps: + lilyopts = lilyopts + ' --dependencies ' + if g_outdir: + lilyopts = lilyopts + '--dep-prefix=' + g_outdir + '/' texfiles = string.join (tex, ' ') system ('lilypond --header=texidoc %s %s' % (lilyopts, texfiles)) + + # + # Ugh, fixing up dependencies for .tex generation + # + if do_deps: + depfiles=map (lambda x: re.sub ('(.*)\.ly', '\\1.dep', x), tex) + for i in depfiles: + text=open (i).read () + text=re.sub ('\n([^:\n]*):', '\n' + foutn + ':', text) + open (i, 'w').write (text) + for e in eps: system(r"tex '\nonstopmode \input %s'" % e) system(r"dvips -E -o %s %s" % (e + '.eps', e)) @@ -934,8 +951,7 @@ def compile_all_files (chunks): cmd = r"""gs -sDEVICE=pgm -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=- -r90 -dNOPAUSE %s -c quit | pnmcrop | pnmtopng > %s""" cmd = cmd % (g + '.eps', g + '.png') system (cmd) - if g_outdir: - os.chdir(d) + os.chdir (d) def update_file (body, name): @@ -1032,15 +1048,34 @@ Han-Wen Nienhuys sys.exit (0) -def write_deps (fn, target): - sys.stdout.write('writing `%s\'\n' % os.path.join(g_outdir, fn)) +def write_deps (fn, target, chunks): + global read_files + sys.stdout.write('Writing `%s\'\n' % os.path.join(g_outdir, fn)) f = open (os.path.join(g_outdir, fn), 'w') f.write ('%s%s: ' % (g_dep_prefix, target)) - for d in __main__.read_files: + for d in read_files: f.write ('%s ' % d) + basenames=[] + for c in chunks: + if c[0] == 'lilypond': + (type, body, opts, todo, basename) = c; + basenames.append (basename) + for d in basenames: + if g_outdir: + d=g_outdir + '/' + d + if g_dep_prefix: + #if not os.isfile (d): # thinko? + if not re.search ('/', d): + d = g_dep_prefix + d + f.write ('%s.tex ' % d) + f.write ('\n') + #if len (basenames): + # for d in basenames: + # f.write ('%s.ly ' % d) + # f.write (' : %s' % target) f.write ('\n') f.close () - __main__.read_files = [] + read_files = [] def identify(): sys.stdout.write ('lilypond-book (GNU LilyPond) %s\n' % program_version) @@ -1076,7 +1111,9 @@ def fix_epswidth (chunks): return newchunks +foutn="" def do_file(input_filename): + global foutn file_settings = {} if outname: my_outname = outname @@ -1097,6 +1134,8 @@ def do_file(input_filename): scan_preamble(chunks) chunks = process_lilypond_blocks(my_outname, chunks) + foutn = os.path.join (g_outdir, my_outname + '.' + format) + # Do It. if __main__.g_run_lilypond: compile_all_files (chunks) @@ -1107,7 +1146,6 @@ def do_file(input_filename): x = 0 chunks = completize_preamble (chunks) - foutn = os.path.join(g_outdir, my_outname + '.' + format) sys.stderr.write ("Writing `%s'\n" % foutn) fout = open (foutn, 'w') for c in chunks: @@ -1116,7 +1154,7 @@ def do_file(input_filename): # should chmod -w if do_deps: - write_deps (my_depname, foutn) + write_deps (my_depname, foutn, chunks) outname = '' diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 165e63b142..5d97714123 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -251,7 +251,7 @@ class TeXOutput: top= r""" %% Creator: %s -%% Automatically generated from %s, %s +%% Generated automatically by: %s, from %s, at %s \documentclass[%s]{article} @@ -276,7 +276,7 @@ class TeXOutput: \renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%% %s \begin{document} -""" % ( program_id(), Props.get('filename'), now, Props.get('papersize'), +""" % ( program_id(), program_id(), Props.get('filename'), now, Props.get('papersize'), Props.get('language'), Props.get('linewidth'), textheightsetting, Props.get('orientation'), Props.get('header'), Props.get('pagenumber')) @@ -923,14 +923,10 @@ def getLilyopts(): inc = '' if len(Props.get('include')) > 0: inc = string.join (map (lambda x: '-I "%s"' % x, Props.get('include'))) - else: - - if Props.get('dependencies'): - dep=' -M' - else: - dep='' - return inc + dep - return inc + dep='' + if Props.get('dependencies'): + dep=' --dependencies' + return inc + dep def writeLilylog(file,contents): if Props.get('keeplilypond'): @@ -959,6 +955,14 @@ def getTeXFile(contents): else: return texfiles +def getDepFiles (log): + files=[] + for line in string.split (log,'\n'): + m = re.search ("dependencies output to (.+)\.\.\.", line) + if m: + files.append (m.group (1)) + return files + def unc2dos(path): """ Convert a path of format ///this/that/the/other to @@ -1008,7 +1012,8 @@ Options: -h,--help this help text -k,--keeply2dvi keep ly2dvi output files -l,--language= give LaTeX language (babel) - -o,--output= set output directory + -o,--outdir= set output directory + --output= set output directory -p,--papersize= give LaTeX papersize (eg. a4) -s,--separate run all files separately through LaTeX @@ -1035,8 +1040,8 @@ def main(): 'include=', 'keeplilypond', 'landscape', 'nonumber', 'Width=', 'dependencies', 'help', 'keeply2dvi', 'language=', - 'output=', 'version', 'papersize=', 'separate', - 'postscript']) + 'outdir=', 'output=', 'version', + 'papersize=', 'separate', 'postscript']) for opt in options: o = opt[0] @@ -1066,7 +1071,7 @@ def main(): Props.setKeeply2dvi(1,'commandline') elif o == '--language' or o == '-l': Props.setLanguage(a,'commandline') - elif o == '--output' or o == '-o': + elif o == '--outdir' or o == '-o' or o == '--output': Props.setOutput(a,'commandline') elif o == '--papersize' or o == '-p': Props.setPaperZize(a,'commandline') @@ -1117,6 +1122,7 @@ def main(): if stat: sys.exit('ExitBadLily', cmd ) texFiles=getTeXFile(log) + depFiles=getDepFiles (log) writeLilylog(file,log) Props.addLilyOutputFiles(texFiles,'program') texInputFiles = texInputFiles + texFiles @@ -1143,6 +1149,19 @@ def main(): firstfile=0 if not Props.get('separate'): outfile.end() + + # --outdir mess + if Props.get ('output'): + outdir=Props.get ('output') + for i in depFiles: + text=open (i).read () + # ugh, should use lilypond -o DIR/foo.tex + # or --dep-prefix to fix dependencies + text=re.sub ('\n([^:]*).tex', '\n' + outdir + '/\\1.dvi', text) + text=re.sub (' ([^:]*).tex', ' ' + outdir + '/\\1.dvi', text) + open (os.path.join (outdir, i), 'w').write (text) + os.remove (i) + else: help() sys.exit('ExitBadArgs','No files specified') diff --git a/stepmake/GNUmakefile.in b/stepmake/GNUmakefile.in index 349ff922af..a50edb862e 100644 --- a/stepmake/GNUmakefile.in +++ b/stepmake/GNUmakefile.in @@ -11,7 +11,7 @@ depth = . ifeq ($(PACKAGE),STEPMAKE) SUBDIRS = bin make stepmake else -SUBDIRS = +SUBDIRS = stepmake endif # @@ -30,12 +30,15 @@ STEPMAKE_TEMPLATES=toplevel texinfo include $(depth)/make/stepmake.make # +# 2nd: THIS IS NO MISTAKE +# this makes lilypond's make dist descent into stepmake +# should check if we can remove the above # descent order into subdirectories: # ifeq ($(PACKAGE),STEPMAKE) SUBDIRS = bin make stepmake else -SUBDIRS = +SUBDIRS = stepmake endif # diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 1a095357e6..f5ba556edd 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -373,6 +373,7 @@ dnl fi ZIP="zip -r -9" # program_suffix=.exe # urg + # ROOTSEP=':' # DIRSEP='\\' # PATHSEP=';' # @@ -395,10 +396,12 @@ dnl fi # this way, you may have buildscripts/out/lilypond-profile # 'automatically' sourced from /usr/etc/profile.d/ too. # + ROOTSEP=':' DIRSEP='/' PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else + ROOTSEP='/' DIRSEP='/' PATHSEP=':' LN=ln diff --git a/stepmake/stepmake/GNUmakefile b/stepmake/stepmake/GNUmakefile index 7bdbd3c278..bb2a1c72c4 100644 --- a/stepmake/stepmake/GNUmakefile +++ b/stepmake/stepmake/GNUmakefile @@ -16,6 +16,10 @@ STEPMAKE_TEMPLATES=makedir install # -include $(depth)/make/stepmake.make +ifeq ($(PACKAGE),STEPMAKE) INSTALLATION_DIR=$(datadir)/stepmake +else +INSTALLATION_DIR=$(dir $(datadir))/$(package)/stepmake/stepmake +endif INSTALLATION_FILES=GNUmakefile $(MAKE_FILES) diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index f9ee8b35df..cf43961a60 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -1,7 +1,7 @@ # title generic make targets # file make/Targets.make -.PHONY : all clean config default dist doc exe help html lib TAGS\ +.PHONY : all clean config default diff dist doc exe help html lib TAGS\ po all: default @@ -42,14 +42,14 @@ config: generic-help: @echo -e "\ Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)\n\ -Usage: $(MAKE) ["VARIABLE=value"]... [TARGET]\n\ +Usage: make ["VARIABLE=value"]... [TARGET]\n\ \n\ Targets:\n" help: generic-help local-help @echo -e "\ all update everything\n\ - clean remove all genated stuff in $(oudir)\n\ + clean remove all genated stuff in $(outdir)\n\ config rerun configure\n\ deb build Debian package\n\ default same as the empty target\n\ diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make index e8e6cc6162..37f75620bf 100644 --- a/stepmake/stepmake/generic-vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -137,7 +137,7 @@ endif # substitute $(STRIP) in Site.make if you want stripping DO_STRIP=true -LOOP=$(foreach i, $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) -C $(i) $@ &&) true +LOOP=$(foreach i, $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C $(i) $@ &&) true # different redhat releases need different flags for etags. Just use defaults. ETAGS_FLAGS= # -CT diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make index ffbaf5ba24..c5da9738cd 100644 --- a/stepmake/stepmake/tex-rules.make +++ b/stepmake/stepmake/tex-rules.make @@ -14,8 +14,8 @@ $(outdir)/%.dvi: $(outdir)/%.latex latex \\nonstopmode \\input $(