From bd2bf9b76290615ba5be2e886a2dff02f849424c Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 25 Jun 1999 09:13:44 +0000 Subject: [PATCH] lilypond-1.1.50 --- input/test/dynamics.fly | 1 + lily/dynamic-engraver.cc | 7 ++++++- scm/lily.scm | 5 +++++ scripts/ly2dvi.py | 6 +++--- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/input/test/dynamics.fly b/input/test/dynamics.fly index 4b586d5c07..01bbcd6633 100644 --- a/input/test/dynamics.fly +++ b/input/test/dynamics.fly @@ -1,2 +1,3 @@ c''4 \p c \ff c^\ff +\property Voice.dynamicPadding = 10 c \p \< \! c \ff\> c \!c-\p diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index b0670d5236..e02325ee5e 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -133,7 +133,12 @@ Dynamic_engraver::do_process_requests() staff_side_p_->dir_ = (Direction) (int) prop; } - + prop = get_property ("dynamicPadding", 0); + if (prop.isnum_b ()) + { + staff_side_p_->set_elt_property (padding_scm_sym, + gh_double2scm(Real(prop))); + } announce_element (Score_element_info (text_p_, absd)); announce_element (Score_element_info (staff_side_p_, absd)); } diff --git a/scm/lily.scm b/scm/lily.scm index 718515e4ff..682a0ae46c 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -111,6 +111,11 @@ (("Key_item" "begin-of-note") . (extra_space 2.5)) (("Staff_bar" "begin-of-note") . (extra_space 1.0)) (("Clef_item" "begin-of-note") . (minimum_space 5.0)) + (("" "Breathing_sign") . (minimum_space 0.0)) + (("Breathing_sign" "Key_item") . (minimum_space 1.5)) + (("Breathing_sign" "begin-of-note") . (minimum_space 1.0)) + (("Breathing_sign" "Staff_bar") . (minimum_space 1.5)) + (("Breathing_sign" "Clef_item") . (minimum_space 2.0)) ) ) diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index e3b42ffa8e..deb297b599 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -760,9 +760,9 @@ class Properties: """ if int(value) == 1: - this.__set('pagenumber',1,requester) + this.__set('pagenumber','\\pagestyle{empty}',requester) else: - this.__set('pagenumber',0,requester) + this.__set('pagenumber','%',requester) # # setSeparate @@ -990,7 +990,7 @@ def main(): elif o == '--landscape' or o == '-L': Props.setOrientation('landscape','commandline') elif o == '--nonumber' or o == '-N': - Props.setNonumber('commandline') + Props.setNonumber(1,'commandline') elif o == '--Width' or o == '-W': Props.setLineWidth(a,'commandline') elif o == '--dependencies' or o == '-d': -- 2.11.4.GIT