Implement breve with double vertical lines on each side

Also add an 'altdefault note-head style, which differs from default only in
that it uses the double-lined version of the breve.

5 files changed, 69 insertions, 29 deletions

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 98c22f58dc..da96f0b5a5 100644
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -63,6 +63,17 @@ which scares away people.
 @end ignore
 
 @item
+A version of the breve notehead has been added with two vertical lines on each side.
+@lilypond
+\relative c'' {
+  \time 4/2
+  \override Staff.NoteHead  #'style = #'altdefault
+  c\breve b\breve
+}
+@end lilypond
+
+
+@item
 Instrument names and vocal names now take into account the extent of
 system start delimiters in other staves for their positioning,
 resulting in improved default alignment for left-, center- and
diff --git a/input/manual/note-head-style.ly b/input/manual/note-head-style.ly
index 98d33a27f5..fc908c05ee 100644
--- a/input/manual/note-head-style.ly
+++ b/input/manual/note-head-style.ly
@@ -35,62 +35,66 @@ pattern = <<
   s1*0^\markup { "default" }
   \pattern
 
-  \override Staff.NoteHead  #'style = #'baroque
-  s1*0^\markup { "baroque" }
+  \override Staff.NoteHead  #'style = #'altdefault
+  s1*0^\markup { "altdefault" }
   \pattern
 
   \break
 
+  \override Staff.NoteHead  #'style = #'baroque
+  s1*0^\markup { "baroque" }
+  \pattern
+
   \override Staff.NoteHead  #'style = #'neomensural
   s1*0^\markup { "neomensural" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'mensural
   s1*0^\markup { "mensural" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'petrucci
   s1*0^\markup { "petrucci" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'harmonic
   s1*0^\markup { "harmonic" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'harmonic-black
   s1*0^\markup { "harmonic-black" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'harmonic-mixed
   s1*0^\markup { "harmonic-mixed" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'diamond
   s1*0^\markup { "diamond" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'cross
   s1*0^\markup { "cross" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'xcircle
   s1*0^\markup { "xcircle" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'triangle
   s1*0^\markup { "triangle" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'slash
   s1*0^\markup { "slash" }
   \pattern
diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index 98d33a27f5..fc908c05ee 100644
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -35,62 +35,66 @@ pattern = <<
   s1*0^\markup { "default" }
   \pattern
 
-  \override Staff.NoteHead  #'style = #'baroque
-  s1*0^\markup { "baroque" }
+  \override Staff.NoteHead  #'style = #'altdefault
+  s1*0^\markup { "altdefault" }
   \pattern
 
   \break
 
+  \override Staff.NoteHead  #'style = #'baroque
+  s1*0^\markup { "baroque" }
+  \pattern
+
   \override Staff.NoteHead  #'style = #'neomensural
   s1*0^\markup { "neomensural" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'mensural
   s1*0^\markup { "mensural" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'petrucci
   s1*0^\markup { "petrucci" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'harmonic
   s1*0^\markup { "harmonic" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'harmonic-black
   s1*0^\markup { "harmonic-black" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'harmonic-mixed
   s1*0^\markup { "harmonic-mixed" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'diamond
   s1*0^\markup { "diamond" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'cross
   s1*0^\markup { "cross" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'xcircle
   s1*0^\markup { "xcircle" }
   \pattern
 
+  \break
+
   \override Staff.NoteHead  #'style = #'triangle
   s1*0^\markup { "triangle" }
   \pattern
 
-  \break
-
   \override Staff.NoteHead  #'style = #'slash
   s1*0^\markup { "slash" }
   \pattern
diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index fcda600978..ebc2fa7009 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -221,7 +221,7 @@ fi;
 %
 % dimensions aren't entirely right.
 %
-def draw_brevis =
+def draw_brevis (expr linescount) =
 	save stemthick, fudge;
 
 	stemthick# = 2 stafflinethickness#;
@@ -244,13 +244,15 @@ def draw_brevis =
 	y4 = y2;
 	y3 = y1;
 
-	draw_gridline (z1, z2, stemthick);
-	draw_gridline (z3, z4, stemthick);
+	for i := 0 step 1 until linescount-1:
+		draw_gridline (z1-(1.5*i*stemthick,0), z2-(1.5*i*stemthick,0), stemthick);
+		draw_gridline (z3+(1.5*i*stemthick,0), z4+(1.5*i*stemthick,0), stemthick);
+	endfor;
 enddef;
 
 
 fet_beginchar ("Brevis notehead", "sM1");
-	draw_brevis;
+	draw_brevis (1);
 
 	draw_staff (-2, 2, 0);
 fet_endchar;
@@ -258,7 +260,21 @@ fet_endchar;
 
 if test > 0:
 	fet_beginchar ("Brevis notehead", "sM1");
-		draw_brevis;
+		draw_brevis(1);
+
+		draw_staff (-2, 2, 0.5);
+	fet_endchar;
+fi;
+
+fet_beginchar ("Double-lined brevis notehead", "sM1double");
+	draw_brevis (2);
+
+	draw_staff (-2, 2, 0);
+fet_endchar;
+
+if test > 0:
+	fet_beginchar ("Double-lined brevis notehead", "sM1double");
+		draw_brevis (2);
 
 		draw_staff (-2, 2, 0.5);
 	fet_endchar;
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index eee181a928..68c338dfb8 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -99,6 +99,11 @@
        (if (< log 0)
 	   (string-append (number->string log) "neomensural")
 	   (number->string log)))
+      ((altdefault)
+       ;; Like default, but brevis is drawn with double vertical lines
+       (if (= log -1)
+	   (string-append (number->string log) "double")
+	   (number->string log)))
       ((mensural)
        (string-append (number->string log) (symbol->string style)))
       ((petrucci)