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
#
METAPOST = @METAPOST@
MFPLAIN_MP = @MFPLAIN_MP@
MSGFMT = @MSGFMT@
+ROOTSEP = @ROOTSEP@
PATHSEP = @PATHSEP@
PERL = @PERL@
PYTHON = @PYTHON@
#include "config.h"
#include <stdio.h>
#include <errno.h>
+
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#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
/*
- 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 <hanwen@cs.uu.nl>
*/
-#ifndef PATH_HH
-#define PATH_HH
+#ifndef FILE_PATH_HH
+#define FILE_PATH_HH
+
#include "string.hh"
#include "array.hh"
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<String>
{
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 */
data_p_ = 0;
len_i_ = 0;
- if (!s.length_i () || (s == "-"))
+ if ((s == "-"))
load_stdin ();
else
load_file (s);
--- /dev/null
+\score { \notes {
+
+ [\times 2/3 {c16 c c} c8]
+ [\times 2/3 {c16 c c} c8]}}
--- /dev/null
+
+% 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";
+ }
+ }
+}
+
\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";
}
\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
+ }
}
}
\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 }
linewidth = -1.0\cm;
\translator {
\LyricsContext
- \consists "Span_bar_engraver";
\accepts "LyricsVoiceWithBars";
}
\translator {
\LyricsVoiceContext
+ \consists "Bar_engraver";
\name "LyricsVoiceWithBars";
}
\translator {
\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";
\clef treble;
\property Staff.automaticMelismata = ##t
\context Voice = one \transpose c'' {
- \stemUp
+ \voiceOne
\staffBVoiceB
\bar "|.";
}
\context Voice = two \transpose c'' {
- \stemDown
+ \voiceTwo
\staffBVoiceC
}
>
\clef bass;
\property Staff.VoltaBracket = \turnOff
\context Voice = three {
- \stemUp
+ \voiceOne
\staffCVoiceB
}
\context Voice = four {
- \stemDown
+ \voiceTwo
\staffCVoiceC
}
>
\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";
\score{
\notes\relative c''{
\stemUp
+% {
a-"text"
b-#"texta"
c-#'(bold "textb")
(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;
-\version "1.3.120";
+\version "1.3.130";
\include "paper16.ly";
>
\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
\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
>
\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
\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
\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;
>
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
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
source file of the Flower Library
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "afm.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
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);
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "molecule.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "audio-column.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "audio-element-info.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "audio-element.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "debug.hh"
#include "audio-item.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "audio-staff.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
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++)
{
/*
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "spanner.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "hara-kiri-group-spanner.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
Bar_number_engraver();
};
+
+/*
+ TODO: more advanced formatting via SCM function, perhaps barnumbers
+ every 5 measures? */
+
void
Bar_number_engraver::create_grobs ()
{
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.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);
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver-group-engraver.hh"
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);
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
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
-}
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <math.h>
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <math.h>
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "box.hh"
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "paper-column.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "change-iterator.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
{
chord_name_p_ = 0;
chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
- last_chord_ = SCM_EOL;
+ last_chord_ = chord_;
}
void
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);
}
}
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));
}
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "chord-name.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
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);
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "chord.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
Mats Bengtsson <matsb@s3.kth.se>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "note-column.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
#include "collision.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "column-x-positions.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "command-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "context-specced-music.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
#include "warn.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "dots.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "dots.hh"
source file of the LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
#include "dimensions.hh"
{
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 ();
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "flower-proto.hh"
Sourcefile of GNU LilyPond music type setter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "music.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Mats Bengtsson <matsb@s3.kth.se> (the ugly TeX parsing in text_dimension)
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "global-ctor.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // rint
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music playter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "grace-performer-group.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "grob-info.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "group-interface.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "molecule.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <strstream.h>
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef ARPEGGIO_HH
/*
audio-column.hh -- declare Audio_column
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef AUDIO_COLUMN_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
audio-item.hh -- declare Audio_items
- (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef AUDIO_ITEM_HH
/*
audio-staff.hh -- declare Audio_staff
- (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef AUDIO_STAFF_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
bar.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef BAR_HH
/*
beam.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef BEAM_HH
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*);
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
bezier.hh -- declare Bezier and Bezier_bow
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef BEZIER_HH
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef CHORD_NAME_HH
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef CHORD_HH
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
column-x-positions.hh -- part of GNU LilyPond
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef COLUMN_X_POSITIONS_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
cxx-function-smob.hh --
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
grob.hh -- declare Grob
- (c) 1996-1999--2000 Han-Wen Nienhuys
+ (c) 1996-1999--2001 Han-Wen Nienhuys
*/
#ifndef STAFFELEM_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef ITEM_HH
#define ITEM_HH
/*
key-item.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef KEYITEM_HH
/*
keyword.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef KEYWORD_HH
source file of the GNU LilyPond music typesetter
-(c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
leastsquare.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef LEASTSQUARE_HH
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef LILY_GUILE_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef LILY_PROTO_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
line-of-score.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef SCORELINE_HH
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
local-key-item.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef LOCALKEYITEM_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
extender-spanner.hh -- part of GNU LilyPond
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef EXTENDER_SPANNER_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef MAIN_HH
#define MAIN_HH
void set_default_output (String s);
String find_file (String);
void call_constructors ();
+extern Array<String> get_inclusion_names ();
+extern void set_inclusion_names (Array<String>);
-extern Sources* source_global_l;
+/* options */
+extern bool dependency_global_b;
+extern String dependency_prefix_global;
+extern Array<String> 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<String> get_inclusion_names ();
-extern void set_inclusion_names (Array<String>);
-
-extern File_path global_path;
-
-/*
- names of header fields to be dumped to a separate file.
-*/
-extern Array<String> 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 */
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
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
/*
midi-item.hh -- declare Midi items
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef MIDI_ITEM_HH
/*
midi-stream.hh -- declare Midi_stream
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef MIDI_STREAM_HH
/*
midi-walker.hh -- declare Midi_walker
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef MOLECULE_HH
#define MOLECULE_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
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,);
};
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef LEXER_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
note-head.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef NOTEHEAD_HH
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef OUTPUT_PROPERTY_MUSIC_ITERATOR_HH
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
public:
SCM font_descriptions ()const;
virtual ~Paper_def ();
- static int default_count_i_;
+ static int score_count_i_;
/*
JUNKME
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 () ;
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
};
class ostream;
-ostream *open_file_stream (String filename);
+#include <streambuf.h>
+ostream *open_file_stream (String filename, int mode=ios::out);
void close_file_stream (ostream *os);
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
performance.hh -- declare Performance
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef PERFORMANCE_HH
/*
performer-group-performer.hh -- declare Performer_group_performer
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
performer.hh -- declare Performer
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef REQUEST_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
score-performer.hh -- declare Score_performer
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef SEQUENTIAL_MUSIC_ITERATOR_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#ifndef SIMPLE_MUSIC_ITERATOR_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef SLUR_BEZIER_BOW_HH
/*
slur.hh -- declare Slur
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef SLUR_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
spanner.hh -- part of GNU LilyPond
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef SPANNER_HH
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
stem.hh -- declare Stem
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef STEM_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
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);
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
revamped code from GNU Fontutils-0.6
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
revamped code from GNU Fontutils-0.6
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
time_signature.hh -- declare Time_signature
- (c) 1996--2000 Han-Wen Nienhuys
+ (c) 1996--2001 Han-Wen Nienhuys
*/
#ifndef METER_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
plet-spanner.hh -- part of GNU LilyPond
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#ifndef Tuplet_spanner_HH
-#define Tuplet_spanner_HH
+#ifndef Tuplet_bracket_HH
+#define Tuplet_bracket_HH
#include "lily-guile.hh"
todo: handle breaking elegantly.
*/
-class Tuplet_spanner
+class Tuplet_bracket
{
public:
DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
static Direction get_default_dir (Grob*);
};
-#endif // Tuplet_spanner_HH
+#endif // Tuplet_bracket_HH
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
volta-spanner.hh -- part of GNU LilyPond
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#ifndef VOLTA_SPANNER_HH
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "key-item.hh"
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
keyplacement by Mats Bengtsson
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "command-request.hh"
source file of the GNU LilyPond music typesetter
-(c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "config.h"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "command-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "input-smob.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "molecule.hh"
/*
local-key-engraver.cc -- implement Local_key_engraver
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "musical-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "local-key-item.hh"
#include "molecule.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
lyric-extender.cc -- implement Lyric_extender
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "musical-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <stdlib.h>
#include <assert.h>
#include <locale.h>
+#include "config.h"
+
+#if HAVE_GETTEXT
+#include <libintl.h>
+#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"
#include "kpath.hh"
-#if HAVE_GETTEXT
-#include <libintl.h>
-#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<String> 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<String> 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:
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
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:")
<< " " <<
"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 <hanwen@cs.uu.nl>\n";
cout << " Jan Nieuwenhuizen <janneke@gnu.org>\n";
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 <hanwen@cs.uu.nl>\n";
cout << " Jan Nieuwenhuizen <janneke@gnu.org>\n";
}
}
+/**
+ 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**)
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 ();
/*
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 ();
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;
-}
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <ctype.h>
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <math.h>
set_tempo (Moment (1, 4), 60);
}
-Midi_def::~Midi_def()
-{
-}
-
-
-
int
Midi_def::get_tempo_i (Moment one_beat_mom)
{
}
-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;
}
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "debug.hh"
-//
-// midi-stream.cc
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+/*
+ midi-stream.cc -- implement Midi_stream
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
#include <fstream.h>
+#include "paper-stream.hh"
#include "string.hh"
#include "string-convert.hh"
#include "main.hh"
#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&
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_));
-}
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "music-list.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "scm-hash.hh"
#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;
}
return dynamic_cast <Global_translator *> (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 *)
{
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;
}
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "music-list.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "input-smob.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "musical-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <strstream.h>
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
{
here_input().error (s);
error_level_i_ = 1;
- exit_status_i_ = 1;
+ exit_status_global = 1;
}
void
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // ceil
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
/*
head-grav.cc -- part of GNU LilyPond
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "rhythmic-head.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "performer.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "input.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "moment.hh"
#include "paper-column.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
-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 ("<stdout>") : 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;
}
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
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"
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);
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 */
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "main.hh"
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 ();
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include <errno.h>
+#include <sys/types.h>
#include <fstream.h>
+#include "config.h"
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#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;
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)
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "part-combine-music.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <time.h>
#include "performance.hh"
#include "score.hh"
#include "file-results.hh"
+#include "file-path.hh"
#include "lily-version.hh"
#include "killing-cons.tcc"
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";
/*
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
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));
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "musical-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "staff-symbol-referencer.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "pitch.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "group-interface.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "property-iterator.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "protected-scm.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "translator-group.hh"
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // ceil.
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "item.hh"
#include "staff-symbol-referencer.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "molecule.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "rhythmic-head.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "rod.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <stdio.h>
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "score-performer.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "ly-smobs.icc"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "config.h"
+
+#include <errno.h>
+#include <sys/types.h>
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#include <unistd.h>
+
#include <fstream.h>
#include "main.hh"
#include "score.hh"
{
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)
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;
}
{
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);
}
}
if (is_p->errorlevel_i_)
{
is_p->warning (_("Score contains errors; will not process it"));
- exit_status_i_ |= 1;
+ exit_status_global |= 1;
}
else
{
if (parser.error_level_i_)
{
- exit_status_i_ = 1;
+ exit_status_global = 1;
}
else
do_scores ();
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "script-column.hh"
/*
script-engraver.cc -- implement Script_engraver
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "grace-iterator.hh"
#include "translator-group.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // ceil.
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
TODO:
- add support for different stretch/shrink constants?
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "translator-group.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "debug.hh"
/*
slur-engraver.cc -- implement Slur_engraver
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "musical-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "span-bar.hh"
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
#include <libc-extension.hh>
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "translator-group.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "lookup.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>, Glen Prideaux <glenprideaux@iname.com>
Similar to (and derived from) Instrument_name_engraver.
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "staff-symbol-referencer.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO: This is way too hairy
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "grob.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "swallow-engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "swallow-perf.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <limits.h>
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "command-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <math.h>
/*
- 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
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 ();
}
}
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<Real> 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;
}
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "dimensions.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "molecule.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "time-signature.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "audio-item.hh"
source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "translator-group.hh"
#include "command-request.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "translator.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "music-output-def.hh"
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 (),
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
--- /dev/null
+/*
+ plet-spanner.cc -- implement Tuplet_bracket
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+
+#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<Grob> 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<Spanner*>(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<Grob> 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 <column_arr.size() && Note_column::rest_b(column_arr[l]))
+ l ++;
+
+ int r = column_arr.size ()- 1;
+ while (r >= 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<Grob> 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<Note_column> column_arr=
+ Pointer_group_interface__extract_elements (me, (Note_column*)0, "columns");
+ Spanner *sp = dynamic_cast<Spanner*> (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<Spanner *> (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<Spanner*> (me), n);
+}
+
+
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
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]);
}
{
for (int j =0; j <started_span_p_arr_.size (); j++)
if (started_span_p_arr_[j])
- Tuplet_spanner::add_column (started_span_p_arr_[j], dynamic_cast<Item*>(i.elem_l_));
+ Tuplet_bracket::add_column (started_span_p_arr_[j], dynamic_cast<Item*>(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_);
}
}
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "type-swallow-translator.hh"
source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "translator-group.hh"
#include "paper-column.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
\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;
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)
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
# 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
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)/
$(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 $@
--- /dev/null
+#!/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=<LilyPond's datadir>/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
$(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 $@
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 $(<F))*.midi $(outdir)
# don't junk intermediate .dvi files. They're easier to view than
-# .ps or .gif
+# .ps or .png
.PRECIOUS: $(outdir)/%.dvi
$(outdir)/%.dvi: %.ly
- $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir) $<
+ $(PYTHON) $(LY2DVI) --outdir=$(outdir) --dependencies $<
-mv $(basename $<)*.midi $(outdir)
$(outdir)-$(PAPERSIZE)/%.dvi: %.ly
- $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)-$(PAPERSIZE) -p $(PAPERSIZE) $<
+ $(PYTHON) $(LY2DVI) --outdir=$(outdir)-$(PAPERSIZE) --dependencies --papersize=$(PAPERSIZE) $<
-mv $(basename $<)*.midi $(outdir)-$(PAPERSIZE)
$(outdir)/%.dvi: %.fly
- $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir) $<
+ $(PYTHON) $(LY2DVI) -o $(outdir) $<
-mv $(basename $<)*.midi $(outdir)
+.PHONY: mutopia png ps scores tar
+
+.PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
all: $(OUT_FILES)
local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
-# (cd $(outdir); $(PYTHON) ../$(buildscript-dir)/mutopia-index.py --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples))
-# $(footify) $(outdir)/index.html
local-web:
$(MAKE) conf=www local-WWW
$(LOOP)
local-convert-ly:
- $(PYTHON) $(script-dir)/convert-ly.py -e *ly
+ $(PYTHON) $(CONVERT_LY) -e *ly
tar:
mkdir -p $(outdir)/$(tarball)
cp -p *.ly $(outdir)/$(tarball)
cd $(outdir) && tar czf $(tarball).tar.gz $(tarball)
+ rm -rf $(outdir)/$(tarball)
+
+png: $(png_examples)
+
+ps: $(ps_examples)
+
+scores: $(score_ps)
+ $(MAKE) ps_examples="$<" ps
+
+mutopia-letter=$(mutopia-examples:%=out-letter/%.ps.gz)
+
+mutopia:
+ $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
+
+#
+# <NAME> and -book targets only available through ly.make template makefile;
+# too scary to install in LilyPonds make yet.
+#
+#
+
+ifeq (0,1)
+#
+# Timothy's booklet
+#
+$(outdir)/%-book.ps: $(outdir)/%.ps
+ psbook $< $<.1
+ pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.1 $@
+ rm -f $<.1
+
+#
+# Catch-all target: type `make foo' to make out/foo.ps,
+# or make `foo-book' to make out/foo-book.ps
+#
+%: $(outdir)/%.ps
+ @echo Making $@ from $<
+endif
+
+local-help:
+ @echo -e "\
+ <NAME> update $(outdir)/<NAME>.ps\n\
+ <NAME>-book update booklet $(outdir)/<NAME>-book.ps\n\
+ convert-ly convert all LilyPond sources\n\
+ mutopia update PNGs, PostScript a4 and letter of all mutopia-examples\n\
+ png update PNGs of all examples\n\
+ ps update PostScript of all examples\n\
+ scores update PostScript of all scores\n\
+"\
+#
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)
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
% source file of the Feta (not an acronym for Font-En-Tja)
% pretty-but-neat music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
% Jan Nieuwenhuizen <janneke@gnu.org>
%
% these macros help create ascii logging output
%
% source file of LilyPond's pretty-but-neat music font
%
-% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
%
mode_setup;
%
% source file of LilyPond's pretty-but-neat music font
%
-% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
%
% source file of the Feta (Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
font_identifier:="feta-braces11";
%
% source file of the Feta (Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
font_identifier:="feta-braces13";
%
% source file of the Feta (Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
font_identifier:="feta-braces16";
%
% source file of the Feta (Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
font_identifier:="feta-braces20";
%
% source file of the Feta (Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
font_identifier:="feta-braces23";
%
% source file of the Feta (Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
font_identifier:="feta-braces26";
%
% source file of the Feta (not the Font-En-Tja) music font
%
-% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
fet_begingroup("rests");
% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
% music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
%
% source file of the Feta (not the Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
% Jan Nieuwenhuizen <janneke@gnu.org>,
% Juergen Reuter <reuterj@ira.uka.de>
%
% source file of the Feta (not the Font-En-Tja) music font
%
-% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
fet_begingroup("number")
% source file of the Feta (defintively not an abbreviation for Font-En-Tja)
% music font
%
-% (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
%
% this file is included by feta-scripts.mf
%
% source file of LilyPond's pretty-but-neat music font
%
-% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
% see Documentation/fonts.tex
%
% source file of the Feta (Font-En-Tja) music font
%
-% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
%
source file of the LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <assert.h>
source file of the LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <assert.h>
source file of the LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
source file of the LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
*/
source file of the LilyPond music typesetter
- (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
*/
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
"midi2ly");
cout << endl;
- cout << _f ("Copyright (c) %s by", "1996--2000");
+ cout << _f ("Copyright (c) %s by", "1996--2001");
cout << "Han-Wen Nienhuys <hanwen@cs.uu.nl>\n"
<< "Jan Nieuwenhuizen <janneke@gnu.org>\n";
}
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);
source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "plet.hh"
depth = ../..
# do Coriolan if you have plenty RAM / CPU / quotum
-examples=
+# examples=coriolan
-examples=
LOCALSTEPMAKE_TEMPLATES=mutopia
include $(depth)/make/stepmake.make
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)
+
\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";
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:<non-static> () parses pitch?
%\property Staff.transposing = "bes"
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:<non-static> () parses pitch?
%\property Staff.transposing = "es"
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
\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
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 <bamse@gmx.de>\n"
"Language-Team: LANGUAGE <de@li.org>\n"
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"
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."
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"
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'"
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"
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 ""
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"
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"
"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"
"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"
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"
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"
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'..."
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"
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"
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"
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"
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."
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"
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
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!"
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 ""
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 ""
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"
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 <laurent@linuxfan.com>\n"
"Language-Team: \n"
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'"
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"
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"
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'"
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"
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 ""
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'"
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"
"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"
"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"
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"
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 ""
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'"
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 ""
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"
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é"
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'"
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 ""
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"
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
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"
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 ""
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 ""
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é"
#, 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: <jantien@xs4all.nl>\n"
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'"
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 ""
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"
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'"
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"
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 ""
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'"
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"
#.
#. 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 <stdin>"
-#: 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"
"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"
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"
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"
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'..."
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"
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"
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à"
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'"
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."
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"
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
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 ""
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 ""
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 ""
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à"
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 <yamad@mb.infoweb.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n"
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'"
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 "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹"
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 ""
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'"
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 "ÉâÆ°¾®¿ôÅÀÎã³°"
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 ""
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'"
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"
"Èþ¤·¤¤ÉèÌ̤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£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"
"¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\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"
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"
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"
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'..."
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"
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"
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 "°ÀÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
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'"
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 "µÙÉä¤ò¤Þ¤¿¤¤¤À¥¹¥é¡¼¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë¤·¤Þ¤¹¡£"
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 "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
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
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 "ºî¤é¤ì¤¿¥¿¥¤¤¬¤¢¤ê¤Þ¤»¤ó!"
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 ""
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 ""
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 "°ÀÃͤؤΥ¿¥¤¥×¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
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 ""
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 ""
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 ""
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'"
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
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 ""
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 ""
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"
"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"
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
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 ""
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 ""
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 ""
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"
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 ""
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 ""
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 ""
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 ""
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
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 ""
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 ""
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 ""
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 <janneke@gnu.org>\n"
"Language-Team: Dutch <nl@li.org>\n"
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'"
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."
"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"
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"
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'"
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"
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 "
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'"
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"
"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 <janneke@gnu.org> of <hanwen@cs.uu.nl>"
-#: 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"
"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"
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"
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"
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..."
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"
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"
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"
"%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"
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'"
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."
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"
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
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!"
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"
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"
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 <august@infran.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
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'"
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 "úÁÇÒÕÖÁÀ ÛÒÉÆÔ ÐÏ ÕÍÏÌÞÁÎÉÀ"
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 "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
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'"
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 "ÉÓËÌÀÞÅÎÉÅ ÁÒÉÆÍÅÔÉËÉ Ó ÐÌÁ×ÁÀÝÅÊ ÚÁÐÑÔÏÊ"
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 ""
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'"
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"
"ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. 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"
"ÐÒÉ ÓÏÂÌÀÄÅÎÉÉ ÎÅËÏÔÏÒÙÈ ÕÓÌÏ×ÉÊ. ÷ÙÚÙ×ÁÊÔÅ ËÁË `%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"
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"
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"
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'..."
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"
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"
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 ""
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'"
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 "ìÉÇÁ ÎÁÄ ÐÁÕÚÏÊ. éÇÎÏÒÉÒÕÀ."
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 "ÞÔÏ-ÔÏ ÎÅ ÎÁÊÄÕ ÎÁÞÁÌÏ ÇÒÕÐÐÉÒÏ×ËÉ ÛÔÉÌÅÊ"
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
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 ""
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 ""
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 ""
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 "îÅ×ÅÒÎÙÊ ÔÉÐ ÄÌÑ Ó×ÏÊÓÔ×Á"
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; specify generic beam begin and end times
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;; (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;; Jan Nieuwenhuizen <janneke@gnu.org>
;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;; Note: this file can't be used without LilyPond executable
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
(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
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;; (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;; Jan Nieuwenhuizen <janneke@gnu.org>
(define (uniqued-alist alist acc)
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;; (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;; Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
(define style-to-font-alist
))
(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))
(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)
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;; (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;; Jan Nieuwenhuizen <janneke@gnu.org>
;;; File entry point for generated documentation
;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;;; Jan Nieuwenhuizen <janneke@gnu.org>
(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.")
(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.
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
;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;;; Jan Nieuwenhuizen <janneke@gnu.org>
(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
position 0."
'(
staff-space
- line-count
+ line-count
+ invisible-staff
)))
(define stem-tremolo-interface
;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;; Library funtions
"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"
)))
+
+
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;; define factor of total volume per dynamic marking
--- /dev/null
+
+(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))
+ ))
+
;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;;; Jan Nieuwenhuizen <janneke@gnu.org>
;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
(define (attached-to-stem slur dir)
;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
(define standalone (not (defined? 'ly-gulp-file)))
;;;
;;; source file of the GNU LilyPond music typesetter
;;;
-;;; (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
(define (header creator generate)
(string-append
- "%created by: " creator generate "\n"))
+ "% Generated automatically by: " creator generate "\n"))
(define (invoke-char s i)
(string-append
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
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
(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:
return st
def compile_all_files (chunks):
+ global foutn
eps = []
tex = []
png = []
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))
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):
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)
return newchunks
+foutn=""
def do_file(input_filename):
+ global foutn
file_settings = {}
if outname:
my_outname = outname
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)
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:
# should chmod -w
if do_deps:
- write_deps (my_depname, foutn)
+ write_deps (my_depname, foutn, chunks)
outname = ''
top= r"""
%% Creator: %s
-%% Automatically generated from %s, %s
+%% Generated automatically by: %s, from %s, at %s
\documentclass[%s]{article}
\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'))
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'):
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 //<drive>/this/that/the/other to
-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
'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]
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')
if stat:
sys.exit('ExitBadLily', cmd )
texFiles=getTeXFile(log)
+ depFiles=getDepFiles (log)
writeLilylog(file,log)
Props.addLilyOutputFiles(texFiles,'program')
texInputFiles = texInputFiles + texFiles
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')
ifeq ($(PACKAGE),STEPMAKE)
SUBDIRS = bin make stepmake
else
-SUBDIRS =
+SUBDIRS = stepmake
endif
#
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
#
ZIP="zip -r -9" #
program_suffix=.exe
# urg
+ # ROOTSEP=':'
# DIRSEP='\\'
# PATHSEP=';'
#
# 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
#
-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)
# 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
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\
# 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
latex \\nonstopmode \\input $(<F) )
$(outdir)/%.ps: $(outdir)/%.dvi
- dvips -ta4 -o $@ $<
+ cd $(outdir) && dvips -ta4 -o $(@F) $(<F)
$(outdir)-$(PAPERSIZE)/%.ps: $(outdir)-$(PAPERSIZE)/%.dvi
- dvips -t$(PAPERSIZE) -o $@ $<
+ cd $(outdir) && dvips -t$(PAPERSIZE) -o $(@F) $(<F)
projects / lilypond.git / commitdiff