lilypond/bugs grace-large.ly
CVSROOT:/cvsroot/lilypond Module name:lilypond Branch: Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 12:58:06 Modified files: bugs : grace-large.ly Log message: CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lily-bugs/bugs/grace-large.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text ___ Lilypond-cvs mailing list Lilypond-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond ./ChangeLog lily/grace-engraver.cc
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 12:57:49
Modified files:
. : ChangeLog
lily : grace-engraver.cc
Log message:
(consider_change_grace_settings): new function.
(initialize): also consider_change_grace_settings() on
initialization. Fixes large grace notes at start of score.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3473&tr2=1.3474&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grace-engraver.cc.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3473 lilypond/ChangeLog:1.3474
--- lilypond/ChangeLog:1.3473 Tue Apr 19 12:48:40 2005
+++ lilypond/ChangeLog Tue Apr 19 12:57:48 2005
@@ -1,5 +1,9 @@
2005-04-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/grace-engraver.cc (consider_change_grace_settings): new function.
+ (initialize): also consider_change_grace_settings() on
+ initialization. Fixes large grace notes at start of score.
+
* lily/break-align-interface.cc (do_alignment): don't translate if
total_extent is empty.
Index: lilypond/lily/grace-engraver.cc
diff -u lilypond/lily/grace-engraver.cc:1.8 lilypond/lily/grace-engraver.cc:1.9
--- lilypond/lily/grace-engraver.cc:1.8 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/grace-engraver.cc Tue Apr 19 12:57:49 2005
@@ -12,9 +12,11 @@
class Grace_engraver : public Engraver
{
+ void consider_change_grace_settings ();
protected:
virtual void start_translation_timestep ();
virtual void derived_mark () const;
+ virtual void initialize ();
TRANSLATOR_DECLARATIONS (Grace_engraver);
Moment last_moment_;
@@ -25,17 +27,17 @@
Grace_engraver::Grace_engraver ()
{
grace_settings_ = SCM_EOL;
+ last_moment_ = Moment (Rational (-1,1));
}
void
-Grace_engraver::derived_mark () const
+Grace_engraver::initialize ()
{
- scm_gc_mark (grace_settings_);
- Engraver::derived_mark ();
+ consider_change_grace_settings ();
}
void
-Grace_engraver::start_translation_timestep ()
+Grace_engraver::consider_change_grace_settings ()
{
Moment now = now_mom ();
if (last_moment_.grace_part_ && !now.grace_part_)
@@ -88,7 +90,20 @@
}
}
- last_moment_ = now;
+ last_moment_ = now_mom();
+}
+
+void
+Grace_engraver::derived_mark () const
+{
+ scm_gc_mark (grace_settings_);
+ Engraver::derived_mark ();
+}
+
+void
+Grace_engraver::start_translation_timestep ()
+{
+ consider_change_grace_settings ();
}
ADD_TRANSLATOR (Grace_engraver,
___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond ./ChangeLog lily/slur-scoring.cc lily/...
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 13:11:25
Modified files:
. : ChangeLog
lily : slur-scoring.cc stem.cc
Log message:
* lily/slur-scoring.cc (get_bound_info): robustness: substitute
relative_coordinate if extent is empty.
* lily/stem.cc (width_callback): determine correct extent if flag
is not there. This fixes slur-no-flag.ly
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3474&tr2=1.3475&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur-scoring.cc.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/stem.cc.diff?tr1=1.270&tr2=1.271&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3474 lilypond/ChangeLog:1.3475
--- lilypond/ChangeLog:1.3474 Tue Apr 19 12:57:48 2005
+++ lilypond/ChangeLog Tue Apr 19 13:11:25 2005
@@ -1,5 +1,11 @@
2005-04-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/slur-scoring.cc (get_bound_info): robustness: substitute
+ relative_coordinate if extent is empty.
+
+ * lily/stem.cc (width_callback): determine correct extent if flag
+ is not there. This fixes slur-no-flag.ly
+
* lily/grace-engraver.cc (consider_change_grace_settings): new function.
(initialize): also consider_change_grace_settings() on
initialization. Fixes large grace notes at start of score.
Index: lilypond/lily/slur-scoring.cc
diff -u lilypond/lily/slur-scoring.cc:1.47 lilypond/lily/slur-scoring.cc:1.48
--- lilypond/lily/slur-scoring.cc:1.47 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/slur-scoring.cc Tue Apr 19 13:11:25 2005
@@ -240,8 +240,20 @@
extremes[d].note_column_ = extremes[d].bound_;
extremes[d].stem_ = Note_column::get_stem (extremes[d].note_column_);
extremes[d].stem_dir_ = get_grob_direction (extremes[d].stem_);
- extremes[d].stem_extent_[X_AXIS]
- = extremes[d].stem_->extent (common_[X_AXIS], X_AXIS);
+
+ for (int a = X_AXIS; a < NO_AXES; a++)
+ {
+ Axis ax = Axis (a);
+ Interval s = extremes[d].stem_->extent (common_[ax], ax);
+ if (s.is_empty ())
+ {
+ programming_error ("Stem has no extent in Slur_score_state");
+ s = Interval (0,0)
+ + extremes[d].stem_->relative_coordinate (common_[ax], ax);
+ }
+ extremes[d].stem_extent_[ax] = s;
+ }
+
extremes[d].stem_extent_[Y_AXIS]
= extremes[d].stem_->extent (common_[Y_AXIS], Y_AXIS);
extremes[d].slur_head_
Index: lilypond/lily/stem.cc
diff -u lilypond/lily/stem.cc:1.270 lilypond/lily/stem.cc:1.271
--- lilypond/lily/stem.cc:1.270 Mon Apr 18 15:28:33 2005
+++ lilypond/lily/stem.cc Tue Apr 19 13:11:25 2005
@@ -615,8 +615,8 @@
}
else
{
- r = flag (me).extent (X_AXIS)
- + thickness (me) / 2;
+ r = Interval (-1,1) * thickness (me) * 0.5;
+ r.unite (flag (me).extent (X_AXIS));
}
return ly_interval2scm (r);
}
___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond/bugs slur-no-flag.ly
CVSROOT:/cvsroot/lilypond Module name:lilypond Branch: Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 13:11:30 Modified files: bugs : slur-no-flag.ly Log message: * lily/slur-scoring.cc (get_bound_info): robustness: substitute relative_coordinate if extent is empty. * lily/stem.cc (width_callback): determine correct extent if flag is not there. This fixes slur-no-flag.ly CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lily-bugs/bugs/slur-no-flag.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text ___ Lilypond-cvs mailing list Lilypond-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond ./ChangeLog lily/break-align-interface...
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 12:48:41
Modified files:
. : ChangeLog
lily : break-align-interface.cc
ttftool: parse.c ps.c util.c
Log message:
(do_alignment): don't translate if
total_extent is empty.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3472&tr2=1.3473&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/break-align-interface.cc.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/parse.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/ps.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/util.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3472 lilypond/ChangeLog:1.3473
--- lilypond/ChangeLog:1.3472 Tue Apr 19 00:14:59 2005
+++ lilypond/ChangeLog Tue Apr 19 12:48:40 2005
@@ -1,11 +1,14 @@
2005-04-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/break-align-interface.cc (do_alignment): don't translate if
+ total_extent is empty.
+
* buildscripts/lilypond-{login,profile}.sh (Module): remove file.
2005-04-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scm/output-ps.scm (grob-cause): don't add cwd if path starts
- with
+ with slash.
2005-04-18 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: lilypond/lily/break-align-interface.cc
diff -u lilypond/lily/break-align-interface.cc:1.48
lilypond/lily/break-align-interface.cc:1.49
--- lilypond/lily/break-align-interface.cc:1.48 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/break-align-interface.cc Tue Apr 19 12:48:41 2005
@@ -247,6 +247,9 @@
total_extent.unite (extents[i] + here);
}
+ if (total_extent.is_empty ())
+return ;
+
if (me->break_status_dir () == LEFT)
{
alignment_off = -total_extent[RIGHT] - extra_right_space;
Index: lilypond/ttftool/parse.c
diff -u lilypond/ttftool/parse.c:1.1 lilypond/ttftool/parse.c:1.2
--- lilypond/ttftool/parse.c:1.1Sun Feb 20 18:07:11 2005
+++ lilypond/ttftool/parse.cTue Apr 19 12:48:41 2005
@@ -3,7 +3,7 @@
#include
#include
#include
-#include
+#include
#include "types.h"
#include "proto.h"
Index: lilypond/ttftool/ps.c
diff -u lilypond/ttftool/ps.c:1.4 lilypond/ttftool/ps.c:1.5
--- lilypond/ttftool/ps.c:1.4 Sat Feb 26 11:20:36 2005
+++ lilypond/ttftool/ps.c Tue Apr 19 12:48:41 2005
@@ -3,7 +3,7 @@
#include
#include
#include
-#include
+#include
#include "types.h"
#include "proto.h"
Index: lilypond/ttftool/util.c
diff -u lilypond/ttftool/util.c:1.3 lilypond/ttftool/util.c:1.4
--- lilypond/ttftool/util.c:1.3 Sat Feb 26 11:20:36 2005
+++ lilypond/ttftool/util.c Tue Apr 19 12:48:41 2005
@@ -2,7 +2,6 @@
#include
#include
-#include
#include
#include
#include
___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond ./ChangeLog lily/dynamic-engraver.cc
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 13:22:20
Modified files:
. : ChangeLog
lily : dynamic-engraver.cc
Log message:
(acknowledge_grob): add note-column
also to finished cresc as right bound. This fixes:
skip-string-decresc.ly
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3475&tr2=1.3476&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-engraver.cc.diff?tr1=1.164&tr2=1.165&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3475 lilypond/ChangeLog:1.3476
--- lilypond/ChangeLog:1.3475 Tue Apr 19 13:11:25 2005
+++ lilypond/ChangeLog Tue Apr 19 13:22:19 2005
@@ -1,5 +1,9 @@
2005-04-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/dynamic-engraver.cc (acknowledge_grob): add note-column
+ also to finished cresc as right bound. This fixes:
+ skip-string-decresc.ly
+
* lily/slur-scoring.cc (get_bound_info): robustness: substitute
relative_coordinate if extent is empty.
Index: lilypond/lily/dynamic-engraver.cc
diff -u lilypond/lily/dynamic-engraver.cc:1.164
lilypond/lily/dynamic-engraver.cc:1.165
--- lilypond/lily/dynamic-engraver.cc:1.164 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/dynamic-engraver.cc Tue Apr 19 13:22:20 2005
@@ -384,12 +384,22 @@
script_->set_parent (unsmob_grob (scm_car (head)), X_AXIS);
}
- if (cresc_ && !cresc_->get_bound (LEFT))
+ if (cresc_)
{
- cresc_->set_bound (LEFT, info.grob_);
- add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
+ if (!cresc_->get_bound (LEFT))
+ {
+ cresc_->set_bound (LEFT, info.grob_);
+ add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
+ }
+ cresc_->set_bound (RIGHT, info.grob_);
+ }
+
+ if (finished_cresc_)
+ {
+ finished_cresc_->set_bound (RIGHT, info.grob_);
}
}
+
else if (Script_interface::has_interface (info.grob_) && script_)
{
SCM p = info.grob_->get_property ("script-priority");
___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond lily/simple-spacer.cc scripts/convert-...
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 17:29:12
Modified files:
lily : simple-spacer.cc
scripts: convert-ly.py
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/simple-spacer.cc.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/convert-ly.py.diff?tr1=1.237&tr2=1.238&r1=text&r2=text
Patches:
Index: lilypond/lily/simple-spacer.cc
diff -u lilypond/lily/simple-spacer.cc:1.79 lilypond/lily/simple-spacer.cc:1.80
--- lilypond/lily/simple-spacer.cc:1.79 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/simple-spacer.cc Tue Apr 19 17:29:12 2005
@@ -273,10 +273,10 @@
by constraints, eg.
- =
- | |
- o|o| x ##x
-
+ . =
+ . | |
+ .o|o|x ##x
+ .
The ## forces the notes apart; we shouldn't allow the O's to touch
this closely.
@@ -418,7 +418,7 @@
for (int i = 0; i < cols.size () - 1; i++)
{
- for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
+g for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
scm_is_pair (s); s = scm_cdr (s))
{
Grob *other = unsmob_grob (scm_caar (s));
Index: lilypond/scripts/convert-ly.py
diff -u lilypond/scripts/convert-ly.py:1.237
lilypond/scripts/convert-ly.py:1.238
--- lilypond/scripts/convert-ly.py:1.237Thu Apr 14 10:06:04 2005
+++ lilypond/scripts/convert-ly.py Tue Apr 19 17:29:12 2005
@@ -2137,7 +2137,7 @@
def conv (str):
if re.search ('textheight', str):
sys.stderr.write ('\n')
- sys.stderr.write (NOT_SMART % "tuning of page layout")
+ sys.stderr.write (NOT_SMART % "tuning of textheight")
sys.stderr.write ('\n')
sys.stderr.write (UPDATE_MANUALLY)
sys.stderr.write ('\n')
@@ -2153,7 +2153,6 @@
str = re.sub (r'\\([a-zA-Z]+)Context\b', func, str)
-
str = re.sub ('ly:paper-lookup', 'ly:output-def-lookup', str)
return str
___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond lily/simple-spacer.cc scm/define-grobs...
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 17:32:05
Modified files:
lily : simple-spacer.cc
scm: define-grobs.scm
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/simple-spacer.cc.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.187&tr2=1.188&r1=text&r2=text
Patches:
Index: lilypond/lily/simple-spacer.cc
diff -u lilypond/lily/simple-spacer.cc:1.80 lilypond/lily/simple-spacer.cc:1.81
--- lilypond/lily/simple-spacer.cc:1.80 Tue Apr 19 17:29:12 2005
+++ lilypond/lily/simple-spacer.cc Tue Apr 19 17:32:02 2005
@@ -418,7 +418,7 @@
for (int i = 0; i < cols.size () - 1; i++)
{
-g for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
+ for (SCM s = Spaceable_grob::get_minimum_distances (cols[i]);
scm_is_pair (s); s = scm_cdr (s))
{
Grob *other = unsmob_grob (scm_caar (s));
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.187 lilypond/scm/define-grobs.scm:1.188
--- lilypond/scm/define-grobs.scm:1.187 Tue Apr 12 23:38:49 2005
+++ lilypond/scm/define-grobs.scm Tue Apr 19 17:32:02 2005
@@ -19,7 +19,8 @@
(print-function . ,Accidental_interface::print)
(inside-slur . #t)
(cautionary-style . parentheses)
- (after-line-breaking-callback .
,Accidental_interface::after_line_breaking) (meta . ((interfaces .
(item-interface accidental-interface
+ (after-line-breaking-callback .
,Accidental_interface::after_line_breaking)
+ (meta . ((interfaces . (item-interface accidental-interface
font-interface
))
@@ -643,7 +644,10 @@
(word-space . 0.6)
(font-series . bold-narrow)
(font-size . 1.0)
- (meta . ((interfaces . (rhythmic-grob-interface
lyric-syllable-interface self-alignment-interface text-interface font-interface
item-interface
+ (meta . ((interfaces . (rhythmic-grob-interface
+ lyric-syllable-interface
+ self-alignment-interface text-interface
+ font-interface item-interface
))
(MensuralLigature
@@ -691,7 +695,8 @@
(thickness . 1)
(height . 2.0)
(staff-padding . 3)
- (meta . ((interfaces . (spanner-interface side-position-interface
measure-grouping-interface
+ (meta . ((interfaces . (spanner-interface side-position-interface
+ measure-grouping-interface
))
(MultiMeasureRest
. (
@@ -703,7 +708,9 @@
(thick-thickness . 6.6)
(hair-thickness . 2.0)
(padding . 1)
- (meta . ((interfaces . (multi-measure-rest-interface
multi-measure-interface rest-interface font-interface
staff-symbol-referencer-interface
+ (meta . ((interfaces . (multi-measure-rest-interface
+ multi-measure-interface rest-interface
+ font-interface
staff-symbol-referencer-interface
))
(MultiMeasureRestNumber
@@ -717,7 +724,9 @@
(padding . 0.4)
(staff-padding . 0.4)
(font-encoding . fetaNumber)
- (meta . ((interfaces . (side-position-interface multi-measure-interface
self-alignment-interface font-interface spanner-interface text-interface
+ (meta . ((interfaces . (side-position-interface
+ multi-measure-interface self-alignment-interface
+ font-interface spanner-interface
text-interface
))
(MultiMeasureRestText
. (
@@ -729,7 +738,9 @@
(direction . 1)
(padding . 0.2)
(staff-padding . 0.25)
- (meta . ((interfaces . (side-position-interface multi-measure-interface
self-alignment-interface font-interface spanner-interface text-interface
+ (meta . ((interfaces . (side-position-interface
+ multi-measure-interface
self-alignment-interface font-interface
+ spanner-interface text-interface
))
(NoteCollision
___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond/scm define-grobs.scm
CVSROOT:/cvsroot/lilypond Module name:lilypond Branch: Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 17:34:12 Modified files: scm: define-grobs.scm Log message: CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.188&tr2=1.189&r1=text&r2=text Patches: Index: lilypond/scm/define-grobs.scm diff -u lilypond/scm/define-grobs.scm:1.188 lilypond/scm/define-grobs.scm:1.189 --- lilypond/scm/define-grobs.scm:1.188 Tue Apr 19 17:32:02 2005 +++ lilypond/scm/define-grobs.scm Tue Apr 19 17:34:12 2005 @@ -21,7 +21,7 @@ (cautionary-style . parentheses) (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (item-interface accidental-interface - font-interface + font-interface )) (AccidentalPlacement @@ -48,7 +48,8 @@ (breakable . #t) (break-align-symbol . ambitus) (break-visibility . ,begin-of-line-visible) - (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface + (meta . ((interfaces . (axis-group-interface + break-aligned-interface ambitus-interface item-interface )) (AmbitusLine @@ -68,7 +69,10 @@ (X-offset-callbacks . (,Side_position_interface::aligned_side)) (direction . -1) (cautionary-style . parentheses) - (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (item-interface accidental-interface break-aligned-interface side-position-interface font-interface + (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) + (meta . ((interfaces . (item-interface + accidental-interface break-aligned-interface + side-position-interface font-interface )) (AmbitusNoteHead @@ -96,7 +100,9 @@ (direction . -1) (padding . 0.5) (staff-position . 0.0) - (meta . ((interfaces . (arpeggio-interface staff-symbol-referencer-interface side-position-interface item-interface font-interface + (meta . ((interfaces . (arpeggio-interface + staff-symbol-referencer-interface side-position-interface + item-interface font-interface )) (BarLine @@ -129,7 +135,8 @@ (thin-kern . 3.0) (hair-thickness . 1.9) (thick-thickness . 6.0) - (meta . ((interfaces . (bar-line-interface item-interface break-aligned-interface font-interface + (meta . ((interfaces . (bar-line-interface + item-interface break-aligned-interface font-interface )) @@ -165,9 +172,9 @@ ;; layout16 become too small. (font-size . -4) (kern . 0.2) - (meta . ((interfaces . (text-interface rhythmic-grob-interface - bass-figure-interface item-interface - self-alignment-interface font-interface + (meta . ((interfaces . (text-interface + rhythmic-grob-interface bass-figure-interface item-interface + self-alignment-interface font-interface )) (Beam . ( @@ -289,7 +296,9 @@ (right-edge . (extra-space . 0.5)) )) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (meta . ((interfaces . (clef-interface staff-symbol-referencer-interface font-interface break-aligned-interface item-interface + (meta . ((interfaces . (clef-interface + staff-symbol-referencer-interface font-interface + break-aligned-interface item-interface )) (ClusterSpannerBeacon @@ -316,8 +325,9 @@ (word-space . 0.0) (font-family . sans) (font-size . 1.5) - (meta . ((interfaces . (font-interface rhythmic-grob-interface - text-interface chord-name-interface item-interface + (meta . ((interfaces . (font-interface + rhythmic-grob-interface text-interface chord-name-interface + item-interface )) (Custos @@ -352,7 +362,8
lilypond scm/markup.scm scm/define-markup-comma...
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/19 17:18:11
Modified files:
scm: markup.scm define-markup-commands.scm
po : lilypond.pot
mf : feta-nummer-code.mf GNUmakefile
input/test : boxed-stencil.ly
elisp : lilypond-mode.el
buildscripts : mf-to-table.py
Documentation/topdocs: NEWS.tely
. : ChangeLog
Added files:
input/test : compound-time.ly circle.ly
Log message:
* input/test/compound-time.ly: New file.
* input/test/circle.ly: New file.
* Documentation/topdocs/NEWS.tely: Use them.
* input/test/boxed-stencil.ly: Remove \score.
* buildscripts/mf-to-table.py (base): Add .log dependency.
* mf/GNUmakefile: Add PFAemmentaler and PFAaybabtu dependencies on
pfa's. Add .log dependency
* scm/define-markup-commands.scm (lower): New command.
* elisp/lilypond-mode.el (LilyPond-pdf-command): New command,
make it default.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/markup.scm.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/po/lilypond.pot.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-nummer-code.mf.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/GNUmakefile.diff?tr1=1.156&tr2=1.157&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/compound-time.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/circle.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/boxed-stencil.ly.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/elisp/lilypond-mode.el.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/mf-to-table.py.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3476&tr2=1.3477&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3476 lilypond/ChangeLog:1.3477
--- lilypond/ChangeLog:1.3476 Tue Apr 19 13:22:19 2005
+++ lilypond/ChangeLog Tue Apr 19 17:18:10 2005
@@ -1,3 +1,23 @@
+2005-04-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * input/test/compound-time.ly: New file.
+
+ * input/test/circle.ly: New file.
+
+ * Documentation/topdocs/NEWS.tely: Use them.
+
+ * input/test/boxed-stencil.ly: Remove \score.
+
+ * buildscripts/mf-to-table.py (base): Add .log dependency.
+
+ * mf/GNUmakefile: Add PFAemmentaler and PFAaybabtu dependencies on
+ pfa's. Add .log dependency
+
+ * scm/define-markup-commands.scm (lower): New command.
+
+ * elisp/lilypond-mode.el (LilyPond-pdf-command): New command,
+ make it default.
+
2005-04-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/dynamic-engraver.cc (acknowledge_grob): add note-column
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.28
lilypond/Documentation/topdocs/NEWS.tely:1.29
--- lilypond/Documentation/topdocs/NEWS.tely:1.28 Mon Apr 18 20:47:15 2005
+++ lilypond/Documentation/topdocs/NEWS.telyTue Apr 19 17:18:10 2005
@@ -58,24 +58,16 @@
music expression as indented Scheme code.
@item
-A plus sign was added to the number font.
+A plus sign was added to the number font. This enables printing of
+compound time signatures
+
[EMAIL PROTECTED]
@item
A new @code{\circle} markup command allows for all kinds of circled
texts
[EMAIL PROTECTED],relative=2,raggedright,fragment]
-c1
-\set Score.markFormatter
- = #(lambda (mark context)
- (make-circle-markup (format-mark-numbers mark context)))
-\mark \default
-c2 d^\markup{\circle \finger "2"}
-\override Score.BarNumber #'break-visibility = #all-visible
-\override Score.BarNumber #'print-function
- = #(make-stencil-circler 0.1 0.25 Text_interface::print)
[EMAIL PROTECTED] lilypond
-
[EMAIL PROTECTED]
@item
String numbers are now printed on chords as well
@@ -139,7 +131,7 @@
well.
See
@ifhtml
[EMAIL PROTECTED]/../user/out-www/lilypond/Point-and-click.html,Point and click}
[EMAIL PROTECTED]/../user/out-www/lilypond/Point-and-click.html,Point and
click}.
@end ifhtml
@ifnothtml
the section Point and click in he user manual.
@@ -212,10 +204,11 @@
@item
Lily
lilypond ./ChangeLog python/lilylib.py scm/defi...
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 22:19:37
Modified files:
. : ChangeLog
python : lilylib.py
scm: define-grobs.scm define-markup-commands.scm
Log message:
(make_ps_images): switch back to png16m.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3479&tr2=1.3480&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/lilylib.py.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.189&tr2=1.190&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3479 lilypond/ChangeLog:1.3480
--- lilypond/ChangeLog:1.3479 Tue Apr 19 21:33:20 2005
+++ lilypond/ChangeLog Tue Apr 19 22:19:36 2005
@@ -1,3 +1,7 @@
+2005-04-20 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * python/lilylib.py (make_ps_images): switch back to png16m.
+
2005-04-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* scripts/lilypond-book.py (write_if_updated): Bugfix for not
Index: lilypond/python/lilylib.py
diff -u lilypond/python/lilylib.py:1.62 lilypond/python/lilylib.py:1.63
--- lilypond/python/lilylib.py:1.62 Sat Apr 16 14:36:04 2005
+++ lilypond/python/lilylib.py Tue Apr 19 22:19:36 2005
@@ -464,26 +464,22 @@
def make_ps_images (ps_name, resolution = 90, papersize = "a4",
rename_page1_p = 0):
- ## FIXME
- ## have better algorithm for deciding when to crop page,
- ## and when to show full page.
- ## Better than what, and why?
-
- base = re.sub (r'\.e?ps', '', ps_name)
+ base = os.path.basename (re.sub (r'\.e?ps', '', ps_name))
header = open (ps_name).read (1024)
png1 = base + '.png'
pngn = base + '-page%d.png'
output_file = pngn
multi_page = re.search ('\n%%Pages: ', header)
-
+
+ # png16m is because Lily produces color nowadays.
if not multi_page:
cmd = r'''gs\
-dEPSCrop\
-dGraphicsAlphaBits=4\
-dNOPAUSE\
-dTextAlphaBits=4\
- -sDEVICE=pnggray\
+ -sDEVICE=png16m\
-sOutputFile='%(output_file)s'\
-sPAPERSIZE=%(papersize)s\
-q\
@@ -497,7 +493,7 @@
-dGraphicsAlphaBits=4\
-dNOPAUSE\
-dTextAlphaBits=4\
- -sDEVICE=pnggray\
+ -sDEVICE=png16m\
-sOutputFile='%(output_file)s'\
-sPAPERSIZE=%(papersize)s\
-q\
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.189 lilypond/scm/define-grobs.scm:1.190
--- lilypond/scm/define-grobs.scm:1.189 Tue Apr 19 17:34:12 2005
+++ lilypond/scm/define-grobs.scm Tue Apr 19 22:19:36 2005
@@ -1388,7 +1388,9 @@
(height . 2.0) ;; staffspace;
(minimum-space . 5)
(font-size . -4)
- (meta . ((interfaces . (volta-bracket-interface line-interface
text-interface side-position-interface font-interface spanner-interface
+ (meta . ((interfaces . (volta-bracket-interface
+ line-interface text-interface
+ side-position-interface font-interface
spanner-interface
))
(VerticalAlignment
@@ -1397,7 +1399,6 @@
(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
(X-extent-callback . ,Axis_group_interface::group_extent_callback)
(stacking-dir . -1)
- ;; (threshold . (6 . 1000))
(meta . ((interfaces . (align-interface axis-group-interface
spanner-interface
))
@@ -1407,13 +1408,10 @@
(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
(X-extent-callback . ,Axis_group_interface::group_extent_callback)
- (meta . ((interfaces . (axis-group-interface
vertically-spaceable-interface spanner-interface
+ (meta . ((interfaces . (axis-group-interface
+ vertically-spaceable-interface
spanner-interface
))
- )
- )
-
-
-
+ ))
(define (completize-grob-entry x)
"transplant assoc key into 'name entry of 'meta of X
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.88
lilypond/scm/define-markup-commands.scm:1.89
--- lilypond/scm/define-markup-commands.scm:1.88Tue Apr 19 21:33:19 2005
+++ lilypond/scm/define-markup-commands.scm Tue Apr 19 22:19:36 2005
@@ -524,7 +524,7 @@
(def-markup-command (raise layout props amount arg) (number? markup?)
"
Raise @var{arg}, by the distance @var{amount}.
-A ne
lilypond ChangeLog
CVSROOT:/cvsroot/lilypond Module name:lilypond Branch: Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 22:47:17 Modified files: . : ChangeLog Log message: CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3481&tr2=1.3482&r1=text&r2=text Patches: Index: lilypond/ChangeLog diff -u lilypond/ChangeLog:1.3481 lilypond/ChangeLog:1.3482 --- lilypond/ChangeLog:1.3481 Tue Apr 19 22:45:41 2005 +++ lilypond/ChangeLog Tue Apr 19 22:47:17 2005 @@ -198,7 +198,7 @@ * SConstruct: Require pkg-config. (test_program): Bugfix for double digit version compares, use integer (not string-) compare. - Optionall require gs 8.14. + Optionally require gs 8.14. * stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too. ___ Lilypond-cvs mailing list Lilypond-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond ./ChangeLog lily/dynamic-engraver.cc
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]>05/04/19 22:45:42
Modified files:
. : ChangeLog
lily : dynamic-engraver.cc
Log message:
(process_music): set right bound to
script if present. Else, do not set.
(acknowledge_grob): only set right bound of finished spanner to
note column if no other bound is set.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3480&tr2=1.3481&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/dynamic-engraver.cc.diff?tr1=1.165&tr2=1.166&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3480 lilypond/ChangeLog:1.3481
--- lilypond/ChangeLog:1.3480 Tue Apr 19 22:19:36 2005
+++ lilypond/ChangeLog Tue Apr 19 22:45:41 2005
@@ -1,5 +1,10 @@
2005-04-20 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/dynamic-engraver.cc (process_music): set right bound to
+ script if present. Else, do not set.
+ (acknowledge_grob): only set right bound of finished spanner to
+ note column if no other bound is set.
+
* python/lilylib.py (make_ps_images): switch back to png16m.
2005-04-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: lilypond/lily/dynamic-engraver.cc
diff -u lilypond/lily/dynamic-engraver.cc:1.165
lilypond/lily/dynamic-engraver.cc:1.166
--- lilypond/lily/dynamic-engraver.cc:1.165 Tue Apr 19 13:22:20 2005
+++ lilypond/lily/dynamic-engraver.cc Tue Apr 19 22:45:41 2005
@@ -157,11 +157,12 @@
{
assert (!finished_cresc_ && cresc_);
- cresc_->set_bound (RIGHT, script_
-? script_
-: unsmob_grob (get_property
("currentMusicalColumn")));
- add_bound_item (line_spanner_, cresc_->get_bound (RIGHT));
-
+ if (script_)
+ {
+ cresc_->set_bound (RIGHT, script_);
+ add_bound_item (line_spanner_, script_);
+ }
+
finished_cresc_ = cresc_;
cresc_ = 0;
current_cresc_ev_ = 0;
@@ -391,10 +392,9 @@
cresc_->set_bound (LEFT, info.grob_);
add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
}
- cresc_->set_bound (RIGHT, info.grob_);
}
- if (finished_cresc_)
+ if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT))
{
finished_cresc_->set_bound (RIGHT, info.grob_);
}
___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
lilypond scripts/convert-ly.py ./ChangeLog
CVSROOT:/cvsroot/lilypond
Module name:lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/19 18:36:52
Modified files:
scripts: convert-ly.py
. : ChangeLog
Log message:
Fix error message.
Print usage if no files on command line.
(usage): Add example usage.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/convert-ly.py.diff?tr1=1.238&tr2=1.239&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3477&tr2=1.3478&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3477 lilypond/ChangeLog:1.3478
--- lilypond/ChangeLog:1.3477 Tue Apr 19 17:18:10 2005
+++ lilypond/ChangeLog Tue Apr 19 18:36:52 2005
@@ -1,5 +1,9 @@
2005-04-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * scripts/convert-ly.py: Fix error message.
+ Print usage if no files on command line.
+ (usage): Add example usage.
+
* input/test/compound-time.ly: New file.
* input/test/circle.ly: New file.
Index: lilypond/scripts/convert-ly.py
diff -u lilypond/scripts/convert-ly.py:1.238
lilypond/scripts/convert-ly.py:1.239
--- lilypond/scripts/convert-ly.py:1.238Tue Apr 19 17:29:12 2005
+++ lilypond/scripts/convert-ly.py Tue Apr 19 18:36:51 2005
@@ -65,6 +65,12 @@
-t, --to=VERSION convert to VERSION [default: @[EMAIL PROTECTED]
-v, --version print program version"""))
sys.stdout.write ('\n\n')
+ sys.stdout.write (_ ('Examples'))
+ sys.stdout.write ('\n')
+ sys.stdout.write (' convert-ly -e *ly')
+ sys.stdout.write ('\n')
+ sys.stdout.write (' convert-ly --from=2.4.0 -e $(find . -name "*ly")')
+ sys.stdout.write ('\n\n')
sys.stdout.write (_ ("Report bugs to %s.") % "bug-lilypond@gnu.org")
sys.stdout.write ('\n')
sys.exit (0)
@@ -2137,11 +2143,14 @@
def conv (str):
if re.search ('textheight', str):
sys.stderr.write ('\n')
- sys.stderr.write (NOT_SMART % "tuning of textheight")
+ sys.stderr.write (NOT_SMART % "textheight")
sys.stderr.write ('\n')
sys.stderr.write (UPDATE_MANUALLY)
sys.stderr.write ('\n')
-
+ sys.stderr.write (
+"""Page layout has been changed, using paper size and margins.
+textheight is no longer used.
+""")
str = re.sub (r'\\OrchestralScoreContext', '\\Score', str)
def func(m):
if m.group(1) not in ['RemoveEmptyStaff',
@@ -2619,6 +2628,11 @@
sys.exit (0)
identify ()
+
+if not files:
+ usage ()
+ sys.exit (2)
+
for f in files:
if f == '-':
f = ''
___
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
