Added a halfopen articulation symbol.

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index ba222abccd7570796d5d6526998006786f124574..50d8330fa5789ceaf999113bbfcc1c4fa20e1749 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -63,6 +63,13 @@ which scares away people.
 
 @end ignore
 
+@item
+A half-open articulation was added:
+@lilypond[quote,relative=2]
+c4\halfopen
+@end lilypond
+This is sometimes used to indicate half-open hi-hats.
+
 @item
 The Unicode Bidirectional Algorithm is now fully supported for
 single-line markup due to enhanced integration with Pango.

diff --git a/Documentation/de/notation/notation-appendices.itely b/Documentation/de/notation/notation-appendices.itely
index 24e1b98f0b43598e1cb94246e2677df309775897..02ebd858c555c46b95c2062895942ca0ae6b95f8 100644 (file)
--- a/Documentation/de/notation/notation-appendices.itely
+++ b/Documentation/de/notation/notation-appendices.itely
@@ -912,6 +912,7 @@ Folgende Stile können zur Darstellung der Notenköpfe verwendet werden:
 @cindex Orgelpedalbezeichnung
 @cindex Triller
 @cindex Offen
+@cindex Halboffen
 @cindex Flageolet
 @cindex Praller
 @cindex Mordent

diff --git a/Documentation/de/notation/percussion.itely b/Documentation/de/notation/percussion.itely
index 95a1f4f13c1b141e711bfbb528cbaba1c8422869..dcb3ccf38fac5173505508263894d84b2816e81f 100644 (file)
--- a/Documentation/de/notation/percussion.itely
+++ b/Documentation/de/notation/percussion.itely
@@ -380,12 +380,13 @@ eigene Liste der Positionen und Notenköpfe am Anfang ihrer Datei erstellen.
 
 @lilypond[quote,verbatim]
 #(define mydrums '(
-         (bassdrum     default   #f         -1)
-         (snare        default   #f         0)
-         (hihat        cross     #f         1)
-         (pedalhihat   xcircle   "stopped"  2)
-         (lowtom       diamond   #f         3)))
-up = \drummode { hh8 hh hh hh hhp4 hhp }
+         (bassdrum        default   #f           -1)
+         (snare           default   #f           0)
+         (hihat           cross     #f           1)
+         (halfopenhihat   cross     "halfopen"   1)
+         (pedalhihat      xcircle   "stopped"    2)
+         (lowtom          diamond   #f           3)))
+up = \drummode { hh8 hh hhho hhho hhp4 hhp }
 down = \drummode { bd4 sn bd toml8 toml }
 
 \new DrumStaff <<

diff --git a/Documentation/es/notation/notation-appendices.itely b/Documentation/es/notation/notation-appendices.itely
index ff4b6b35364628c5211f3b2a9374b283705727a5..e6d94284fa0734187b05159e2ec88ee09993c2bd 100644 (file)
--- a/Documentation/es/notation/notation-appendices.itely
+++ b/Documentation/es/notation/notation-appendices.itely
@@ -900,6 +900,7 @@ Se pueden usar los siguientes estilos para las cabezas de las notas.
 @cindex marcato
 @cindex mordent
 @cindex open
+@cindex halfopen
 @cindex organ pedal marks
 @cindex pedal, indicaciones de
 @cindex portato

diff --git a/Documentation/es/notation/percussion.itely b/Documentation/es/notation/percussion.itely
index e62807cb119ef54b91dda447cc58814d36a2cb75..40f12107bf142776c254769f1b3841f3098eabb2 100644 (file)
--- a/Documentation/es/notation/percussion.itely
+++ b/Documentation/es/notation/percussion.itely
@@ -381,12 +381,13 @@ propia lista al principio de su archivo
 
 @lilypond[quote,verbatim]
 #(define mydrums '(
-         (bassdrum     default   #f         -1)
-         (snare        default   #f         0)
-         (hihat        cross     #f         1)
-         (pedalhihat   xcircle   "stopped"  2)
-         (lowtom       diamond   #f         3)))
-up = \drummode { hh8 hh hh hh hhp4 hhp }
+         (bassdrum        default   #f           -1)
+         (snare           default   #f           0)
+         (hihat           cross     #f           1)
+         (halfopenhihat   cross     "halfopen"   1)
+         (pedalhihat      xcircle   "stopped"    2)
+         (lowtom          diamond   #f           3)))
+up = \drummode { hh8 hh hhho hhho hhp4 hhp }
 down = \drummode { bd4 sn bd toml8 toml }
 
 \new DrumStaff <<

diff --git a/Documentation/fr/notation/percussion.itely b/Documentation/fr/notation/percussion.itely
index 6d0b9ad45618881559787ad632c3be0b3c1ecd36..a20ad2620819ada51fa8f422ea543dd24dc36fc5 100644 (file)
--- a/Documentation/fr/notation/percussion.itely
+++ b/Documentation/fr/notation/percussion.itely
@@ -266,12 +266,13 @@ de définir le vôtre en début de fichier.
 
 @lilypond[quote,ragged-right,verbatim]
 #(define mydrums '(
-         (bassdrum     default   #f         -1)
-         (snare        default   #f         0)
-         (hihat        cross     #f         1)
-         (pedalhihat   xcircle   "stopped"  2)
-         (lowtom       diamond   #f         3)))
-up = \drummode { hh8 hh hh hh hhp4 hhp }
+         (bassdrum        default   #f           -1)
+         (snare           default   #f           0)
+         (hihat           cross     #f           1)
+         (halfopenhihat   cross     "halfopen"   1)
+         (pedalhihat      xcircle   "stopped"    2)
+         (lowtom          diamond   #f           3)))
+up = \drummode { hh8 hh hhho hhho hhp4 hhp }
 down = \drummode { bd4 sn bd toml8 toml }
 
 \new DrumStaff <<

diff --git a/Documentation/included/script-chart.ly b/Documentation/included/script-chart.ly
index 6adf28225784010db8ce73f0a4a20bf5fc9d6a32..6300d32e7e94278dc3e1c80d964876d426d9bc0d 100644 (file)
--- a/Documentation/included/script-chart.ly
+++ b/Documentation/included/script-chart.ly
@@ -13,7 +13,7 @@ This chart shows all articulations, or scripts, that the feta font contains.
       c''\staccato           c''\tenuto          c''\portato
       c''\upbow              c''\downbow         c''\flageolet
       c''\thumb              c''^\lheel          c''\rheel
-      c''^\ltoe              c''\rtoe            c''\open
+      c''^\ltoe              c''\rtoe            c''\open          c''\halfopen
       c''\stopped            c''\snappizzicato   c''\turn          c''\reverseturn
       c''\trill              c''\prall           c''\mordent
       c''\prallprall         c''\prallmordent    c''\upprall
@@ -28,7 +28,7 @@ This chart shows all articulations, or scripts, that the feta font contains.
       staccato           tenuto          portato
       upbow              downbow         flageolet
       thumb              lheel           rheel
-      ltoe               rtoe            open
+      ltoe               rtoe            open          halfopen
       stopped            snappizzicato   turn          reverseturn
       trill              prall           mordent
       prallprall         prallmordent    upprall

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index e17e7bb9ddc9b1583af5fe73459b428cc3fb14c7..76d308f65483e8e80fede8cd4b20d8f3f6f4bde8 100644 (file)
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -871,6 +871,7 @@ The following styles may be used for note heads.
 @cindex organ pedal marks
 @cindex turn
 @cindex open
+@cindex halfopen
 @cindex stopped
 @cindex flageolet
 @cindex reverseturn

diff --git a/Documentation/notation/percussion.itely b/Documentation/notation/percussion.itely
index ebcdb12dfad345fd37aaa49eea07e9856e65af64..e25c8b425f66db61aa748d285041928739aed3a9 100644 (file)
--- a/Documentation/notation/percussion.itely
+++ b/Documentation/notation/percussion.itely
@@ -363,12 +363,13 @@ own list at the top of your file.
 
 @lilypond[quote,verbatim]
 #(define mydrums '(
-         (bassdrum     default   #f         -1)
-         (snare        default   #f         0)
-         (hihat        cross     #f         1)
-         (pedalhihat   xcircle   "stopped"  2)
-         (lowtom       diamond   #f         3)))
-up = \drummode { hh8 hh hh hh hhp4 hhp }
+         (bassdrum        default   #f           -1)
+         (snare           default   #f           0)
+         (hihat           cross     #f           1)
+         (halfopenhihat   cross     "halfopen"   1)
+         (pedalhihat      xcircle   "stopped"    2)
+         (lowtom          diamond   #f           3)))
+up = \drummode { hh8 hh hhho hhho hhp4 hhp }
 down = \drummode { bd4 sn bd toml8 toml }
 
 \new DrumStaff <<

diff --git a/ly/script-init.ly b/ly/script-init.ly
index ab40c14865b54b8645df8c7dd5547ff79e81cc3d..046550c47ba72fe9f822e6cc3ba482170440f612 100644 (file)
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -21,6 +21,7 @@ downprall = #(make-articulation "downprall")
 espressivo = #(make-articulation "espressivo")
 fermata = #(make-articulation "fermata")
 flageolet = #(make-articulation "flageolet")
+halfopen = #(make-articulation "halfopen")
 lheel = #(make-articulation "lheel")
 lineprall = #(make-articulation "lineprall")
 longfermata = #(make-articulation "longfermata")

diff --git a/mf/feta-scripts.mf b/mf/feta-scripts.mf
index 7d76d0f6ea647db37c9ee684bbc16b0b1a554fdf..175b9ef51b108786d62a8de8946aacbf1dabf611 100644 (file)
--- a/mf/feta-scripts.mf
+++ b/mf/feta-scripts.mf
@@ -583,6 +583,43 @@ fet_beginchar ("open (unstopped)", "open");
 fet_endchar;
 
 
+fet_beginchar ("halfopen (unstopped)", "halfopen");
+       save thin, height, width, thick, factor, slash;
+
+       factor = 5/4;
+       height# = 5/4 width#;
+       height# = staff_space#;
+       thin = 0.6 linethickness + 0.06 staff_space;
+       slash# = 1.05 linethickness#;
+
+       set_char_box (width# / 2, width# / 2, height# / 2, height# / 2);
+
+       define_pixels (width, height, slash);
+
+       2 thick + 0.6 (height - 2 thin) = width;
+
+       penpos1 (thick, 0);
+       penpos2 (thin, 90);
+       penpos3 (thick, 180);
+       penpos4 (thin, 270);
+       z1r = (w, 0);
+       z2r = (0, h);
+       z3r = (-w, 0);
+       z4r = (0, -h);
+
+       penlabels (1, 2, 3, 4);
+
+       penstroke z1e{up}
+                 .. z2e{left}
+                 .. z3e{down}
+                 .. z4e{right}
+                 .. cycle;
+
+       draw_brush ((-w * factor, -h * factor), slash,
+                   (w * factor, h * factor), slash);
+fet_endchar;
+
+
 fet_beginchar ("plus (stopped)", "stopped");
        save hthick, vthick, size, outer_hsize, outer_vsize;
 

diff --git a/scm/script.scm b/scm/script.scm
index 15f0be42213353a895b5f4b8ae3fcc5f2738c65d..71bc666a91b4ff1e0bfb210c0e03775a30719c0c 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -101,6 +101,14 @@
        (direction . ,UP)))
 
 
+    ("halfopen"
+     . (
+       (avoid-slur . outside)
+       (padding . 0.20)
+       (script-stencil . (feta . ("halfopen" . "halfopen")))
+       (direction . ,UP)))
+
+
     ("ictus"
      . (
        (script-stencil . (feta . ("ictus" . "ictus")))