CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/15 18:06:06
Modified files:
tex : GNUmakefile
scm : define-grobs.scm
lily : slur-engraver.cc
input/regression: slur-script.ly
. : ChangeLog
Log message:
* input/regression/slur-script.ly: Add example of reverting
inside-slur for fingering.
* scm/define-grobs.scm (DynamicLineSpanner, Fingering,
TextScript): Explicitly set inside-slur #f, forcing these out of slur.
* lily/slur-engraver.cc (acknowledge_extra_object): Only invoke
outside_slur_callback if inside-slur == #f (as opposed to unset).
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/tex/GNUmakefile.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.221&tr2=1.222&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur-engraver.cc.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/slur-script.ly.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4007&tr2=1.4008&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4007 lilypond/ChangeLog:1.4008
--- lilypond/ChangeLog:1.4007 Mon Aug 15 15:38:22 2005
+++ lilypond/ChangeLog Mon Aug 15 18:06:06 2005
@@ -1,3 +1,19 @@
+2005-08-15 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * input/regression/slur-script.ly: Add example of reverting
+ inside-slur for fingering.
+
+ * scm/define-grobs.scm (DynamicLineSpanner, Fingering,
+ TextScript): Explicitly set inside-slur #f, forcing these out of slur.
+
+ * lily/slur-engraver.cc (acknowledge_extra_object): Only invoke
+ outside_slur_callback if inside-slur == #f (as opposed to unset).
+
+2005-08-14 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * tex/GNUmakefile (INSTALLATION_FILES): Remove enc symlink setup,
+ encoding files are already removed.
+
2005-08-15 Mats Bengtsson <[EMAIL PROTECTED]>
* Documentation/user/advanced-notation.itely (Instrument names):
Index: lilypond/input/regression/slur-script.ly
diff -u lilypond/input/regression/slur-script.ly:1.11
lilypond/input/regression/slur-script.ly:1.12
--- lilypond/input/regression/slur-script.ly:1.11 Thu Aug 11 11:43:36 2005
+++ lilypond/input/regression/slur-script.ly Mon Aug 15 18:06:06 2005
@@ -18,8 +18,11 @@
b(-. d-.)
b_1( b b_1_2_3)
- c-1_\markup { \italic {"cresc."}}( f c)
- c-1( c\f c)
+ %% Allow Fingering to go inside slur, by reverting the #f value.
+ \once \revert Fingering #'inside-slur
+ b( d_1 b)
+ c_\markup { \italic {"cresc."}}( f c)
+ c( c\f c)
\once \override Script #'padding = #1.2
b-.( b-.
\once \override Script #'padding = #1.2
Index: lilypond/lily/slur-engraver.cc
diff -u lilypond/lily/slur-engraver.cc:1.113
lilypond/lily/slur-engraver.cc:1.114
--- lilypond/lily/slur-engraver.cc:1.113 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/slur-engraver.cc Mon Aug 15 18:06:06 2005
@@ -102,7 +102,7 @@
for (int i = end_slurs_.size (); i--;)
Slur::add_extra_encompass (end_slurs_[i], e);
}
- else if (!to_boolean (inside)
+ else if (inside == SCM_BOOL_F
&& e->name () != "DynamicText")
{
Grob *slur = slurs_.size () ? slurs_[0] : 0;
@@ -207,8 +207,8 @@
ADD_ACKNOWLEDGER (Slur_engraver, accidental);
ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner);
-ADD_ACKNOWLEDGER (Slur_engraver, fingering)
- ADD_ACKNOWLEDGER (Slur_engraver, note_column);
+ADD_ACKNOWLEDGER (Slur_engraver, fingering);
+ADD_ACKNOWLEDGER (Slur_engraver, note_column);
ADD_ACKNOWLEDGER (Slur_engraver, script);
ADD_ACKNOWLEDGER (Slur_engraver, text_script);
ADD_ACKNOWLEDGER (Slur_engraver, tie);
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.221 lilypond/scm/define-grobs.scm:1.222
--- lilypond/scm/define-grobs.scm:1.221 Thu Aug 11 11:43:36 2005
+++ lilypond/scm/define-grobs.scm Mon Aug 15 18:06:06 2005
@@ -461,6 +461,7 @@
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(staff-padding . 0.1)
(padding . 0.6)
+ (inside-slur . #f)
(slur-padding . 0.3)
(minimum-space . 1.2)
(direction . -1)
@@ -515,8 +516,10 @@
. (
(print-function . ,Text_interface::print)
- ; sync with TextScript (?)
+ ;; sync with TextScript (?)
+
(padding . 0.5)
+ (inside-slur . #f)
(slur-padding . 0.2)
(staff-padding . 0.5)
(self-alignment-X . 0)
@@ -1060,7 +1063,6 @@
;; space a away.
(padding . 0.20)
(staff-padding . 0.25)
- (slur-padding . 0.5)
;; (script-priority . 0) priorities for scripts, see script.scm
(X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
(before-line-breaking-callback .
,Script_interface::before_line_breaking)
@@ -1373,6 +1375,7 @@
(padding . 0.5)
(staff-padding . 0.5)
(before-line-breaking-callback .
,Script_interface::before_line_breaking)
+ (inside-slur . #f)
(slur-padding . 0.5)
(script-priority . 200)
;; todo: add X self alignment?
Index: lilypond/tex/GNUmakefile
diff -u lilypond/tex/GNUmakefile:1.19 lilypond/tex/GNUmakefile:1.20
--- lilypond/tex/GNUmakefile:1.19 Tue Mar 8 21:09:13 2005
+++ lilypond/tex/GNUmakefile Mon Aug 15 18:06:05 2005
@@ -13,15 +13,8 @@
rm -f $@
-ln $< $@
-
-# teTeX-2.0.x compatibility.
-local-install:
- -$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)/tex
- (cd $(DESTDIR)$(local_lilypond_datadir)/tex && ln -sf ../fonts/enc .)
-
local-uninstall:
- -rm -f $(DESTDIR)$(local_lilypond_datadir)/tex/enc
-rmdir $(DESTDIR)$(local_lilypond_datadir)/tex
-all: $(INSTALLATION_FILES) $(INSTALLATION_OUT_FILES1)
+all: $(INSTALLATION_FILES)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
