[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Fixes issue 40. (issue4801083)
From: |
mtsolo |
Subject: |
Fixes issue 40. (issue4801083) |
Date: |
Sat, 06 Aug 2011 20:17:59 +0000 |
Reviewers: ,
Message:
Here's a fix for Issue 40.
Cheers,
MS
Description:
Fixes issue 40.
Please review this at http://codereview.appspot.com/4801083/
Affected files:
M lily/line-spanner.cc
M scm/define-grobs.scm
Index: lily/line-spanner.cc
diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index
b2877211f17d31eac7fb87ead457feadaf892777..ade5b7d4bc1ee6ee287997733eb88c844cd422d5
100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -24,6 +24,7 @@
#include "item.hh"
#include "lily-proto.hh"
#include "line-interface.hh"
+#include "note-column.hh"
#include "output-def.hh"
#include "pointer-group-interface.hh"
#include "spanner.hh"
@@ -108,9 +109,13 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
? columns[0] : columns.back ();
}
+ Real x_coord = robust_relative_extent (bound_grob, commonx,
X_AXIS).linear_combination (attach);
+ Grob *acc = Note_column::accidentals (bound_grob->get_parent
(X_AXIS));
+ if (acc && to_boolean (ly_assoc_get (ly_symbol2scm
("end-on-accidental"), details, SCM_BOOL_F)))
+ x_coord = robust_relative_extent (acc, commonx,
X_AXIS).linear_combination (attach);
+
details = scm_acons (ly_symbol2scm ("X"),
- scm_from_double (robust_relative_extent
(bound_grob, commonx, X_AXIS)
- .linear_combination (attach)),
+ scm_from_double (x_coord),
details);
}
Index: scm/define-grobs.scm
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index
4545e5bd9f6f7c130267397d3947812e31c82881..b618516173eea8f5ad10f5b9514e8999f0ddfc8d
100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -929,11 +929,12 @@
(Glissando
. (
(after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
- (bound-details . ((right . ((attach-dir . ,CENTER)
- (padding . 1.5)
+ (bound-details . ((right . ((attach-dir . ,LEFT)
+ (end-on-accidental . #t)
+ (padding . 0.5)
))
- (left . ((attach-dir . ,CENTER)
- (padding . 1.5)
+ (left . ((attach-dir . ,RIGHT)
+ (padding . 0.5)
))
))
(gap . 0.5)
- Fixes issue 40. (issue4801083),
mtsolo <=
- Re: Fixes issue 40. (issue4801083), pkx166h, 2011/08/06
- Re: Fixes issue 40. (issue4801083), Carl . D . Sorensen, 2011/08/08
- Re: Fixes issue 40. (issue4801083), mtsolo, 2011/08/08
- Re: Fixes issue 40. (issue4801083), Carl . D . Sorensen, 2011/08/08
- Re: Fixes issue 40. (issue4801083), hanwenn, 2011/08/09
- Re: Fixes issue 40. (issue4801083), mtsolo, 2011/08/09
- Re: Fixes issue 40. (issue4801083), n . puttock, 2011/08/09
- Re: Fixes issue 40. (issue4801083), n . puttock, 2011/08/09