From a6a589a7407ed2f7e273cdb9849406a73b4b14fa Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 18 Aug 2002 12:19:13 +0000 Subject: [PATCH] * lily/parser.yy (script_abbreviation): accept -_ script. * ly/script-init.ly (dashUnderscore): add NOTE-_ == portato (dash and dot) --- ChangeLog | 5 +++++ lily/parser.yy | 3 +++ ly/script-init.ly | 5 +---- mf/feta-schrift.mf | 6 +----- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 723a7b103e..fca07925e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2002-08-18 Han-Wen Nienhuys + * lily/parser.yy (script_abbreviation): accept -_ script. + + * ly/script-init.ly (dashUnderscore): add NOTE-_ == portato (dash + and dot) + * scripts/lilypond-book.py (re_dict): add spaces after command sequences (LatexPaper.find_latex_dims): run latex in nonstopmode diff --git a/lily/parser.yy b/lily/parser.yy index 480edf162e..7c038e9325 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1654,6 +1654,9 @@ script_abbreviation: | '.' { $$ = scm_makfrom0str ("Dot"); } + | '_' { + $$ = scm_makfrom0str ("Underscore"); + } ; script_dir: diff --git a/ly/script-init.ly b/ly/script-init.ly index 32a15a84a3..f4d95f51cd 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -7,15 +7,12 @@ dashDash= "tenuto" dashBar= "staccatissimo" dashLarger= "accent" dashDot= "staccato" - +dashUnderscore = "portato" thumb = \script "thumb" accent = \script "accent" marcato = \script "marcato" staccatissimo = \script "staccatissimo" -% Changed 27th October 2001 Heikki Junes -% * portato = tenuto & staccato -% * if you use portato = slur & staccato, then apply "c( d )e-." portato = \script "portato" fermata = \script "fermata" stopped = \script "stopped" diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 3fd6c692fe..e5ac069ffa 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -163,11 +163,6 @@ fet_beginchar("portato/single tenuto", "tenuto", "tenuto") draw_rounded_block((-b,-thick/2),(w,thick/2),thick); fet_endchar; - -% -% Portato by Heikki Junes -% - def draw_portato = save thick, radius; thick# = 1.4 stafflinethickness#; @@ -227,6 +222,7 @@ fet_endchar; % The down marcato char (not very much used). % Contrary to what some MF/TeX `gurus' believe % it is *point*-symmetric with the "up" version +% fet_beginchar("marcato down", "dmarcato", "dmarcato") draw_marcato; xy_mirror_char; -- 2.39.5