From: Jürgen Reuter <j@web.de>
Date: Thu, 9 Sep 2004 22:55:39 +0000 (+0000)
Subject: 2004-09-10  Juergen Reuter  <reuter@ipd.uka.de>
X-Git-Tag: release/2.3.15~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=839a1fe5d5c2891af2886550c971bb7a3a90d007;p=lilypond.git

2004-09-10  Juergen Reuter  <reuter@ipd.uka.de>

	* (many files): removed most occurrences of underscore ("_")
	from font characters; made font character naming more
	consistent
---

diff --git a/ChangeLog b/ChangeLog
index 299f238cc4..eb5bb1829b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-10  Juergen Reuter  <reuter@ipd.uka.de>
+
+	* (many files): removed most occurrences of underscore ("_")
+	from font characters; made font character naming more
+	consistent
+
 2004-09-10  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* Documentation/user/changing-defaults.itely (Paper size): doc
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index ab9c2e7a23..81a78ea4fd 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -5788,15 +5788,13 @@ with respect to that clef.
 @b{Supported Clefs} @tab
 @b{Example}
 
-@c  FIXME: Unknown clef type `neomensural_c2'
-
 @item
 modern style mensural C clef @tab
-@code{neomensural_c1}, @code{neomensural_c2},
-@code{neomensural_c3}, @code{neomensural_c4} @tab
+@code{neomensural-c1}, @code{neomensural-c2},
+@code{neomensural-c3}, @code{neomensural-c4} @tab
 @lilypond[fragment,quote,relative=1,notime]
 
-\clef "neomensural_c2" c
+\clef "neomensural-c2" c
 @end lilypond
 
 @item
@@ -5804,118 +5802,118 @@ petrucci style mensural C clefs, for use on different staff lines
 (the examples shows the 2nd staff line C clef).
 
 @tab
-@code{petrucci_c1}
-@code{petrucci_c2}
-@code{petrucci_c3}
-@code{petrucci_c4}
-@code{petrucci_c5}
+@code{petrucci-c1}
+@code{petrucci-c2}
+@code{petrucci-c3}
+@code{petrucci-c4}
+@code{petrucci-c5}
 
 @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
 
-\clef "petrucci_c2" c
+\clef "petrucci-c2" c
 @end lilypond
 
 @item
 petrucci style mensural F clef @tab
-@code{petrucci_f} @tab
+@code{petrucci-f} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
 
-\clef "petrucci_f" c
+\clef "petrucci-f" c
 @end lilypond
 
 @item
 petrucci style mensural G clef @tab
-@code{petrucci_g} @tab
+@code{petrucci-g} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
 
-\clef "petrucci_g" c
+\clef "petrucci-g" c
 @end lilypond
 
 @item
 historic style mensural C clef @tab
-@code{mensural_c1}, @code{mensural_c2}, @code{mensural_c3},
-@code{mensural_c4} @tab
+@code{mensural-c1}, @code{mensural-c2}, @code{mensural-c3},
+@code{mensural-c4} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
 
-\clef "mensural_c2" c
+\clef "mensural-c2" c
 @end lilypond
 
 @item
 historic style mensural F clef @tab
-@code{mensural_f} @tab
+@code{mensural-f} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
 
-\clef "mensural_f" c
+\clef "mensural-f" c
 @end lilypond
 
 @item
 historic style mensural G clef @tab
-@code{mensural_g} @tab
+@code{mensural-g} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
 
-\clef "mensural_g" c
+\clef "mensural-g" c
 @end lilypond
 
 @item
 Editio Vaticana style do clef @tab
-@code{vaticana_do1}, @code{vaticana_do2}, @code{vaticana_do3} @tab
+@code{vaticana-do1}, @code{vaticana-do2}, @code{vaticana-do3} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
     \override Staff.StaffSymbol   #'line-count = #4
 
-\clef "vaticana_do2" c
+\clef "vaticana-do2" c
 @end lilypond
 
 @item
 Editio Vaticana style fa clef @tab
-@code{vaticana_fa1}, @code{vaticana_fa2} @tab
+@code{vaticana-fa1}, @code{vaticana-fa2} @tab
 @lilypond[quote,relative=1,notime,indent=0.0\mm,fragment]
     \override Staff.StaffSymbol   #'line-count = #4
 
-\clef "vaticana_fa2" c
+\clef "vaticana-fa2" c
 @end lilypond
 
 @item
 Editio Medicaea style do clef @tab
-@code{medicaea_do1}, @code{medicaea_do2}, @code{medicaea_do3} @tab
+@code{medicaea-do1}, @code{medicaea-do2}, @code{medicaea-do3} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
     \override Staff.StaffSymbol   #'line-count = #4
 
-\clef "medicaea_do2" c
+\clef "medicaea-do2" c
 @end lilypond
 
 @item
 Editio Medicaea style fa clef @tab
-@code{medicaea_fa1}, @code{medicaea_fa2} @tab
+@code{medicaea-fa1}, @code{medicaea-fa2} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
     \override Staff.StaffSymbol   #'line-count = #4
 
-\clef "medicaea_fa2" c
+\clef "medicaea-fa2" c
 @end lilypond
 
 @item
 historic style hufnagel do clef @tab
-@code{hufnagel_do1}, @code{hufnagel_do2}, @code{hufnagel_do3} @tab
+@code{hufnagel-do1}, @code{hufnagel-do2}, @code{hufnagel-do3} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
     \override Staff.StaffSymbol   #'line-count = #4
 
-\clef "hufnagel_do2" c
+\clef "hufnagel-do2" c
 @end lilypond
 
 @item
 historic style hufnagel fa clef @tab
-@code{hufnagel_fa1}, @code{hufnagel_fa2} @tab
+@code{hufnagel-fa1}, @code{hufnagel-fa2} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
     \override Staff.StaffSymbol   #'line-count = #4
 
-\clef "hufnagel_fa2" c
+\clef "hufnagel-fa2" c
 @end lilypond
 
 @item
 historic style hufnagel combined do/fa clef @tab
-@code{hufnagel_do_fa} @tab
+@code{hufnagel-do-fa} @tab
 @lilypond[fragment,quote,relative=1,notime,indent=0.0\mm]
-\clef "hufnagel_do_fa" c
+\clef "hufnagel-do-fa" c
 @end lilypond
 
 @end multitable
@@ -6329,7 +6327,7 @@ For example,
         \set Score.defaultBarType = "empty"
         \override NoteHead #'style = #'neomensural
         \override Staff.TimeSignature   #'style = #'neomensural
-        \clef "petrucci_g"
+        \clef "petrucci-g"
         \[ g\longa c\breve a\breve f\breve d'\longa \]
         s4
         \[ e1 f1 a\breve g\longa \]
@@ -6341,7 +6339,7 @@ For example,
         \set Score.defaultBarType = "empty"
         \override NoteHead #'style = #'neomensural
         \override Staff.TimeSignature   #'style = #'neomensural
-        \clef "petrucci_g"
+        \clef "petrucci-g"
         \[ g\longa c\breve a\breve f\breve d'\longa \]
         s4
         \[ e1 f1 a\breve g\longa \]
@@ -6366,7 +6364,7 @@ to the following
         \set Score.defaultBarType = "empty"
         \override NoteHead #'style = #'neomensural
         \override Staff.TimeSignature   #'style = #'neomensural
-        \clef "petrucci_g"
+        \clef "petrucci-g"
         \[ g\longa c\breve a\breve f\breve d'\longa \]
         s4
         \[ e1 f1 a\breve g\longa \]
@@ -7196,8 +7194,7 @@ the following excerpt demonstrates
 \score {
   <<
     \context VaticanaVoice = "cantus" {
-      \override Score.BarNumber #'transparent = ##t
-       {
+      \override Score.BarNumber #'transparent = ##t {
         \[ c'\melisma c' \flexa a \]
         \[ a \flexa \deminutum g\melismaEnd \]
         f \divisioMinima
diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 64ffbea727..d002a18012 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -19,89 +19,89 @@ upperStaff = \context GregorianStaff = upperStaff <<
      \transpose c c {
 	\override Staff.KeySignature  #'style = #'vaticana
 	\override Staff.Accidental  #'style = #'vaticana
-	\override NoteHead  #'style = #'vaticana_punctum
+	\override NoteHead  #'style = #'vaticana-punctum
 	\key es \major
-	\clef "vaticana_fa2"
+	\clef "vaticana-fa2"
 	c!1 des! e! f! ges!
 
-	\override NoteHead  #'style = #'vaticana_inclinatum
+	\override NoteHead  #'style = #'vaticana-inclinatum
 	a! b! ces'
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break % 1 (8*1)
 
-	\override NoteHead  #'style = #'vaticana_quilisma
+	\override NoteHead  #'style = #'vaticana-quilisma
 	b! des'! ges! fes!
 	\breathe
-	\clef "vaticana_fa1"
-	\override NoteHead  #'style = #'vaticana_plica
+	\clef "vaticana-fa1"
+	\override NoteHead  #'style = #'vaticana-plica
 	es d
-	\override NoteHead  #'style = #'vaticana_reverse_plica
+	\override NoteHead  #'style = #'vaticana-reverse-plica
 	c d
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break %2 (8*1)
 
-	\override NoteHead  #'style = #'vaticana_punctum_cavum
+	\override NoteHead  #'style = #'vaticana-punctum-cavum
 	es f
-	\override NoteHead  #'style = #'vaticana_lpes
+	\override NoteHead  #'style = #'vaticana-lpes
 	g as
-	\override NoteHead  #'style = #'vaticana_upes
+	\override NoteHead  #'style = #'vaticana-upes
 	bes as
-	\override NoteHead  #'style = #'vaticana_vupes
+	\override NoteHead  #'style = #'vaticana-vupes
 	g f
-	\override NoteHead  #'style = #'vaticana_linea_punctum
+	\override NoteHead  #'style = #'vaticana-linea-punctum
 	\override Staff.BarLine  #'bar-size = #2.0 \bar "|"
 %	\break % 3 (8*1)
 
 	es d
-	\override NoteHead  #'style = #'vaticana_epiphonus
+	\override NoteHead  #'style = #'vaticana-epiphonus
 	c d
-	\override NoteHead  #'style = #'vaticana_cephalicus
+	\override NoteHead  #'style = #'vaticana-cephalicus
 	es f
 
 	\override Staff.KeySignature  #'style = #'medicaea
 	\override Staff.Accidental  #'style = #'medicaea
 	\override Staff.Custos  #'style = #'medicaea
-	\override NoteHead  #'style = #'medicaea_punctum
-	\clef "medicaea_fa2"
+	\override NoteHead  #'style = #'medicaea-punctum
+	\clef "medicaea-fa2"
 	ces! des!
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break % 4 (8*1)
 
 	e! f! ges!
-	\clef "medicaea_do2"
-	\override NoteHead  #'style = #'medicaea_inclinatum
+	\clef "medicaea-do2"
+	\override NoteHead  #'style = #'medicaea-inclinatum
 	a! b! ces'!
-	\override NoteHead  #'style = #'medicaea_virga
+	\override NoteHead  #'style = #'medicaea-virga
 	b! a!
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break % 5 (8*1)
 
 	ges! fes!
-	\clef "medicaea_fa1"
-	\override NoteHead  #'style = #'medicaea_rvirga
+	\clef "medicaea-fa1"
+	\override NoteHead  #'style = #'medicaea-rvirga
 	e! des! ces!
 
 	\override Staff.KeySignature  #'style = #'hufnagel
 	\override Staff.Accidental  #'style = #'hufnagel
 	\override Staff.Custos  #'style = #'hufnagel
-	\override NoteHead  #'style = #'hufnagel_punctum
-	\clef "hufnagel_fa2"
+	\override NoteHead  #'style = #'hufnagel-punctum
+	\clef "hufnagel-fa2"
 	ces! des! es!
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break % 6 (8*1)
 
 	fes! ges!
-	\clef "hufnagel_do2"
-	\override NoteHead  #'style = #'hufnagel_lpes
+	\clef "hufnagel-do2"
+	\override NoteHead  #'style = #'hufnagel-lpes
 	as! bes! ces'!
-	\override NoteHead  #'style = #'hufnagel_virga
+	\override NoteHead  #'style = #'hufnagel-virga
 	bes! as!
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break % 7 (8*1)
 
 	ges! fes!
-	\clef "hufnagel_do_fa"
-	\override NoteHead  #'style = #'hufnagel_punctum
+	\clef "hufnagel-do-fa"
+	\override NoteHead  #'style = #'hufnagel-punctum
 	es! des! ces! des! es! fes!
 	\bar "||"
 %	\break % 8 (8*1)
@@ -134,44 +134,44 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 
 	cis'1 d'\breve gis'\breve e'\breve \[ e'\longa fis'\longa \]
 	\set Staff.forceClef = ##t
-	\clef "neomensural_c2"
+	\clef "neomensural-c2"
 	cis1
 	\bar "|"
 %	\break % 2 (16*1)
 
 	\[ g\breve dis''\longa \]
 	b\breve \[ a\longa d\longa \]
-	\clef "petrucci_c2"
+	\clef "petrucci-c2"
 %	\break % 4 (16*1)
 
 	fis1 ces1
-	\clef "petrucci_c2"
+	\clef "petrucci-c2"
 	r\longa
 	\set Staff.forceClef = ##t
-	\clef "mensural_c2"
+	\clef "mensural-c2"
 	r\breve
 	\bar "|"
 %	\break % 5 (8*1)
 
 	r2
-	\clef "mensural_g"
+	\clef "mensural-g"
 	r4 r8 r16 r16
 	\override NoteHead  #'style = #'mensural
 	\override Stem  #'flag-style = #'mensural
 	\override Stem  #'thickness = #1.0
 	\override Rest  #'style = #'mensural
-	\clef "petrucci_f"
+	\clef "petrucci-f"
 	c8 b, c16 b, c32 b, c64 b, c64 b,
 	d8 e  d16 e  d32 e  d64 e  d64 e
 	r\longa
 	\set Staff.forceClef = ##t
-	\clef "petrucci_f"
+	\clef "petrucci-f"
 	r\breve
 	\bar "|"
 %	\break % 6 (8*1)
 
 	r\breve 
-	\clef "mensural_f"
+	\clef "mensural-f"
 	% FIXME: must set Stem flag-style to #'neomensural to avoid
 	% segmentation fault on r8/r16/r32.  (Strange: what has
 	% Stem flag-style to do with mensural rests?)
@@ -180,9 +180,9 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	r2 r4 r8 r16 r16
 	\override Stem  #'flag-style = #'mensural
 	\set Staff.forceClef = ##t
-	\clef "mensural_f"
+	\clef "mensural-f"
 	e\breve f g a1
-	\clef "mensural_g"
+	\clef "mensural-g"
 %	\break % 7 (8*1)
 
 	\[ bes'!\longa a'!\longa c''!\longa \]
@@ -192,18 +192,18 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 
 	bes'!\longa fis'!1 as'!1 ges'!\longa % lig
 	\set Staff.forceClef = ##t
-	\clef "mensural_g"
+	\clef "mensural-g"
 	e'2 d' c' \bar "|"
 %	\break % 11 (16*1)
 
 	\set Staff.forceClef = ##t
-	\clef "petrucci_g"
+	\clef "petrucci-g"
 	c'2 d' e' f'
-	\clef "petrucci_g"
+	\clef "petrucci-g"
 	g' as'! bes'! cis''!
 	bes'! as'! gis'! fis'!
 	\set Staff.forceClef = ##t
-	\clef "mensural_g"
+	\clef "mensural-g"
 	es'! des'! cis'!1 \bar "||"
 %	\break % 12 (8*1)
     }
@@ -245,7 +245,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \alias Voice
 	    \remove Ligature_bracket_engraver
 %	    \consists Gregorian_ligature_engraver %%%%%%%% TODO: not yet implemented
-	    \override NoteHead #'style = #'vaticana_punctum
+	    \override NoteHead #'style = #'vaticana-punctum
 	    autoBeaming = ##f
 	}
 	\context {
@@ -260,7 +260,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \override Custos #'style = #'mensural
 	    \override Custos #'neutral-position = #3
 	    \override Custos #'neutral-direction = #-1
-	    clefGlyph = #"clefs-petrucci_c2"
+	    clefGlyph = #"clefs-petrucci-c2"
 	    clefPosition = #-2
 	    clefOctavation = #0 
 	}
@@ -278,7 +278,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \override Custos #'style = #'vaticana
 	    \override Custos #'neutral-position = #4
 	    \override Custos #'neutral-direction = #-1
-	    clefGlyph = #"clefs-vaticana_do"
+	    clefGlyph = #"clefs-vaticana-do"
 	    clefPosition = #1
 	    clefOctavation = #0 
 	}
diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly
index bd7db894b1..9053779efa 100644
--- a/input/test/ligature-vaticana.ly
+++ b/input/test/ligature-vaticana.ly
@@ -8,7 +8,7 @@ calligraphic notes. "
 \include "gregorian-init.ly"
 
 cantus = \context VaticanaVoice = "cantus"  {
-  \clef "vaticana_fa2"
+  \clef "vaticana-fa2"
   \[ f\melisma \quilisma g \auctum \descendens a\melismaEnd \]
   \[ \virga a\melisma g \pes a \inclinatum f \inclinatum d
      c \pes d \quilisma e \pes f \virga g
diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index 99a2a823bd..df07cbcf96 100644
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -67,7 +67,7 @@ voice =  \transpose c c' {
 	    \override Custos #'style = #'mensural
 	    \override Custos #'neutral-position = #3
 	    \override Custos #'neutral-direction = #-1
-	    clefGlyph = #"clefs-petrucci_g"
+	    clefGlyph = #"clefs-petrucci-g"
 	    clefPosition = #-2
 	    clefOctavation = #-0
 	}
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index fac290591a..8305a01c3b 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -662,7 +662,7 @@ EasyNotation = \context {	% TODO: why \context override?
   \consists "Vaticana_ligature_engraver"
 
   % Set default head for notes outside of \[ \].
-  \override NoteHead #'style = #'vaticana_punctum
+  \override NoteHead #'style = #'vaticana-punctum
 
   % Put some space before and after divisiones.
   % FIXME: This does not seem to show any effect.
@@ -702,7 +702,7 @@ EasyNotation = \context {	% TODO: why \context override?
   % \override StaffSymbol #'width = #60.0
 
   % Choose vaticana do clef on 3rd line as default.
-  clefGlyph = #"clefs-vaticana_do"
+  clefGlyph = #"clefs-vaticana-do"
   middleCPosition = #1
   clefPosition = #1
   clefOctavation = #0
diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 17b9472dff..e548c6afab 100644
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -101,7 +101,43 @@ circulus = #(make-articulation "circulus")
 episemInitium = #(make-span-event 'TextSpanEvent START)
 episemFinis = #(make-span-event 'TextSpanEvent STOP)
 
+%
+% shortcut music functions for Liber Hymnarius neumes table
+% (experimental)
+%
+%#(define (make-script x)
+%   (make-music 'ArticulationEvent
+%               'articulation-type x))
+%    
+%#(define (add-script m x)
+%   (if
+%     (equal? (ly:music-property m 'name) 'EventChord)
+%     (set! (ly:music-property m 'elements)
+%           (cons (make-script x)
+%                 (ly:music-property m 'elements))))
+%   m)
+%
+%#(define (add-staccato m)
+%   (add-script m "staccato"))
+%
+% % \applymusic #(lambda (x) (music-map add-staccato x)) { c c }
+%
+% % \climacus { x y z ... }:
+% % \[ \virga x \inclinatum y \inclinatum z ... \]
+%
+%#(defmacro def-climacus-function (start stop)
+%  `(def-music-function (location music) (ly:music?)
+%     (make-music 'SequentialMusic
+%        'elements (list 'LigatureStartEvent
+%			(ly:music-deep-copy ,start)
+%                        music
+%                        (ly:music-deep-copy ,stop)
+%			'LigatureStopEvent))))
+%climacus = #(def-climacus-function startSequentialMusic stopSequentialMusic)
 
+%
+% example paper block for gregorian chant notation
+%
 
 neumeDemoPaper = \paper {
     interscoreline = 1
diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index 4f63711491..7d87818979 100644
--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -81,13 +81,13 @@ def draw_vaticana_do_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Ed. Vat. do clef", "vaticana_do", "vatdoclef")
+fet_beginchar("Ed. Vat. do clef", "vaticana-do", "vatdoclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_vaticana_do_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Ed. Vat. do clef", "vaticana_do_change", "vatcdoclef")
+fet_beginchar("Ed. Vat. do clef", "vaticana-do_change", "vatcdoclef")
 	draw_vaticana_do_clef((0,0), 1.0); % no reduction
 fet_endchar;
 
@@ -129,13 +129,13 @@ def draw_vaticana_fa_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Ed. Vat. fa clef", "vaticana_fa", "vatfaclef")
+fet_beginchar("Ed. Vat. fa clef", "vaticana-fa", "vatfaclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_vaticana_fa_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Ed. Vat. fa clef", "vaticana_fa_change", "vatcfaclef")
+fet_beginchar("Ed. Vat. fa clef", "vaticana-fa_change", "vatcfaclef")
 	draw_vaticana_fa_clef((0,0), 1.0); % no reduction
 fet_endchar;
 
@@ -196,13 +196,13 @@ def draw_medicaea_do_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Ed. Med. do clef", "medicaea_do", "meddoclef")
+fet_beginchar("Ed. Med. do clef", "medicaea-do", "meddoclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_medicaea_do_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Ed. Med. do clef", "medicaea_do_change", "cmeddoclef")
+fet_beginchar("Ed. Med. do clef", "medicaea-do_change", "cmeddoclef")
 	draw_medicaea_do_clef((0,0), .8);
 fet_endchar;
 
@@ -247,13 +247,13 @@ def draw_medicaea_fa_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Ed. Med. fa clef", "medicaea_fa", "medfaclef")
+fet_beginchar("Ed. Med. fa clef", "medicaea-fa", "medfaclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_medicaea_fa_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Ed. Med. fa clef", "medicaea_fa_change", "cmedfaclef")
+fet_beginchar("Ed. Med. fa clef", "medicaea-fa_change", "cmedfaclef")
 	draw_medicaea_fa_clef((0,0), .8);
 fet_endchar;
 
@@ -322,7 +322,7 @@ def draw_brevis(expr exact_center, bwidth, bheight, blinethickness) =
 enddef;
 
 
-def draw_neo_mensural_c_clef(expr exact_center, reduction) = 
+def draw_neomensural_c_clef(expr exact_center, reduction) = 
 	save reduced_il, reduced_slt, stem_width;
 	reduced_il# = staff_space# * reduction;
 	reduced_slt# = linethickness# * reduction;
@@ -357,14 +357,14 @@ def draw_neo_mensural_c_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("neo-mensural c clef", "neomensural_c", "neomenscclef")
+fet_beginchar("neo-mensural c clef", "neomensural-c", "neomenscclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
-	draw_neo_mensural_c_clef((0,0), 1.0);
+	draw_neomensural_c_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("neo-mensural c clef", "neomensural_c_change", "cneomenscclef")
-	draw_neo_mensural_c_clef((0,0), .8);
+fet_beginchar("neo-mensural c clef", "neomensural-c_change", "cneomenscclef")
+	draw_neomensural_c_clef((0,0), .8);
 fet_endchar;
 
 
@@ -415,53 +415,53 @@ def draw_petrucci_c_clef(expr exact_center, flare_align, reduction) =
 enddef;
 
 
-fet_beginchar("petrucci c1 clef", "petrucci_c1", "petruccic1clef")
+fet_beginchar("petrucci c1 clef", "petrucci-c1", "petruccic1clef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), +2, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c1 clef", "petrucci_c1_change", "cpetruccic1clef")
+fet_beginchar("petrucci c1 clef", "petrucci-c1_change", "cpetruccic1clef")
 	draw_petrucci_c_clef((0,0), +2, .8);
 fet_endchar;
 
-fet_beginchar("petrucci c2 clef", "petrucci_c2", "petruccic2clef")
+fet_beginchar("petrucci c2 clef", "petrucci-c2", "petruccic2clef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), +1, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c2 clef", "petrucci_c2_change", "cpetruccic2clef")
+fet_beginchar("petrucci c2 clef", "petrucci-c2_change", "cpetruccic2clef")
 	draw_petrucci_c_clef((0,0), +1, .8);
 fet_endchar;
 
-fet_beginchar("petrucci c3 clef", "petrucci_c3", "petruccic3clef")
+fet_beginchar("petrucci c3 clef", "petrucci-c3", "petruccic3clef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), 0, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c3 clef", "petrucci_c3_change", "cpetruccic3clef")
+fet_beginchar("petrucci c3 clef", "petrucci-c3_change", "cpetruccic3clef")
 	draw_petrucci_c_clef((0,0), 0, .8);
 fet_endchar;
 
-fet_beginchar("petrucci c4 clef", "petrucci_c4", "petruccic4clef")
+fet_beginchar("petrucci c4 clef", "petrucci-c4", "petruccic4clef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), -1, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c4 clef", "petrucci_c4_change", "cpetruccic4clef")
+fet_beginchar("petrucci c4 clef", "petrucci-c4_change", "cpetruccic4clef")
 	draw_petrucci_c_clef((0,0), -1, .8);
 fet_endchar;
 
-fet_beginchar("petrucci c5 clef", "petrucci_c5", "petruccic5clef")
+fet_beginchar("petrucci c5 clef", "petrucci-c5", "petruccic5clef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_c_clef((0,0), -2, 1.0);
 fet_endchar;
-fet_beginchar("petrucci c5 clef", "petrucci_c5_change", "cpetruc5iceclef")
+fet_beginchar("petrucci c5 clef", "petrucci-c5_change", "cpetruc5iceclef")
 	draw_petrucci_c_clef((0,0), -2, .8);
 fet_endchar;
 
@@ -505,13 +505,13 @@ def draw_mensural_c_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("mensural c clef", "mensural_c", "menscclef")
+fet_beginchar("mensural c clef", "mensural-c", "menscclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_mensural_c_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("mensural c clef", "mensural_c_change", "cmenscclef")
+fet_beginchar("mensural c clef", "mensural-c_change", "cmenscclef")
 	draw_mensural_c_clef((0,0), .8);
 fet_endchar;
 
@@ -615,13 +615,13 @@ def draw_petrucci_f_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("petrucci f clef", "petrucci_f", "petruccifclef")
+fet_beginchar("petrucci f clef", "petrucci-f", "petruccifclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_f_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("petrucci f clef", "petrucci_f_change", "cpetruccifclef")
+fet_beginchar("petrucci f clef", "petrucci-f_change", "cpetruccifclef")
 	draw_petrucci_f_clef((0,0), .8);
 fet_endchar;
 
@@ -675,13 +675,13 @@ def draw_mensural_f_clef(expr exact_center, reduction) =
 		     0.5width# + ypart exact_center);
 enddef;
 
-fet_beginchar("mensural f clef", "mensural_f", "mensfclef")
+fet_beginchar("mensural f clef", "mensural-f", "mensfclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_mensural_f_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("mensural f clef", "mensural_f_change", "cmensfclef")
+fet_beginchar("mensural f clef", "mensural-f_change", "cmensfclef")
 	draw_mensural_f_clef((0,0), .8);
 fet_endchar;
 
@@ -746,13 +746,13 @@ def draw_petrucci_g_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("petrucci g clef", "petrucci_g", "petruccigclef")
+fet_beginchar("petrucci g clef", "petrucci-g", "petruccigclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_g_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("petrucci g clef", "petrucci_g_change", "cpetruccigclef")
+fet_beginchar("petrucci g clef", "petrucci-g_change", "cpetruccigclef")
 	draw_petrucci_g_clef((0,0), .8);
 fet_endchar;
 
@@ -777,13 +777,13 @@ enddef;
 % FIXME: This clef is preliminarily mapped to the petrucci g clef
 % until the code for the mensural g clef will be rewritten.
 %
-fet_beginchar("mensural g clef", "mensural_g", "mensgclef")
+fet_beginchar("mensural g clef", "mensural-g", "mensgclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_petrucci_g_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("mensural g clef", "mensural_g_change", "cmensgclef")
+fet_beginchar("mensural g clef", "mensural-g_change", "cmensgclef")
 	draw_petrucci_g_clef((0,0), .8);
 fet_endchar;
 
@@ -835,13 +835,13 @@ def draw_hufnagel_do_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef")
+fet_beginchar("Hufnagel do clef", "hufnagel-do", "hufnageldoclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_hufnagel_do_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef")
+fet_beginchar("Hufnagel do clef", "hufnagel-do_change", "chufnageldoclef")
 	draw_hufnagel_do_clef((0,0), .8);
 fet_endchar;
 
@@ -892,13 +892,13 @@ def draw_hufnagel_fa_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Hufnagel fa clef", "hufnagel_fa", "hufnagelfaclef")
+fet_beginchar("Hufnagel fa clef", "hufnagel-fa", "hufnagelfaclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_hufnagel_fa_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Hufnagel fa clef", "hufnagel_fa_change", "chufnagelfaclef")
+fet_beginchar("Hufnagel fa clef", "hufnagel-fa_change", "chufnagelfaclef")
 	draw_hufnagel_fa_clef((0,0), .8);
 fet_endchar;
 
@@ -913,13 +913,13 @@ def draw_hufnagel_do_fa_clef(expr exact_center, reduction) =
 enddef;
 
 
-fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa", "hufnageldofaclef")
+fet_beginchar("Hufnagel do/fa clef", "hufnagel-do-fa", "hufnageldofaclef")
 	if test = 1:
 		draw_staff(-1,3, 0.0);
 	fi;
 	draw_hufnagel_do_fa_clef((0,0), 1.0);
 fet_endchar;
-fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa_change",
+fet_beginchar("Hufnagel do/fa clef", "hufnagel-do-fa_change",
 	      "chufnageldofaclef")
 	draw_hufnagel_do_fa_clef((0,0), .8);
 fet_endchar;
diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index b9039be772..a821faa938 100644
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -49,7 +49,7 @@ define_pixels(noteheight);
 %
 %
 
-def draw_neo_brevis(expr brevwid) =
+def draw_neomensural_brevis(expr brevwid) =
 	save beamheight, head_width;
 	save holeheight, stem_width;
 	save serif_size, serif_protrude;
@@ -90,8 +90,8 @@ def draw_neo_brevis(expr brevwid) =
 enddef;
 
 
-def draw_neo_left_stemmed_head (expr wid) =
-	draw_neo_brevis(wid);
+def draw_neomensural_left_stemmed_head (expr wid) =
+	draw_neomensural_brevis(wid);
 
 	x6 = x7 = head_width - stem_width/2;
 	y6 = y5;
@@ -101,15 +101,15 @@ def draw_neo_left_stemmed_head (expr wid) =
 enddef;
 
 fet_beginchar("Left stemmed notehead", "lneomensural", "mensuralleftstemmedhead");
-	draw_neo_left_stemmed_head (2 staff_space#);
+	draw_neomensural_left_stemmed_head (2 staff_space#);
 fet_endchar;
 
 %
 % Some sources (eg Musix/OpusTeX think that the appendage should be on
 % the left, some say right. Right wins democratically.
 %
-def draw_neo_longa (expr wid) =
-	draw_neo_brevis(wid);
+def draw_neomensural_longa (expr wid) =
+	draw_neomensural_brevis(wid);
 	save theta;
 
 	x7r = head_width;
@@ -124,8 +124,8 @@ def draw_neo_longa (expr wid) =
 	penlabels(6,7);
 enddef;
 
-fet_beginchar("Left stemmed notehead", "lneo_mensural", "mensuralleftstemmedhead");
-	draw_neo_left_stemmed_head (2 staff_space#);
+fet_beginchar("Left stemmed notehead", "lneomensural", "mensuralleftstemmedhead");
+	draw_neomensural_left_stemmed_head (2 staff_space#);
 fet_endchar;
 
 %
@@ -133,19 +133,19 @@ fet_endchar;
 %
 % (ze is wel breed)
 % 
-fet_beginchar("Maxima notehead", "-3neomensural", "neomensuralmaximahead");
-	draw_neo_longa (2.6 staff_space#)
+fet_beginchar("Neo-mensural maxima notehead", "-3neomensural", "neomensuralmaximahead");
+	draw_neomensural_longa (2.6 staff_space#)
 fet_endchar;
 
-fet_beginchar("Longa notehead", "-2neomensural", "neomensurallongahead");
-	draw_neo_longa (2 staff_space#)
+fet_beginchar("Neo-mensural longa notehead", "-2neomensural", "neomensurallongahead");
+	draw_neomensural_longa (2 staff_space#)
 fet_endchar;
 
-fet_beginchar("Brevis notehead", "-1neomensural", "neomensuralbrevishead")
-	draw_neo_brevis(2 staff_space#);
+fet_beginchar("Neo-mensural brevis notehead", "-1neomensural", "neomensuralbrevishead")
+	draw_neomensural_brevis(2 staff_space#);
 fet_endchar;
 
-def draw_neo_mensural_black_head (expr wid, height) =
+def draw_neomensural_black_head (expr wid, height) =
 	save head_width;
 	head_width# = wid;
 	set_char_box (0, head_width#, height/2, height/2);
@@ -165,8 +165,8 @@ def draw_neo_mensural_black_head (expr wid, height) =
 	filldraw z1 -- z2 -- z3 -- z4 -- cycle;
 enddef;
 
-def draw_neo_mensural_open_head (expr wid, height)=
-	draw_neo_mensural_black_head (wid, height);
+def draw_neomensural_open_head (expr wid, height)=
+	draw_neomensural_black_head (wid, height);
 	save diamNW, diamSW;
 	diamNW = length (z2 - z1) + blot_diameter;
 	diamSW = length (z4 - z1) + blot_diameter;
@@ -186,7 +186,7 @@ def draw_neo_mensural_open_head (expr wid, height)=
 enddef;
 
 fet_beginchar("Neo-mensural open head","0neomensural","neomensuralsemibrevishead")
-      draw_neo_mensural_open_head (staff_space#, noteheight#);
+      draw_neomensural_open_head (staff_space#, noteheight#);
 fet_endchar;
 
 %
@@ -196,29 +196,29 @@ fet_endchar;
 fet_beginchar("Harmonic notehead (Neo-mensural open)",
 		"0harmonic","harmonichead")
 
-	draw_neo_mensural_open_head (1.3 staff_space#, 1.3 noteheight#);
+	draw_neomensural_open_head (1.3 staff_space#, 1.3 noteheight#);
 	charwx := head_width#;
 	charwy := 0;
 fet_endchar;
 
 
 fet_beginchar("Neo-mensural open head","1neomensural","neomensuralminimahead")
-      draw_neo_mensural_open_head (staff_space#, noteheight#);
+      draw_neomensural_open_head (staff_space#, noteheight#);
 fet_endchar;
 
 fet_beginchar("Neo-mensural black head","2neomensural","neomensuralsemiminimahead")
-      draw_neo_mensural_black_head (staff_space#, noteheight#);
+      draw_neomensural_black_head (staff_space#, noteheight#);
 fet_endchar;
 
 
 
-def draw_brevis (expr wid) =
-	% TODO.  For the moment, fall back to draw_neo_brevis.
-	draw_neo_brevis(wid);
+def draw_mensural_brevis (expr wid) =
+	% TODO.  For the moment, fall back to draw_neomensural_brevis.
+	draw_neomensural_brevis(wid);
 enddef;
 
-def draw_left_stemmed_head (expr wid) =
-	draw_brevis(wid);
+def draw_mensural_left_stemmed_head (expr wid) =
+	draw_mensural_brevis(wid);
 	x6 = x7 = stem_width/2;
 	y6 = y5;
 	y7 = y5 - 2.25staff_space;
@@ -226,8 +226,8 @@ def draw_left_stemmed_head (expr wid) =
 	draw z6 .. z7;
 enddef;
 
-def draw_longa (expr wid) =
-	draw_brevis(wid);
+def draw_mensural_longa (expr wid) =
+	draw_mensural_brevis(wid);
 	x6 = x7 = head_width - stem_width/2;
 	y6 = y5;
 	y7 = y5 - 2.25staff_space;
@@ -235,20 +235,20 @@ def draw_longa (expr wid) =
 	draw z6 .. z7;
 enddef;
 
-fet_beginchar("Left stemmed notehead", "lmensural", "mensuralleftstemmedhead");
-	draw_left_stemmed_head (staff_space#)
+fet_beginchar("Mensural left stemmed notehead", "lmensural", "mensuralleftstemmedhead");
+	draw_mensural_left_stemmed_head (staff_space#)
 fet_endchar;
 
-fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead");
-	draw_longa (2.0 staff_space#)
+fet_beginchar("Mensural maxima notehead", "-3mensural", "mensuralmaximahead");
+	draw_mensural_longa (2.0 staff_space#)
 fet_endchar;
 
-fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead");
-	draw_longa (staff_space#)
+fet_beginchar("Mensural longa notehead", "-2mensural", "mensurallongahead");
+	draw_mensural_longa (staff_space#)
 fet_endchar;
 
-fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead")
-	draw_brevis(staff_space#);
+fet_beginchar("Mensural brevis notehead", "-1mensural", "mensuralbrevishead")
+	draw_mensural_brevis(staff_space#);
 fet_endchar;
 
 def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) =
@@ -514,45 +514,45 @@ def inclinatum_char(expr verbose_name, internal_name, ly_name,
 enddef;
 
 % punctum
-punctum_char("Ed. Vat. punctum", "vaticana_punctum", "vatpunctumhead",
+punctum_char("Ed. Vat. punctum", "vaticana-punctum", "vatpunctumhead",
 	     false, false, false, false, false,
 	     false, false, false, false, false, 1.0);
 
 % punctum cavum (for OpusTeX compatibility)
-punctum_char("Ed. Vat. punctum cavum", "vaticana_punctum_cavum",
+punctum_char("Ed. Vat. punctum cavum", "vaticana-punctum-cavum",
 	     "vatpunctumcavumhead",
 	     false, false, false, true, false,
 	     false, false, false, false, false, 1.0);
 
 % linea punctum (for OpusTeX compatibility)
-punctum_char("Ed. Vat. linea punctum", "vaticana_linea_punctum",
+punctum_char("Ed. Vat. linea punctum", "vaticana-linea-punctum",
 	     "vatlineapunctumhead",
 	     false, false, true, false, false,
 	     false, false, false, false, false, 1.0);
 
 % linea punctum cavum (for OpusTeX compatibility)
-punctum_char("Ed. Vat. linea punctum cavum", "vaticana_linea_punctum_cavum",
+punctum_char("Ed. Vat. linea punctum cavum", "vaticana-linea-punctum-cavum",
 	     "vatlineapunctumcavumhead",
 	     false, false, true, true, false,
 	     false, false, false, false, false, 1.0);
 
 % punctum inclinatum
-inclinatum_char("Ed. Vat. inclinatum", "vaticana_inclinatum",
+inclinatum_char("Ed. Vat. inclinatum", "vaticana-inclinatum",
 		"vatinclinatumhead",
 		false, false, false);
 
 % pes lower punctum
-punctum_char("Ed. Vat. pes lower punctum", "vaticana_lpes", "vatlpeshead",
+punctum_char("Ed. Vat. pes lower punctum", "vaticana-lpes", "vatlpeshead",
 	     false, false, false, false, true,
 	     false, true, false, false, false, 1.0);
 
 % pes lower punctum
-punctum_char("Ed. Vat. pes var lower punctum", "vaticana_vlpes", "vatvlpeshead",
+punctum_char("Ed. Vat. pes var lower punctum", "vaticana-vlpes", "vatvlpeshead",
 	     false, false, false, false, true,
 	     false, true, false, false, true, 1.0);
 
 % pes upper punctum
-punctum_char("Ed. Vat. pes upper punctum", "vaticana_upes", "vatupeshead",
+punctum_char("Ed. Vat. pes upper punctum", "vaticana-upes", "vatupeshead",
 	     false, false, false, false, true,
 	     false, false, false, false, false, 1.0);
 
@@ -562,18 +562,18 @@ punctum_char("Ed. Vat. pes upper punctum", "vaticana_upes", "vatupeshead",
 % avoid collision with the lower punctum note of the pes when the upper
 % punctum sits directly on top of the lower punctum.
 %
-punctum_char("Ed. Vat. var pes upper punctum", "vaticana_vupes",
+punctum_char("Ed. Vat. var pes upper punctum", "vaticana-vupes",
 	     "vatvupeshead",
 	     false, false, false, false, true,
 	     false, false, false, true, false, 1.0);
 
 % small punctum as used in epiphonus
-punctum_char("Ed. Vat. plica", "vaticana_plica", "vatplicahead",
+punctum_char("Ed. Vat. plica", "vaticana-plica", "vatplicahead",
 	     false, false, false, false, false,
 	     false, false, false, false, false, 0.6);
 
 % excentric punctum as used in epiphonus
-punctum_char("Ed. Vat. epiphonus", "vaticana_epiphonus", "vatepiphonushead",
+punctum_char("Ed. Vat. epiphonus", "vaticana-epiphonus", "vatepiphonushead",
 	     false, false, false, false, false,
 	     false, true, true, false, false, 1.0);
 
@@ -583,29 +583,29 @@ punctum_char("Ed. Vat. epiphonus", "vaticana_epiphonus", "vatepiphonushead",
 % avoid collision with the plica head when the plica sits directly on
 % top of the lower head.
 %
-punctum_char("Ed. Vat. var epiphonus", "vaticana_vepiphonus", "vatvepiphonushead",
+punctum_char("Ed. Vat. var epiphonus", "vaticana-vepiphonus", "vatvepiphonushead",
 	     false, false, false, false, false,
 	     false, true, true, false, true, 1.0);
 
 % small punctum as used in cephalicus
-punctum_char("Ed. Vat. rev. plica", "vaticana_reverse_plica", "vatrplicahead",
+punctum_char("Ed. Vat. rev. plica", "vaticana-reverse-plica", "vatrplicahead",
 	     false, false, false, false, false,
 	     false, true, false, false, false, 0.6);
 
 % excentric punctum as used in cephalicus; without left stem
-punctum_char("Ed. Vat. cephalicus", "vaticana_inner_cephalicus",
+punctum_char("Ed. Vat. cephalicus", "vaticana-inner-cephalicus",
 	     "vatinnercephalicushead",
 	     false, false, false, false, false,
 	     false, false, true, false, false, 1.0);
 
 % excentric punctum as used in cephalicus; with left stem
-punctum_char("Ed. Vat. cephalicus", "vaticana_cephalicus",
+punctum_char("Ed. Vat. cephalicus", "vaticana-cephalicus",
 	     "vatcephalicushead",
 	     true, false, false, false, false,
 	     false, false, true, false, false, 1.0);
 
 % quilisma
-fet_beginchar("Ed. Vat. quilisma", "vaticana_quilisma", "vatquilismahead")
+fet_beginchar("Ed. Vat. quilisma", "vaticana-quilisma", "vatquilismahead")
 	save b_h,a_w;
 	a_b:=1.54; % b_h*a_b/a_w = wd/ht
 	b_h:=0.85;
@@ -632,39 +632,39 @@ fet_beginchar("Ed. Vat. quilisma", "vaticana_quilisma", "vatquilismahead")
 fet_endchar;
 
 % solesmes punctum inclinatum parvum
-inclinatum_char("Solesmes punctum inclinatum parvum", "solesmes_incl_parvum",
+inclinatum_char("Solesmes punctum inclinatum parvum", "solesmes-incl-parvum",
 		"solinclparvumhead",
 		true, false, false);
 
 % solesmes punctum auctum ascendens
-punctum_char("Solesmes punctum auctum ascendens", "solesmes_auct_asc",
+punctum_char("Solesmes punctum auctum ascendens", "solesmes-auct-asc",
 	     "solauctaschead",
 	     false, false, false, false, false,
 	     true, true, false, false, false, 1.0);
 
 % solesmes punctum auctum descendens
-punctum_char("Solesmes punctum auctum descendens", "solesmes_auct_desc",
+punctum_char("Solesmes punctum auctum descendens", "solesmes-auct-desc",
 	     "solauctdeschead",
 	     false, false, false, false, false,
 	     true, false, false, false, false, 1.0);
 
 % solesmes punctum inclinatum auctum
-inclinatum_char("Solesmes punctum incl. auctum", "solesmes_incl_auctum",
+inclinatum_char("Solesmes punctum incl. auctum", "solesmes-incl-auctum",
 		"solpunctuminclinatumauctumhead",
 		false, false, true);
 
 % solesmes stropha
-inclinatum_char("Solesmes stropha", "solesmes_stropha",
+inclinatum_char("Solesmes stropha", "solesmes-stropha",
 		"solstrophahead",
 		false, true, false);
 
 % solesmes stropha aucta
-inclinatum_char("Solesmes stropha aucta", "solesmes_stropha_aucta",
+inclinatum_char("Solesmes stropha aucta", "solesmes-stropha-aucta",
 		"solstrophaauctahead",
 		false, true, true);
 
 % solesmes oriscus
-fet_beginchar("Solesmes oriscus", "solesmes_oriscus",
+fet_beginchar("Solesmes oriscus", "solesmes-oriscus",
 	"soloriscushead")
 	save b_h, a_w;
 	a_b := 1.54; % b_h*a_b/a_w = wd/ht
@@ -702,7 +702,7 @@ fet_endchar;
 %
 
 % inclinatum
-fet_beginchar("Ed. Med. inclinatum", "medicaea_inclinatum",
+fet_beginchar("Ed. Med. inclinatum", "medicaea-inclinatum",
 	"medinclinatumhead")
 	draw_diamond_head (1.2staff_space#, 0, 0, 35, false);
 fet_endchar;
@@ -748,15 +748,15 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
 enddef;
 
 % punctum
-punctum_char("Ed. Med. punctum", "medicaea_punctum", "medpunctumhead",
+punctum_char("Ed. Med. punctum", "medicaea-punctum", "medpunctumhead",
 	false, false);
 
 % left up-stemmed punctum
-punctum_char("Ed. Med. reverse virga", "medicaea_rvirga", "medrvirgahead",
+punctum_char("Ed. Med. reverse virga", "medicaea-rvirga", "medrvirgahead",
 	true, false);
 
 % virga (i.e. left down-stemmed punctum)
-punctum_char("Ed. Med. virga", "medicaea_virga", "medvirgahead",
+punctum_char("Ed. Med. virga", "medicaea-virga", "medvirgahead",
 	false, true);
 
 %%%%%%%%
@@ -792,13 +792,13 @@ def punctum_char (expr verbose_name, internal_name, ly_name,
 enddef;
 
 % punctum
-punctum_char("Hufnagel punctum", "hufnagel_punctum", "hufpunctumhead", false)
+punctum_char("Hufnagel punctum", "hufnagel-punctum", "hufpunctumhead", false)
 
 % virga
-punctum_char("Hufnagel virga", "hufnagel_virga", "hufvirgahead", true)
+punctum_char("Hufnagel virga", "hufnagel-virga", "hufvirgahead", true)
 
 % pes lower punctum
-fet_beginchar("Hufnagel pes lower punctum", "hufnagel_lpes", "huflpeshead")
+fet_beginchar("Hufnagel pes lower punctum", "hufnagel-lpes", "huflpeshead")
 	save width, height, alpha;
 	width# = 2*staff_space#;
 	height# = 0.7*staff_space#;
diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf
index a7134a5495..cf03e8f77b 100644
--- a/mf/parmesan-timesig.mf
+++ b/mf/parmesan-timesig.mf
@@ -13,11 +13,12 @@ fet_begingroup ("timesig")
 path threequartercircle;
 threequartercircle = halfcircle & quartercircle rotated 180;
 
-save Cdiameter, Cthickness, Chairpin;
-Cdiameter# := 3/2 staff_space#;
-Cthickness# := 2 linethickness#;
-Chairpin# := 0.5 linethickness#;
-define_pixels(Cdiameter, Cthickness, Chairpin);
+save mensural_Cdiameter, mensural_Cthickness, mensural_Chairpin;
+mensural_Cdiameter# := 3/2 staff_space#;
+mensural_Cthickness# := 2 linethickness#;
+mensural_Chairpin# := 0.5 linethickness#;
+define_pixels(mensural_Cdiameter, mensural_Cthickness);
+define_pixels(mensural_Chairpin);
 
 %%%%%%%%
 %
@@ -38,15 +39,15 @@ def draw_nail (expr bottom_left, top_right) =
 
 	begingroup;
 		save x,y;
-		z2+(round/2,round/2) = top_right + (Cthickness/2, 0);
+		z2+(round/2,round/2) = top_right + (mensural_Cthickness/2, 0);
 		z4-(round/2,round/2) = bottom_left;
 		y3 = y2;
 		y4 = y1;
-		x2 = x1 + Cthickness/2;
+		x2 = x1 + mensural_Cthickness/2;
 		x2 - x1 = x4 - x3;
 		x5 = x1;
 		x6 = x4;
-		y5 = y6 = y2 - 2Cthickness;
+		y5 = y6 = y2 - 2mensural_Cthickness;
 
 		pickup pencircle scaled round;
 		fill bot z1 .. rt z1 --- rt z5 .. rt z2 .. top z2 ---
@@ -56,85 +57,85 @@ def draw_nail (expr bottom_left, top_right) =
 
 enddef;
 
-def mens_timesig (expr verbose_name, internal_name, ly_name,
-			full_circle, reverse_circle, slashed, dotted) =
+def mensural_timesig (expr verbose_name, internal_name, ly_name,
+		      full_circle, reverse_circle, slashed, dotted) =
 
 	fet_beginchar(verbose_name, internal_name, ly_name)
 		if slashed:
 			set_char_box(0,
-				     Cdiameter# + Cthickness#,
-				     .75 (Cdiameter# + Cthickness#),
-				     .75 (Cdiameter# + Cthickness#));
+				     mensural_Cdiameter# + mensural_Cthickness#,
+				     .75 (mensural_Cdiameter# + mensural_Cthickness#),
+				     .75 (mensural_Cdiameter# + mensural_Cthickness#));
 			if (full_circle or dotted):
-				draw_nail((-Cthickness/2, -d), (Cthickness/2, h));
+				draw_nail((-mensural_Cthickness/2, -d), (mensural_Cthickness/2, h));
 			else:
-				draw_nail((-Cthickness, -d), (0, h));
+				draw_nail((-mensural_Cthickness, -d), (0, h));
 			fi;
 		else:
 			set_char_box(0,
-				     Cdiameter# + Cthickness#,
-				     .5 (Cdiameter# + Cthickness#),
-				     .5 (Cdiameter# + Cthickness#));
+				     mensural_Cdiameter# + mensural_Cthickness#,
+				     .5 (mensural_Cdiameter# + mensural_Cthickness#),
+				     .5 (mensural_Cdiameter# + mensural_Cthickness#));
 		fi;
-		pickup pencircle xscaled Cthickness yscaled Chairpin rotated 0;
+		pickup pencircle xscaled mensural_Cthickness yscaled mensural_Chairpin rotated 0;
 		if full_circle:
-			draw fullcircle scaled Cdiameter;
+			draw fullcircle scaled mensural_Cdiameter;
 		elseif reverse_circle:
-			draw threequartercircle rotated 225 scaled Cdiameter;
+			draw threequartercircle rotated 225 scaled mensural_Cdiameter;
 		else:
-			draw threequartercircle rotated 45 scaled Cdiameter;
+			draw threequartercircle rotated 45 scaled mensural_Cdiameter;
 		fi;
 		if dotted:
 			pickup pencircle scaled 4 linethickness;
 			draw (0,0);
 		fi;
-		currentpicture := currentpicture shifted 0.5(Cdiameter + Cthickness, 0);
+		currentpicture := currentpicture shifted 0.5(mensural_Cdiameter + mensural_Cthickness, 0);
 	fet_endchar;
 enddef;
 
 %% tempus imperfectum cum prolatione imperfecta
-mens_timesig ("Mensural 4/4 meter", "mensural4/4", "mensuralfourfourmeter",
-		false, false, false, false);
+mensural_timesig ("Mensural 4/4 meter", "mensural4/4", "mensuralfourfourmeter",
+		  false, false, false, false);
 
 %% tempus imperfectum cum prolatione imperfecta proportio dupla
-mens_timesig ("Mensural 2/2 meter", "mensural2/2", "mensuralallabreve",
-		false, false, true, false);
+mensural_timesig ("Mensural 2/2 meter", "mensural2/2", "mensuralallabreve",
+		  false, false, true, false);
 
 %% tempus perfectum cum prolatione imperfecta
-mens_timesig ("Mensural 3/2 meter", "mensural3/2", "mensuralthreetwometer",
-		true, false, false, false);
+mensural_timesig ("Mensural 3/2 meter", "mensural3/2", "mensuralthreetwometer",
+		  true, false, false, false);
 
 %% tempus imperfectum cum prolatione perfecta
-mens_timesig ("Mensural 6/4 meter", "mensural6/4", "mensuralsixfourmeter",
-		false, false, false, true);
+mensural_timesig ("Mensural 6/4 meter", "mensural6/4", "mensuralsixfourmeter",
+		  false, false, false, true);
 
 %% tempus perfectum cum prolatione perfecta
-mens_timesig ("Mensural 9/4 meter", "mensural9/4", "mensuralninefourmeter",
-		true, false, false, true);
+mensural_timesig ("Mensural 9/4 meter", "mensural9/4", "mensuralninefourmeter",
+		  true, false, false, true);
 
 %% tempus perfectum cum prolatione imperfecta proportio dupla
-mens_timesig ("Mensural 3/4 meter", "mensural3/4", "mensuralthreefourmeter",
-		true, false, true, false);
+mensural_timesig ("Mensural 3/4 meter", "mensural3/4", "mensuralthreefourmeter",
+		  true, false, true, false);
 
 %% tempus imperfectum cum prolatione perfecta proportio dupla
-mens_timesig ("Mensural 6/8 meter", "mensural6/8", "mensuralsixeightmeter",
-		false, false, true, true);
+mensural_timesig ("Mensural 6/8 meter", "mensural6/8", "mensuralsixeightmeter",
+		  false, false, true, true);
 
 %% tempus perfectum cum prolatione perfecta proportio dupla
-mens_timesig ("Mensural 9/8 meter", "mensural9/8", "mensuralnineeight",
-		true, false, true, true);
+mensural_timesig ("Mensural 9/8 meter", "mensural9/8", "mensuralnineeight",
+		  true, false, true, true);
 	
 %% tempus imperfectum cum prolatione imperfecta diminutio simplex
-mens_timesig ("Mensural 4/8 meter", "mensural4/8", "mensuralfoureightmeter",
-		false, true, false, false);
+mensural_timesig ("Mensural 4/8 meter", "mensural4/8", "mensuralfoureightmeter",
+		  false, true, false, false);
 
 %% tempus imperfectum cum prolatione perfecta diminutio simplex
-mens_timesig ("Mensural 6/8 meter", "mensural6/8alt", "mensuralsixeightmeteralt",
-		false, true, false, true);
+mensural_timesig ("Mensural 6/8 meter", "mensural6/8alt", "mensuralsixeightmeteralt",
+		  false, true, false, true);
 
 %% tempus imperfectum cum prolatione imperfecta diminutio duplex
-mens_timesig ("Mensural 2/4 meter", "mensural2/4", "mensuraltwofourmeter",
-		false, true, true, false);
+mensural_timesig ("Mensural 2/4 meter", "mensural2/4", "mensuraltwofourmeter",
+		  false, true, true, false);
 
 %%%%%%%%
 %
@@ -145,89 +146,89 @@ mens_timesig ("Mensural 2/4 meter", "mensural2/4", "mensuraltwofourmeter",
 %
 %
 
-save neo_Cdiameter, neo_Cthickness;
-neo_Cdiameter# := 3/2 staff_space#;
-neo_Cthickness# := 2 linethickness#;
-define_pixels(neo_Cdiameter, neo_Cthickness);
+save neomensural_Cdiameter, neomensural_Cthickness;
+neomensural_Cdiameter# := 3/2 staff_space#;
+neomensural_Cthickness# := 2 linethickness#;
+define_pixels(neomensural_Cdiameter, neomensural_Cthickness);
 
-def neo_mens_timesig (expr verbose_name, internal_name, ly_name,
-			full_circle, reverse_circle, slashed, dotted) =
+def neomensural_timesig (expr verbose_name, internal_name, ly_name,
+			 full_circle, reverse_circle, slashed, dotted) =
 
 	fet_beginchar(verbose_name, internal_name, ly_name)
 		if slashed:
 			set_char_box(0,
-				     neo_Cdiameter# + neo_Cthickness#,
-				     .5 (neo_Cdiameter# + neo_Cthickness#),
-				     .5 (neo_Cdiameter# + neo_Cthickness#));
+				     neomensural_Cdiameter# + neomensural_Cthickness#,
+				     .5 (neomensural_Cdiameter# + neomensural_Cthickness#),
+				     .5 (neomensural_Cdiameter# + neomensural_Cthickness#));
 			if (full_circle or dotted):
-				draw_block((-neo_Cthickness/2, -d), (neo_Cthickness/2, h));
+				draw_block((-neomensural_Cthickness/2, -d), (neomensural_Cthickness/2, h));
 			else:
-				draw_block((-neo_Cthickness, -d), (0, h));
+				draw_block((-neomensural_Cthickness, -d), (0, h));
 			fi;
 		else:
 			set_char_box(0,
-				     neo_Cdiameter# + neo_Cthickness#,
-				     .5 (neo_Cdiameter# + neo_Cthickness#),
-				     .5 (neo_Cdiameter# + neo_Cthickness#));
+				     neomensural_Cdiameter# + neomensural_Cthickness#,
+				     .5 (neomensural_Cdiameter# + neomensural_Cthickness#),
+				     .5 (neomensural_Cdiameter# + neomensural_Cthickness#));
 		fi;
-		pickup pencircle scaled neo_Cthickness;
+		pickup pencircle scaled neomensural_Cthickness;
 		if full_circle:
-			draw fullcircle scaled neo_Cdiameter;
+			draw fullcircle scaled neomensural_Cdiameter;
 		elseif reverse_circle:
-			draw threequartercircle rotated 225 scaled neo_Cdiameter;
+			draw threequartercircle rotated 225 scaled neomensural_Cdiameter;
 		else:
-			draw threequartercircle rotated 45 scaled neo_Cdiameter;
+			draw threequartercircle rotated 45 scaled neomensural_Cdiameter;
 		fi;
 		if dotted:
 			pickup pencircle scaled 4 linethickness;
 			draw (0,0);
 		fi;
-		currentpicture := currentpicture shifted 0.5(neo_Cdiameter + neo_Cthickness, 0);
+		currentpicture := currentpicture shifted 0.5(neomensural_Cdiameter + neomensural_Cthickness, 0);
 	fet_endchar;
 enddef;
 
 %% tempus imperfectum cum prolatione imperfecta
-neo_mens_timesig ("Mensural 4/4 meter", "neomensural4/4", "neomensuralfourfourmeter",
+neomensural_timesig ("Mensural 4/4 meter", "neomensural4/4", "neomensuralfourfourmeter",
 			false, false, false, false);
 
 %% tempus imperfectum cum prolatione imperfecta proportio dupla
-neo_mens_timesig ("Mensural 2/2 meter", "neomensural2/2", "neomensuralallabreve",
+neomensural_timesig ("Mensural 2/2 meter", "neomensural2/2", "neomensuralallabreve",
 			false, false, true, false);
 
 %% tempus perfectum cum prolatione imperfecta
-neo_mens_timesig ("Mensural 3/2 meter", "neomensural3/2", "neomensuralthreetwometer",
+neomensural_timesig ("Mensural 3/2 meter", "neomensural3/2", "neomensuralthreetwometer",
 			true, false, false, false);
 
 %% tempus imperfectum cum prolatione perfecta
-neo_mens_timesig ("Mensural 6/4 meter", "neomensural6/4", "neomensuralsixfourmeter",
+neomensural_timesig ("Mensural 6/4 meter", "neomensural6/4", "neomensuralsixfourmeter",
 			false, false, false, true);
 
 %% tempus perfectum cum prolatione perfecta
-neo_mens_timesig ("Mensural 9/4 meter", "neomensural9/4", "neomensuralninefourmeter",
+neomensural_timesig ("Mensural 9/4 meter", "neomensural9/4", "neomensuralninefourmeter",
 			true, false, false, true);
 
 %% tempus perfectum cum prolatione imperfecta proportio dupla
-neo_mens_timesig ("Mensural 3/4 meter", "neomensural3/4", "neomensuralthreefourmeter",
+neomensural_timesig ("Mensural 3/4 meter", "neomensural3/4", "neomensuralthreefourmeter",
 			true, false, true, false);
 
 %% tempus imperfectum cum prolatione perfecta proportio dupla
-neo_mens_timesig ("Mensural 6/8 meter", "neomensural6/8", "neomensuralsixeightmeter",
+neomensural_timesig ("Mensural 6/8 meter", "neomensural6/8", "neomensuralsixeightmeter",
 			false, false, true, true);
 
 %% tempus perfectum cum prolatione perfecta proportio dupla
-neo_mens_timesig ("Mensural 9/8 meter", "neomensural9/8", "neomensuralnineeight",
+neomensural_timesig ("Mensural 9/8 meter", "neomensural9/8", "neomensuralnineeight",
 			true, false, true, true);
 	
 %% tempus imperfectum cum prolatione imperfecta diminutio simplex
-neo_mens_timesig ("Mensural 4/8 meter", "neomensural4/8", "neomensuralfoureightmeter",
+neomensural_timesig ("Mensural 4/8 meter", "neomensural4/8", "neomensuralfoureightmeter",
 			false, true, false, false);
 
 %% tempus imperfectum cum prolatione perfecta diminutio simplex
-neo_mens_timesig ("Mensural 6/8 meter", "neomensural6/8alt", "neomensuralsixeightmeteralt",
+neomensural_timesig ("Mensural 6/8 meter", "neomensural6/8alt", "neomensuralsixeightmeteralt",
 			false, true, false, true);
 
 %% tempus imperfectum cum prolatione imperfecta diminutio duplex
-neo_mens_timesig ("Mensural 2/4 meter", "neomensural2/4", "neomensuraltwofourmeter",
+neomensural_timesig ("Mensural 2/4 meter", "neomensural2/4", "neomensuraltwofourmeter",
 			false, true, true, false);
 
 fet_endgroup ("timesig")
diff --git a/scm/clef.scm b/scm/clef.scm
index b7171de8d5..2b27e5ae38 100644
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -29,39 +29,39 @@
     ("tab" . ("clefs-tab" 0 0))
 
     ;; should move mensural stuff to separate file? 
-    ("vaticana_do1" . ("clefs-vaticana_do" -1 0))
-    ("vaticana_do2" . ("clefs-vaticana_do" 1 0))
-    ("vaticana_do3" . ("clefs-vaticana_do" 3 0))
-    ("vaticana_fa1" . ("clefs-vaticana_fa" -1 0))
-    ("vaticana_fa2" . ("clefs-vaticana_fa" 1 0))
-    ("medicaea_do1" . ("clefs-medicaea_do" -1 0))
-    ("medicaea_do2" . ("clefs-medicaea_do" 1 0))
-    ("medicaea_do3" . ("clefs-medicaea_do" 3 0))
-    ("medicaea_fa1" . ("clefs-medicaea_fa" -1 0))
-    ("medicaea_fa2" . ("clefs-medicaea_fa" 1 0))
-    ("hufnagel_do1" . ("clefs-hufnagel_do" -1 0))
-    ("hufnagel_do2" . ("clefs-hufnagel_do" 1 0))
-    ("hufnagel_do3" . ("clefs-hufnagel_do" 3 0))
-    ("hufnagel_fa1" . ("clefs-hufnagel_fa" -1 0))
-    ("hufnagel_fa2" . ("clefs-hufnagel_fa" 1 0))
-    ("hufnagel_do_fa" . ("clefs-hufnagel_do_fa" 4 0))
-    ("mensural_c1" . ("clefs-mensural_c" -2 0))
-    ("mensural_c2" . ("clefs-mensural_c" 0 0))
-    ("mensural_c3" . ("clefs-mensural_c" 2 0))
-    ("mensural_c4" . ("clefs-mensural_c" 4 0))
-    ("mensural_f" . ("clefs-mensural_f" 2 0))
-    ("mensural_g" . ("clefs-mensural_g" -2 0))
-    ("neo_mensural_c1" . ("clefs-neo_mensural_c" -4 0))
-    ("neo_mensural_c2" . ("clefs-neo_mensural_c" -2 0))
-    ("neo_mensural_c3" . ("clefs-neo_mensural_c" 0 0))
-    ("neo_mensural_c4" . ("clefs-neo_mensural_c" 2 0))
-    ("petrucci_c1" . ("clefs-petrucci_c1" -4 0))
-    ("petrucci_c2" . ("clefs-petrucci_c2" -2 0))
-    ("petrucci_c3" . ("clefs-petrucci_c3" 0 0))
-    ("petrucci_c4" . ("clefs-petrucci_c4" 2 0))
-    ("petrucci_c5" . ("clefs-petrucci_c5" 4 0))
-    ("petrucci_f" . ("clefs-petrucci_f" 2 0))
-    ("petrucci_g" . ("clefs-petrucci_g" -2 0))))
+    ("vaticana-do1" . ("clefs-vaticana-do" -1 0))
+    ("vaticana-do2" . ("clefs-vaticana-do" 1 0))
+    ("vaticana-do3" . ("clefs-vaticana-do" 3 0))
+    ("vaticana-fa1" . ("clefs-vaticana-fa" -1 0))
+    ("vaticana-fa2" . ("clefs-vaticana-fa" 1 0))
+    ("medicaea-do1" . ("clefs-medicaea-do" -1 0))
+    ("medicaea-do2" . ("clefs-medicaea-do" 1 0))
+    ("medicaea-do3" . ("clefs-medicaea-do" 3 0))
+    ("medicaea-fa1" . ("clefs-medicaea-fa" -1 0))
+    ("medicaea-fa2" . ("clefs-medicaea-fa" 1 0))
+    ("hufnagel-do1" . ("clefs-hufnagel-do" -1 0))
+    ("hufnagel-do2" . ("clefs-hufnagel-do" 1 0))
+    ("hufnagel-do3" . ("clefs-hufnagel-do" 3 0))
+    ("hufnagel-fa1" . ("clefs-hufnagel-fa" -1 0))
+    ("hufnagel-fa2" . ("clefs-hufnagel-fa" 1 0))
+    ("hufnagel-do-fa" . ("clefs-hufnagel-do-fa" 4 0))
+    ("mensural-c1" . ("clefs-mensural-c" -2 0))
+    ("mensural-c2" . ("clefs-mensural-c" 0 0))
+    ("mensural-c3" . ("clefs-mensural-c" 2 0))
+    ("mensural-c4" . ("clefs-mensural-c" 4 0))
+    ("mensural-f" . ("clefs-mensural-f" 2 0))
+    ("mensural-g" . ("clefs-mensural-g" -2 0))
+    ("neomensural-c1" . ("clefs-neomensural-c" -4 0))
+    ("neomensural-c2" . ("clefs-neomensural-c" -2 0))
+    ("neomensural-c3" . ("clefs-neomensural-c" 0 0))
+    ("neomensural-c4" . ("clefs-neomensural-c" 2 0))
+    ("petrucci-c1" . ("clefs-petrucci-c1" -4 0))
+    ("petrucci-c2" . ("clefs-petrucci-c2" -2 0))
+    ("petrucci-c3" . ("clefs-petrucci-c3" 0 0))
+    ("petrucci-c4" . ("clefs-petrucci-c4" 2 0))
+    ("petrucci-c5" . ("clefs-petrucci-c5" 4 0))
+    ("petrucci-f" . ("clefs-petrucci-f" 2 0))
+    ("petrucci-g" . ("clefs-petrucci-g" -2 0))))
 
 ;; "an alist mapping GLYPHNAME to the position of the middle C for
 ;; that symbol"
@@ -71,24 +71,24 @@
     ("clefs-F" . 4)
     ("clefs-percussion" . 0)
     ("clefs-tab" . 0 )
-    ("clefs-vaticana_do" . 0)
-    ("clefs-vaticana_fa" . 4)
-    ("clefs-medicaea_do" . 0)
-    ("clefs-medicaea_fa" . 4)
-    ("clefs-hufnagel_do" . 0)
-    ("clefs-hufnagel_fa" . 4)
-    ("clefs-hufnagel_do_fa" . 0)
-    ("clefs-mensural_c" . 0)
-    ("clefs-mensural_f" . 4)
-    ("clefs-mensural_g" . -4)
-    ("clefs-neo_mensural_c" . 0)
-    ("clefs-petrucci_c1" . 0)
-    ("clefs-petrucci_c2" . 0)
-    ("clefs-petrucci_c3" . 0)
-    ("clefs-petrucci_c4" . 0)
-    ("clefs-petrucci_c5" . 0)
-    ("clefs-petrucci_f" . 4)
-    ("clefs-petrucci_g" . -4)))
+    ("clefs-vaticana-do" . 0)
+    ("clefs-vaticana-fa" . 4)
+    ("clefs-medicaea-do" . 0)
+    ("clefs-medicaea-fa" . 4)
+    ("clefs-hufnagel-do" . 0)
+    ("clefs-hufnagel-fa" . 4)
+    ("clefs-hufnagel-do-fa" . 0)
+    ("clefs-mensural-c" . 0)
+    ("clefs-mensural-f" . 4)
+    ("clefs-mensural-g" . -4)
+    ("clefs-neomensural-c" . 0)
+    ("clefs-petrucci-c1" . 0)
+    ("clefs-petrucci-c2" . 0)
+    ("clefs-petrucci-c3" . 0)
+    ("clefs-petrucci-c4" . 0)
+    ("clefs-petrucci-c5" . 0)
+    ("clefs-petrucci-f" . 4)
+    ("clefs-petrucci-g" . -4)))
 
 (define-public (make-clef-set clef-name)
   "Generate the clef setting commands for a clef with name CL."
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index ee90e06bd3..48bca468d9 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -150,11 +150,11 @@
     ;; brevis, longa and maxima from the neo-mensural font and all
     ;; other note heads from the default font.  -- jr
     (if (< duration 0)
-	(string-append (number->string duration) "neo_mensural")
+	(string-append (number->string duration) "neomensural")
 	(number->string duration)))
    ((mensural)
     (string-append (number->string duration) (symbol->string style)))
-   ((neo_mensural)
+   ((neomensural)
     (string-append (number->string duration) (symbol->string style)))
    ((default)
     ;; The default font in mf/feta-bolletjes.mf defines a brevis, but
@@ -164,7 +164,7 @@
     ;; should look exactly like the brevis of the default font, but
     ;; with a stem exactly like that of the quarter note. -- jr
     (if (< duration -1)
-	(string-append (number->string duration) "neo_mensural")
+	(string-append (number->string duration) "neomensural")
 	(number->string duration)))
    (else
     (if (string-match "vaticana*|hufnagel*|medicaea*" (symbol->string style))