* lily/parser.yy (script_abbreviation): accept -_ script.

* ly/script-init.ly (dashUnderscore): add NOTE-_ == portato (dash
and dot)

diff --git a/ChangeLog b/ChangeLog
index 723a7b103e8f61c1406d9b66da6b789d2a9ae68b..fca07925e5f28e087ddedd24aa87946aa56cdc71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-18  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 480edf162e545277b13738e32ee1b73ce4e75f5d..7c038e93255d5189552f9d53788fbbc22a7a21f8 100644 (file)
--- 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 32a15a84a36668cf37970e036a574f241d20e56e..f4d95f51cd8b5f2ec8b29ba3c7f5bdae21729cd6 100644 (file)
--- 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 <heikki.junes@hut.fi>
-%  * 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 3fd6c692feaee73593bcb0b70e50bde265a4abab..e5ac069ffac91b47a3b43b14f182bd8755c9f845 100644 (file)
--- 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 <heikki.junes@hut.fi>
-%
-
 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;