CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/13 23:25:15
Modified files:
. : ChangeLog
flower/include : virtual-methods.hh
lily : audio-element.cc context.cc font-metric.cc
grob.cc midi-item.cc music-iterator.cc
music-output.cc music-scheme.cc music.cc
output-def.cc output-property-music-iterator.cc
paper-book.cc paper-system.cc
translator-ctors.cc translator-group.cc
translator-scheme.cc translator.cc
tuplet-bracket.cc
lily/include : afm.hh audio-element.hh context.hh
font-metric.hh global-context.hh grob.hh
item.hh open-type-font.hh spanner.hh tfm.hh
ly : titling-init.ly
make : lilypond.fedora.spec.in
scm : safe-lily.scm
Log message:
* make/lilypond.fedora.spec.in (Group): add lilypond-internals to
dist.
* lily/tuplet-bracket.cc: check columns of bounds, not bounds
themselves.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4173&tr2=1.4174&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/virtual-methods.hh.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/audio-element.cc.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/context.cc.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/font-metric.cc.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grob.cc.diff?tr1=1.144&tr2=1.145&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/midi-item.cc.diff?tr1=1.87&tr2=1.88&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-iterator.cc.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-output.cc.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-scheme.cc.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music.cc.diff?tr1=1.142&tr2=1.143&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/output-def.cc.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/output-property-music-iterator.cc.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-book.cc.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-system.cc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/translator-ctors.cc.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/translator-group.cc.diff?tr1=1.147&tr2=1.148&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/translator-scheme.cc.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/translator.cc.diff?tr1=1.92&tr2=1.93&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tuplet-bracket.cc.diff?tr1=1.108&tr2=1.109&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/afm.hh.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/audio-element.hh.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/context.hh.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/font-metric.hh.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/global-context.hh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/grob.hh.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/item.hh.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/open-type-font.hh.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/spanner.hh.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/tfm.hh.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/titling-init.ly.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/lilypond.fedora.spec.in.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/safe-lily.scm.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4173 lilypond/ChangeLog:1.4174
--- lilypond/ChangeLog:1.4173 Tue Oct 11 18:08:08 2005
+++ lilypond/ChangeLog Thu Oct 13 23:25:13 2005
@@ -1,3 +1,18 @@
+2005-10-14 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * make/lilypond.fedora.spec.in (Group): add lilypond-internals to
+ dist.
+
+ * lily/tuplet-bracket.cc: check columns of bounds, not bounds
+ themselves.
+
+2005-10-12 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * flower/include/virtual-methods.hh (VIRTUAL_COPY_CONSTRUCTOR):
+ add class_name() method.
+
+ * lily/music-scheme.cc: remove ly:music-name.
+
2005-10-11 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* cygwin/postinstall-lilypond.sh: Remove cruft.
@@ -7,6 +22,12 @@
* cygwin/GNUmakefile (default): Remove postremove rules.
2005-10-11 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * ly/titling-init.ly (evenHeaderMarkup): use space in header on
+ even header too.6
+
+ * scm/define-markup-commands.scm (wordwrap-string): bugfix for
+ MacOS 9 users.
* lily/hara-kiri-group-spanner.cc (consider_suicide): only
consider break index for broken spanner.
Index: lilypond/flower/include/virtual-methods.hh
diff -u lilypond/flower/include/virtual-methods.hh:1.37
lilypond/flower/include/virtual-methods.hh:1.38
--- lilypond/flower/include/virtual-methods.hh:1.37 Mon Sep 12 12:46:48 2005
+++ lilypond/flower/include/virtual-methods.hh Thu Oct 13 23:25:14 2005
@@ -25,7 +25,13 @@
VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
}; */
+#define DECLARE_CLASSNAME(name) \
+ virtual const char *class_name () const { \
+ return #name; \
+}
+
#define VIRTUAL_COPY_CONSTRUCTOR(Base, name) \
+ DECLARE_CLASSNAME(name);\
virtual Base *clone () const \
{ \
return new name (*this); \
Index: lilypond/lily/audio-element.cc
diff -u lilypond/lily/audio-element.cc:1.21 lilypond/lily/audio-element.cc:1.22
--- lilypond/lily/audio-element.cc:1.21 Thu Mar 10 14:36:16 2005
+++ lilypond/lily/audio-element.cc Thu Oct 13 23:25:14 2005
@@ -19,5 +19,5 @@
char const *
Audio_element::name () const
{
- return classname (this);
+ return this->class_name ();
}
Index: lilypond/lily/context.cc
diff -u lilypond/lily/context.cc:1.67 lilypond/lily/context.cc:1.68
--- lilypond/lily/context.cc:1.67 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/context.cc Thu Oct 13 23:25:14 2005
@@ -495,7 +495,7 @@
Context *sc = (Context *) SCM_CELL_WORD_1 (s);
scm_puts ("#<", port);
- scm_puts (classname (sc), port);
+ scm_puts (sc->class_name (), port);
if (Context_def *d = unsmob_context_def (sc->definition_))
{
scm_puts (" ", port);
Index: lilypond/lily/font-metric.cc
diff -u lilypond/lily/font-metric.cc:1.100 lilypond/lily/font-metric.cc:1.101
--- lilypond/lily/font-metric.cc:1.100 Mon Sep 12 12:46:48 2005
+++ lilypond/lily/font-metric.cc Thu Oct 13 23:25:14 2005
@@ -112,7 +112,7 @@
{
Font_metric *m = unsmob_metrics (s);
scm_puts ("#<", port);
- scm_puts (classname (m), port);
+ scm_puts (m->class_name (), port);
scm_puts (" ", port);
scm_write (m->description_, port);
scm_puts (">", port);
Index: lilypond/lily/grob.cc
diff -u lilypond/lily/grob.cc:1.144 lilypond/lily/grob.cc:1.145
--- lilypond/lily/grob.cc:1.144 Mon Sep 12 23:33:24 2005
+++ lilypond/lily/grob.cc Thu Oct 13 23:25:14 2005
@@ -534,7 +534,7 @@
SCM meta = get_property ("meta");
SCM nm = scm_assoc (ly_symbol2scm ("name"), meta);
nm = (scm_is_pair (nm)) ? scm_cdr (nm) : SCM_EOL;
- return scm_is_symbol (nm) ? ly_symbol2string (nm) : classname (this);
+ return scm_is_symbol (nm) ? ly_symbol2string (nm) : this->class_name ();
}
void
Index: lilypond/lily/include/afm.hh
diff -u lilypond/lily/include/afm.hh:1.36 lilypond/lily/include/afm.hh:1.37
--- lilypond/lily/include/afm.hh:1.36 Mon Sep 12 12:46:49 2005
+++ lilypond/lily/include/afm.hh Thu Oct 13 23:25:14 2005
@@ -1,4 +1,3 @@
-
/*
afm.hh -- declare Adobe_font_metric
@@ -19,6 +18,7 @@
class Adobe_font_metric : public Simple_font_metric
{
+ DECLARE_CLASSNAME(Adobe_font_metric);
public:
AFM_Font_info *font_info_;
unsigned int checksum_;
Index: lilypond/lily/include/audio-element.hh
diff -u lilypond/lily/include/audio-element.hh:1.20
lilypond/lily/include/audio-element.hh:1.21
--- lilypond/lily/include/audio-element.hh:1.20 Thu Aug 11 11:43:36 2005
+++ lilypond/lily/include/audio-element.hh Thu Oct 13 23:25:14 2005
@@ -16,6 +16,7 @@
public:
Audio_element ();
virtual ~Audio_element ();
+ VIRTUAL_COPY_CONSTRUCTOR(Audio_element,Audio_element);
virtual char const *name () const;
protected:
};
Index: lilypond/lily/include/context.hh
diff -u lilypond/lily/include/context.hh:1.27
lilypond/lily/include/context.hh:1.28
--- lilypond/lily/include/context.hh:1.27 Mon Sep 12 12:46:49 2005
+++ lilypond/lily/include/context.hh Thu Oct 13 23:25:14 2005
@@ -14,6 +14,7 @@
#include "moment.hh"
#include "lily-proto.hh"
+#include "virtual-methods.hh"
class Context
{
@@ -21,7 +22,7 @@
Context (Context const &src);
DECLARE_SMOBS (Context, dummy);
-
+ DECLARE_CLASSNAME(Context);
void terminate ();
private:
Index: lilypond/lily/include/font-metric.hh
diff -u lilypond/lily/include/font-metric.hh:1.39
lilypond/lily/include/font-metric.hh:1.40
--- lilypond/lily/include/font-metric.hh:1.39 Mon May 2 12:39:28 2005
+++ lilypond/lily/include/font-metric.hh Thu Oct 13 23:25:14 2005
@@ -12,9 +12,12 @@
#include "box.hh"
#include "lily-proto.hh"
#include "smobs.hh"
+#include "virtual-methods.hh"
class Font_metric
{
+ DECLARE_CLASSNAME(Font_metric);
+
public:
SCM description_;
String file_name_;
@@ -52,6 +55,7 @@
class Simple_font_metric : public Font_metric
{
+ DECLARE_CLASSNAME(Simple_font_metric);
public:
};
Index: lilypond/lily/include/global-context.hh
diff -u lilypond/lily/include/global-context.hh:1.10
lilypond/lily/include/global-context.hh:1.11
--- lilypond/lily/include/global-context.hh:1.10 Tue May 31 15:25:26 2005
+++ lilypond/lily/include/global-context.hh Thu Oct 13 23:25:14 2005
@@ -17,6 +17,8 @@
PQueue<Moment> extra_mom_pq_;
Output_def *output_def_;
+ DECLARE_CLASSNAME(Global_context);
+
friend class Output_def;
public:
Global_context (Output_def *, Moment final, Object_key *key);
Index: lilypond/lily/include/grob.hh
diff -u lilypond/lily/include/grob.hh:1.63 lilypond/lily/include/grob.hh:1.64
--- lilypond/lily/include/grob.hh:1.63 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/include/grob.hh Thu Oct 13 23:25:14 2005
@@ -50,6 +50,7 @@
void substitute_object_links (SCM, SCM);
char status_;
+ DECLARE_CLASSNAME(Grob);
public:
Object_key const *get_key () const;
@@ -65,7 +66,7 @@
virtual Grob *clone (int count) const;
DECLARE_SCHEME_CALLBACK (stencil_extent, (SCM smob, SCM axis));
-
+
String name () const;
/*
Properties
Index: lilypond/lily/include/item.hh
diff -u lilypond/lily/include/item.hh:1.58 lilypond/lily/include/item.hh:1.59
--- lilypond/lily/include/item.hh:1.58 Tue Jul 19 00:41:14 2005
+++ lilypond/lily/include/item.hh Thu Oct 13 23:25:14 2005
@@ -21,6 +21,7 @@
{
Drul_array<Item *> broken_to_drul_;
+ DECLARE_CLASSNAME(Item);
public:
Item (SCM, Object_key const *);
Item (Item const &, int count);
Index: lilypond/lily/include/open-type-font.hh
diff -u lilypond/lily/include/open-type-font.hh:1.21
lilypond/lily/include/open-type-font.hh:1.22
--- lilypond/lily/include/open-type-font.hh:1.21 Mon Sep 12 12:46:49 2005
+++ lilypond/lily/include/open-type-font.hh Thu Oct 13 23:25:14 2005
@@ -31,6 +31,7 @@
Index_to_charcode_map index_to_charcode_map_;
Open_type_font (FT_Face);
+ DECLARE_CLASSNAME(Open_type_font);
public:
SCM get_subfonts () const;
SCM get_global_table () const;
Index: lilypond/lily/include/spanner.hh
diff -u lilypond/lily/include/spanner.hh:1.76
lilypond/lily/include/spanner.hh:1.77
--- lilypond/lily/include/spanner.hh:1.76 Tue Jul 19 00:41:14 2005
+++ lilypond/lily/include/spanner.hh Thu Oct 13 23:25:14 2005
@@ -31,6 +31,8 @@
Drul_array<Item *> spanned_drul_;
int break_index_;
+ DECLARE_CLASSNAME(Spanner);
+
public:
DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
Index: lilypond/lily/include/tfm.hh
diff -u lilypond/lily/include/tfm.hh:1.30 lilypond/lily/include/tfm.hh:1.31
--- lilypond/lily/include/tfm.hh:1.30 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/tfm.hh Thu Oct 13 23:25:14 2005
@@ -142,6 +142,7 @@
class Tex_font_metric : public Simple_font_metric
{
+ DECLARE_CLASSNAME(Tex_font_metric);
public:
static SCM make_tfm (String file_name);
Index: lilypond/lily/midi-item.cc
diff -u lilypond/lily/midi-item.cc:1.87 lilypond/lily/midi-item.cc:1.88
--- lilypond/lily/midi-item.cc:1.87 Sat Aug 27 20:05:58 2005
+++ lilypond/lily/midi-item.cc Thu Oct 13 23:25:14 2005
@@ -473,5 +473,5 @@
char const *
Midi_item::name () const
{
- return classname (this);
+ return this->class_name ();
}
Index: lilypond/lily/music-iterator.cc
diff -u lilypond/lily/music-iterator.cc:1.103
lilypond/lily/music-iterator.cc:1.104
--- lilypond/lily/music-iterator.cc:1.103 Mon Sep 12 12:46:48 2005
+++ lilypond/lily/music-iterator.cc Thu Oct 13 23:25:14 2005
@@ -207,7 +207,7 @@
char s[1000];
Music_iterator *iter = unsmob_iterator (sm);
- sprintf (s, "#<%s>", classname (iter));
+ sprintf (s, "#<%s>", iter->class_name ());
scm_puts (s, port);
return 1;
}
Index: lilypond/lily/music-output.cc
diff -u lilypond/lily/music-output.cc:1.5 lilypond/lily/music-output.cc:1.6
--- lilypond/lily/music-output.cc:1.5 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/music-output.cc Thu Oct 13 23:25:14 2005
@@ -48,7 +48,7 @@
{
Music_output *sc = (Music_output *) SCM_CELL_WORD_1 (s);
scm_puts ("#<", p);
- scm_puts (classname (sc), p);
+ scm_puts (sc->class_name (), p);
scm_puts (">", p);
return 1;
Index: lilypond/lily/music-scheme.cc
diff -u lilypond/lily/music-scheme.cc:1.13 lilypond/lily/music-scheme.cc:1.14
--- lilypond/lily/music-scheme.cc:1.13 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/music-scheme.cc Thu Oct 13 23:25:14 2005
@@ -47,16 +47,6 @@
return SCM_UNSPECIFIED;
}
-LY_DEFINE (ly_music_name, "ly:music-name",
- 1, 0, 0, (SCM mus),
- "Return the name of @var{music}.")
-{
- Music *m = unsmob_music (mus);
- SCM_ASSERT_TYPE (m, mus, SCM_ARG1, __FUNCTION__, "music");
-
- char const *nm = classname (m);
- return scm_makfrom0str (nm);
-}
/* todo: property args */
LY_DEFINE (ly_make_music, "ly:make-music",
Index: lilypond/lily/music.cc
diff -u lilypond/lily/music.cc:1.142 lilypond/lily/music.cc:1.143
--- lilypond/lily/music.cc:1.142 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/music.cc Thu Oct 13 23:25:14 2005
@@ -38,7 +38,7 @@
if (scm_is_symbol (nm))
return ly_symbol2string (nm);
else
- return classname (this);
+ return "Music";
}
Music::Music (SCM init)
@@ -142,7 +142,7 @@
if (scm_is_symbol (nm) || scm_is_string (nm))
scm_display (nm, p);
else
- scm_puts (classname (m), p);
+ scm_puts ("Music", p);
/* Printing properties takes a lot of time, especially during backtraces.
For inspecting, it is better to explicitly use an inspection
Index: lilypond/lily/output-def.cc
diff -u lilypond/lily/output-def.cc:1.19 lilypond/lily/output-def.cc:1.20
--- lilypond/lily/output-def.cc:1.19 Thu Jul 21 01:11:50 2005
+++ lilypond/lily/output-def.cc Thu Oct 13 23:25:14 2005
@@ -90,7 +90,7 @@
{
Output_def * def = unsmob_output_def (s);
scm_puts ("#< ", p);
- scm_puts (classname (def), p);
+ scm_puts (def->class_name (), p);
(void)def;
scm_puts (">", p);
Index: lilypond/lily/output-property-music-iterator.cc
diff -u lilypond/lily/output-property-music-iterator.cc:1.18
lilypond/lily/output-property-music-iterator.cc:1.19
--- lilypond/lily/output-property-music-iterator.cc:1.18 Tue Apr 12
22:49:28 2005
+++ lilypond/lily/output-property-music-iterator.cc Thu Oct 13 23:25:14 2005
@@ -27,7 +27,7 @@
bool accepted = try_music (get_music ());
if (!accepted)
get_music ()->origin ()->warning (_f ("junking event: `%s'",
- classname (get_music ())));
+ get_music (->class_name ())));
}
Simple_music_iterator::process (m);
}
Index: lilypond/lily/paper-book.cc
diff -u lilypond/lily/paper-book.cc:1.118 lilypond/lily/paper-book.cc:1.119
--- lilypond/lily/paper-book.cc:1.118 Mon Oct 10 21:29:47 2005
+++ lilypond/lily/paper-book.cc Thu Oct 13 23:25:14 2005
@@ -58,7 +58,7 @@
Paper_book *b = (Paper_book *) SCM_CELL_WORD_1 (smob);
scm_puts ("#<", port);
- scm_puts (classname (b), port);
+ scm_puts (b->class_name (), port);
scm_puts (" ", port);
scm_puts (">", port);
return 1;
Index: lilypond/lily/paper-system.cc
diff -u lilypond/lily/paper-system.cc:1.23 lilypond/lily/paper-system.cc:1.24
--- lilypond/lily/paper-system.cc:1.23 Sat Oct 1 23:31:34 2005
+++ lilypond/lily/paper-system.cc Thu Oct 13 23:25:14 2005
@@ -51,7 +51,7 @@
{
Paper_system *p = (Paper_system *) SCM_CELL_WORD_1 (smob);
scm_puts ("#<", port);
- scm_puts (classname (p), port);
+ scm_puts ("Paper_system", port);
scm_display (p->mutable_property_alist_, port);
scm_display (p->immutable_property_alist_, port);
Index: lilypond/lily/translator-ctors.cc
diff -u lilypond/lily/translator-ctors.cc:1.45
lilypond/lily/translator-ctors.cc:1.46
--- lilypond/lily/translator-ctors.cc:1.45 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/translator-ctors.cc Thu Oct 13 23:25:14 2005
@@ -33,7 +33,7 @@
if (!global_translator_dict)
global_translator_dict = new Scheme_hash_table;
- SCM k = ly_symbol2scm (classname (t));
+ SCM k = ly_symbol2scm (t->class_name ());
global_translator_dict->set (k, t->self_scm ());
t->unprotect ();
Index: lilypond/lily/translator-group.cc
diff -u lilypond/lily/translator-group.cc:1.147
lilypond/lily/translator-group.cc:1.148
--- lilypond/lily/translator-group.cc:1.147 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/translator-group.cc Thu Oct 13 23:25:14 2005
@@ -220,7 +220,7 @@
{
Translator_group *me = (Translator_group *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Translator_group ", port);
- scm_puts (classname (me), port);
+ scm_puts (me->class_name (), port);
scm_display (me->simple_trans_list_, port);
scm_puts (" >", port);
return 1;
Index: lilypond/lily/translator-scheme.cc
diff -u lilypond/lily/translator-scheme.cc:1.33
lilypond/lily/translator-scheme.cc:1.34
--- lilypond/lily/translator-scheme.cc:1.33 Mon Jul 18 23:37:25 2005
+++ lilypond/lily/translator-scheme.cc Thu Oct 13 23:25:14 2005
@@ -17,7 +17,7 @@
{
Translator *tr = unsmob_translator (trans);
SCM_ASSERT_TYPE (tr, trans, SCM_ARG1, __FUNCTION__, "Translator");
- char const *nm = classname (tr);
+ char const *nm = tr->class_name ();
return ly_symbol2scm (nm);
}
Index: lilypond/lily/translator.cc
diff -u lilypond/lily/translator.cc:1.92 lilypond/lily/translator.cc:1.93
--- lilypond/lily/translator.cc:1.92 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/translator.cc Thu Oct 13 23:25:14 2005
@@ -151,7 +151,7 @@
{
Translator *me = (Translator *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Translator ", port);
- scm_puts (classname (me), port);
+ scm_puts (me->class_name (), port);
scm_puts (" >", port);
return 1;
}
Index: lilypond/lily/tuplet-bracket.cc
diff -u lilypond/lily/tuplet-bracket.cc:1.108
lilypond/lily/tuplet-bracket.cc:1.109
--- lilypond/lily/tuplet-bracket.cc:1.108 Sat Oct 1 22:57:16 2005
+++ lilypond/lily/tuplet-bracket.cc Thu Oct 13 23:25:14 2005
@@ -67,20 +67,24 @@
|| me->get_bound (RIGHT)->break_status_dir ())
return 0;
- Grob *s1 = Note_column::get_stem (cols[0]);
- Grob *s2 = Note_column::get_stem (cols.top ());
+ Drul_array<Grob*> stems (Note_column::get_stem (cols[0]),
+ Note_column::get_stem (cols.top ()));
- if (s2 != me->get_bound (RIGHT))
+ if (dynamic_cast<Item*> (stems[RIGHT])->get_column ()
+ != me->get_bound (RIGHT)->get_column())
return 0;
- Grob *b1 = s1 ? Stem::get_beam (s1) : 0;
- Grob *b2 = s2 ? Stem::get_beam (s2) : 0;
-
+ Drul_array<Grob*> beams;
+ Direction d = LEFT;
+ do {
+ beams[d] = stems[d] ? Stem::get_beam (stems[d]) : 0;
+ } while (flip (&d) != LEFT);
+
*equally_long = false;
- if (! (b1 && (b1 == b2) && !me->is_broken ()))
+ if (! (beams[LEFT] && (beams[LEFT] == beams[RIGHT]) && !me->is_broken ()))
return 0;
- extract_grob_set (b1, "stems", beam_stems);
+ extract_grob_set (beams[LEFT], "stems", beam_stems);
if (beam_stems.size () == 0)
{
programming_error ("beam under tuplet bracket has no stems");
@@ -88,8 +92,8 @@
return 0;
}
- *equally_long = (beam_stems[0] == s1 && beam_stems.top () == s2);
- return b1;
+ *equally_long = (beam_stems[0] == stems[LEFT] && beam_stems.top () ==
stems[RIGHT]);
+ return beams[LEFT];
}
/*
@@ -128,7 +132,6 @@
bool equally_long = false;
Grob *par_beam = parallel_beam (me, columns, &equally_long);
-
Spanner *sp = dynamic_cast<Spanner *> (me);
bool bracket_visibility = !(par_beam && equally_long);
Index: lilypond/ly/titling-init.ly
diff -u lilypond/ly/titling-init.ly:1.21 lilypond/ly/titling-init.ly:1.22
--- lilypond/ly/titling-init.ly:1.21 Tue Aug 23 03:05:33 2005
+++ lilypond/ly/titling-init.ly Thu Oct 13 23:25:14 2005
@@ -116,7 +116,7 @@
\fill-line {
\on-the-fly #print-page-number-check-first \fromproperty
#'page:page-number-string
\on-the-fly #not-first-page \fromproperty #'header:instrument
- ""
+ " "
}
oddFooterMarkup = \markup {
Index: lilypond/make/lilypond.fedora.spec.in
diff -u lilypond/make/lilypond.fedora.spec.in:1.21
lilypond/make/lilypond.fedora.spec.in:1.22
--- lilypond/make/lilypond.fedora.spec.in:1.21 Sun Oct 2 14:56:04 2005
+++ lilypond/make/lilypond.fedora.spec.in Thu Oct 13 23:25:15 2005
@@ -101,8 +101,9 @@
touch /tmp/.lilypond-install
%if %{info}
-/sbin/install-info %{_infodir}/lilypond/lilypond.info.gz %{_infodir}/dir
-/sbin/install-info %{_infodir}/lilypond/music-glossary.info.gz %{_infodir}/dir
+ /sbin/install-info %{_infodir}/lilypond/lilypond.info.gz %{_infodir}/dir
+ /sbin/install-info %{_infodir}/lilypond/lilypond-internals.info.gz
%{_infodir}/dir
+ /sbin/install-info %{_infodir}/lilypond/music-glossary.info.gz
%{_infodir}/dir
%endif
export PACKAGEDIR=%{_datadir}/lilypond/@TOPLEVEL_VERSION@
@@ -129,6 +130,7 @@
%if %{info}
/sbin/install-info --delete %{_infodir}/lilypond/lilypond.info.gz
%{_infodir}/dir
+ /sbin/install-info --delete
%{_infodir}/lilypond/lilypond-internals.info.gz %{_infodir}/dir
/sbin/install-info --delete %{_infodir}/lilypond/music-glossary.info.gz
%{_infodir}/dir
%endif
Index: lilypond/scm/safe-lily.scm
diff -u lilypond/scm/safe-lily.scm:1.39 lilypond/scm/safe-lily.scm:1.40
--- lilypond/scm/safe-lily.scm:1.39 Sun Oct 2 01:16:08 2005
+++ lilypond/scm/safe-lily.scm Thu Oct 13 23:25:15 2005
@@ -83,7 +83,6 @@
ly:music-length
ly:music-list?
ly:music-mutable-properties
- ly:music-name
ly:music-property
ly:make-score
ly:music-set-property!
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
