From 451a331a963d9557798d53aadcb0c615a98af208 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 02:05:16 +0000 Subject: [PATCH] lilypond-1.5.31 --- input/regression/breathing-sign.ly | 6 +++++- input/regression/non-empty-text.ly | 7 ++++--- input/regression/stanza-number.ly | 2 +- input/template/piano-dynamics.ly | 6 ++---- input/test/markup.ly | 7 +++++-- lily/text-engraver.cc | 17 +++++++++++------ lilypond-mode.el | 2 ++ ly/engraver-init.ly | 1 + 8 files changed, 31 insertions(+), 17 deletions(-) diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index 5ad99b6e82..a663a8a001 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -21,7 +21,11 @@ two measures all have the same distance from each other: < \context Voice = two { \stemDown es4 \breathe bes es } \context Voice = one { \stemUp g4 as g } > | - es8 d es f g4 \breathe | +% Change to wedge: + \property Voice.BreathingSign \override #'text = #"scripts-upbow" + es8 d es f g8 \breathe f | +% Revert to old layout: + \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::brew_molecule es8 d \breathe es f g f | es2 r4 \bar "||" } diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index d3eee8bedc..43c81652d8 100644 --- a/input/regression/non-empty-text.ly +++ b/input/regression/non-empty-text.ly @@ -7,11 +7,12 @@ textNonEmpty is used to respect the horizontal size of text. " } \score { \notes { -\property Voice.TextScript \override #'no-spacing-rods = ##f -c4_"very wide and long text" c4 +c2_"very wide and long text" c | \break +\fatText % short for \property Voice.textNonEmpty = ##t +c_"very wide and long text" c } \paper { - linewidth = -1.0 + linewidth = 3.\cm } } diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index bd56fc5ad5..55991ad5a2 100644 --- a/input/regression/stanza-number.ly +++ b/input/regression/stanza-number.ly @@ -7,7 +7,7 @@ texidoc = "Stanza numbers may differ for the first and following systems." < \context LyricsVoice \lyrics { \property LyricsVoice . stanza = "first" -\property LyricsVoice . stz = "2nd" +\property LyricsVoice . stz = #'("2" (super "nd")) Foo1 Bar1 } \notes { c''1 \break c''1 }>} diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index 59a0a08218..e95a273378 100644 --- a/input/template/piano-dynamics.ly +++ b/input/template/piano-dynamics.ly @@ -26,11 +26,7 @@ lower = \notes\relative c { } dynamics = \notes { - \outputproperty #(make-type-checker 'dynamic-interface) - #'extra-offset = #'(0 . 2.5) s2\fff\> s4 - \outputproperty #(make-type-checker 'dynamic-interface) - #'extra-offset = #'(0 . 2.5) \!s\pp } @@ -67,6 +63,8 @@ pedal = \notes { TextScript \override #'font-relative-size = #1 TextScript \override #'font-shape = #'italic + DynamicText \override #'extra-offset = #'(0 . 2.5) + Hairpin \override #'extra-offset = #'(0 . 2.5) \consists "Skip_req_swallow_translator" diff --git a/input/test/markup.ly b/input/test/markup.ly index 621567dbad..17474621c2 100644 --- a/input/test/markup.ly +++ b/input/test/markup.ly @@ -26,15 +26,18 @@ d-#'(lines "Violoncello" " e" "Contrabasso") e-#'((lines (baselineskip . 0) (kern . 1.5)) "Violoncello" " e" "Contrabasso") e-#'(((baselineskip . 0) (kern . 1.5) lines) "Violoncello" " e" "Contrabasso") + g-"ÅÖÄÜÇÕ" } \paper{ linewidth = -1.\mm - \translator{ + fontenc = "T1" + \translator{ \ScoreContext TextScript \override #'font-family = #'roman TextScript \override #'font-shape = #'upright TextScript \revert #'no-spacing-rods TextScript \override #'direction = #1 - } + TextScript \override #'font-encoding = #'T1 + } } } diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 3a463407f2..38716da2af 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -128,12 +128,17 @@ Text_engraver::create_grobs () text->set_grob_property ("text", r->get_mus_property ("text")); SCM nonempty = get_property ("textNonEmpty"); - if (to_boolean (nonempty)) - /* - empty text: signal that no rods should be applied. - */ - text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F); - + + if (gh_boolean_p (nonempty)) + if (gh_scm2bool (nonempty)) + /* + empty text: signal that no rods should be applied. + Default nowadays. + */ + text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F); + else + text->set_grob_property ("no-spacing-rods" , SCM_BOOL_T); + announce_grob (text, r->self_scm ()); texts_.push (text); } diff --git a/lilypond-mode.el b/lilypond-mode.el index b2331af875..23696508ee 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -262,6 +262,8 @@ Must be the car of an entry in `LilyPond-command-alist'." ;;"LilyPond" LilyPond-command-default)) (t LilyPond-command-default))) + + (completion-ignore-case t) (answer (or LilyPond-command-force (completing-read diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 8acac587da..5c309e6fb4 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -240,6 +240,7 @@ LyricsVoiceContext= \translator{ \consists "Extender_engraver" \consists "Hyphen_engraver" \consists "Stanza_number_engraver" + \consists "Skip_req_swallow_translator" phrasingPunctuation = #".,:!?\"" } -- 2.39.5