fixes smaller cautionaries.
2004-07-31 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * mf/parmesan*.mf (threequartercircle): change neo_mensural to
+ neomensural.
+
* input/test/trills.ly: remove.
* input/test/transposition.ly: remove.
-\version "2.3.4"
+\version "2.3.9"
\header{
texidoc="
Note head shapes may be set from several choices.
\pattern
\break
- \override Staff.NoteHead #'style = #'neo_mensural
+ \override Staff.NoteHead #'style = #'neomensural
s1*0^\markup { "neomensural" }
\pattern
-\version "2.3.8"
+\version "2.3.9"
% TODO: split ancient-font into seperate files; possibly in
% different locations.
\header {
\transpose c c {
\set autoBeaming = ##f
- \override NoteHead #'style = #'neo_mensural
- \override Rest #'style = #'neo_mensural
+ \override NoteHead #'style = #'neomensural
+ \override Rest #'style = #'neomensural
\key a \major
% FIXME: lily crashes on some (invalid?) ligatures with:
cis'1 d'\breve gis'\breve e'\breve \[ e'\longa fis'\longa \]
\set Staff.forceClef = ##t
- \clef "neo_mensural_c2"
+ \clef "neomensural_c2"
cis1
\bar "|"
% \break % 2 (16*1)
r\breve
\clef "mensural_f"
- % FIXME: must set Stem flag-style to #'neo_mensural to avoid
+ % 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?)
- \override Stem #'flag-style = #'neo_mensural
- % FIXME: produces warnings about "flag `neo_mensurald4' (or 3) not found".
+ \override Stem #'flag-style = #'neomensural
+ % FIXME: produces warnings about "flag `neomensurald4' (or 3) not found".
r2 r4 r8 r16 r16
\override Stem #'flag-style = #'mensural
\set Staff.forceClef = ##t
-\version "2.3.8"
+\version "2.3.9"
% TODO: move stuff from ancient-font into here? See comment
% for ancient-font.ly
\header {
\score {
{
- \override Staff.TimeSignature #'style = #'neo_mensural
+ \override Staff.TimeSignature #'style = #'neomensural
s1
}
\paper {raggedright = ##t}
-\version "2.3.8"
+\version "2.3.9"
\header {
texidoc = "@cindex Rests
r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
\bar ""
- \override Staff.Rest #'style = #'neo_mensural
- r\maxima^\markup \typewriter { neo_mensural }
+ \override Staff.Rest #'style = #'neomensural
+ r\maxima^\markup \typewriter { neomensural }
r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
\bar ""
-\version "2.3.8"
+\version "2.3.9"
% TODO: This file could be old. Ask about it later. -gp
\header { texidoc = "@cindex Time
\time 9/8
c4. c4. c4.
\break
- \override Staff.TimeSignature #'style = #'neo_mensural
+ \override Staff.TimeSignature #'style = #'neomensural
\time 1/1
c1^"TimeSignature style = \#'neo\_mensural"
\time 2/2
-\version "2.3.4"
+\version "2.3.9"
\header {
texidoc = "Wilhelmus van Nassouwe"
d,4 | g4.\melisma a8\melismaEnd b2 a2 g4 | fis e8 \myBreak
d8 | e4 g g fis |
- \override NoteHead #'style = #'neo_mensural
+ \override NoteHead #'style = #'neomensural
g\breve
case SHARP: return "mensural1";
}
- if (style == "neo_mensural")
+ if (style == "neomensural")
style = ""; // currently same as default
if (style == "default")
style = "";
String actual_style (style.to_str0 ());
- if ((style == "mensural") || (style == "neo_mensural")) {
+ if ((style == "mensural") || (style == "neomensural")) {
/*
FIXME: Currently, ancient font does not provide ledgered rests;
ledgered_b = 0;
/*
- There are no 32th/64th/128th mensural/neo_mensural rests. In
+ There are no 32th/64th/128th mensural/neomensural rests. In
these cases, revert back to default style.
*/
if (balltype > 4)
" 4/4 and 2/2 are typeset as C and struck C, respectively. All\n"
" other time signatures are written with two digits.\n"
"\n"
-" @item @code{neo_mensural}\n"
+" @item @code{neomensural}\n"
" 2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are\n"
" typeset with neo-mensural style mensuration marks. All other time\n"
" signatures are written with two digits.\n"
enddef;
-fet_beginchar("neo-mensural c clef", "neo_mensural_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);
fet_endchar;
-fet_beginchar("neo-mensural c clef", "neo_mensural_c_change", "cneomenscclef")
+fet_beginchar("neo-mensural c clef", "neomensural_c_change", "cneomenscclef")
draw_neo_mensural_c_clef((0,0), .8);
fet_endchar;
draw z6 .. z7;
enddef;
-fet_beginchar("Left stemmed notehead", "lneo_mensural", "mensuralleftstemmedhead");
+fet_beginchar("Left stemmed notehead", "lneomensural", "mensuralleftstemmedhead");
draw_neo_left_stemmed_head (2 staff_space#);
fet_endchar;
%
% (ze is wel breed)
%
-fet_beginchar("Maxima notehead", "-3neo_mensural", "neomensuralmaximahead");
+fet_beginchar("Maxima notehead", "-3neomensural", "neomensuralmaximahead");
draw_neo_longa (2.6 staff_space#)
fet_endchar;
-fet_beginchar("Longa notehead", "-2neo_mensural", "neomensurallongahead");
+fet_beginchar("Longa notehead", "-2neomensural", "neomensurallongahead");
draw_neo_longa (2 staff_space#)
fet_endchar;
-fet_beginchar("Brevis notehead", "-1neo_mensural", "neomensuralbrevishead")
+fet_beginchar("Brevis notehead", "-1neomensural", "neomensuralbrevishead")
draw_neo_brevis(2 staff_space#);
fet_endchar;
unfill z5 -- z6 -- z7 -- z8 --cycle;
enddef;
-fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralsemibrevishead")
+fet_beginchar("Neo-mensural open head","0neomensural","neomensuralsemibrevishead")
draw_neo_mensural_open_head (staff_space#, noteheight#);
fet_endchar;
fet_endchar;
-fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralminimahead")
+fet_beginchar("Neo-mensural open head","1neomensural","neomensuralminimahead")
draw_neo_mensural_open_head (staff_space#, noteheight#);
fet_endchar;
-fet_beginchar("Neo-mensural black head","2neo_mensural","neomensuralsemiminimahead")
+fet_beginchar("Neo-mensural black head","2neomensural","neomensuralsemiminimahead")
draw_neo_mensural_black_head (staff_space#, noteheight#);
fet_endchar;
draw_block ((0,0), (neomens_block_rest_x, neomens_half_block_rest_y));
enddef;
-fet_beginchar("Neo-mensural maxima rest", "-3neo_mensural", "neomensmaximarest");
+fet_beginchar("Neo-mensural maxima rest", "-3neomensural", "neomensmaximarest");
set_char_box(0, 3 neomens_block_rest_x#,
neomens_block_rest_y#, neomens_block_rest_y#);
draw_block ((0,-neomens_block_rest_y),
addto currentpicture also currentpicture shifted (2 neomens_block_rest_x, 0);
fet_endchar;
-fet_beginchar("Neo-mensural longa rest", "-2neo_mensural", "neomenslongarest");
+fet_beginchar("Neo-mensural longa rest", "-2neomensural", "neomenslongarest");
set_char_box(0, neomens_block_rest_x#,
neomens_block_rest_y#, neomens_block_rest_y#);
draw_block ((0,-neomens_block_rest_y),
(neomens_block_rest_x, neomens_block_rest_y));
fet_endchar;
-fet_beginchar("Neo-mensural breve rest", "-1neo_mensural", "neomensbreverest");
+fet_beginchar("Neo-mensural breve rest", "-1neomensural", "neomensbreverest");
set_char_box(0, neomens_block_rest_x#,
0, neomens_block_rest_y#);
draw_block ((0,0), (neomens_block_rest_x, neomens_block_rest_y));
fet_endchar;
-fet_beginchar("Neo-mensural whole rest", "0neo_mensural", "neomenssemibrevisrest");
+fet_beginchar("Neo-mensural whole rest", "0neomensural", "neomenssemibrevisrest");
set_char_box(0, neomens_block_rest_x#,
neomens_half_block_rest_y#, 0);
neomens_half_block_rest;
currentpicture shifted (0,- neomens_half_block_rest_y);
fet_endchar;
-fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest");
+fet_beginchar("Neo-mensural half rest", "1neomensural", "neomensminimahalfrest");
set_char_box(0, neomens_block_rest_x#,
0, neomens_half_block_rest_y#);
neomens_half_block_rest;
neomensrestsize# = 0.8 staff_space#;
-fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
+fet_beginchar("Neo-mensural 4th rest","2neomensural","neomenssemiminimarest")
set_char_box(0,neomensrestsize#,0,neomensrestsize#);
pickup pencircle scaled 2 stafflinethickness;
lft x1 = 0;
draw z2 .. z3;
fet_endchar
-fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest")
+fet_beginchar("Neo-mensural 8th rest","3neomensural","neomensfusarest")
set_char_box(0,neomensrestsize#,0,neomensrestsize#);
pickup pencircle scaled 2 stafflinethickness;
rt x1 = w;
draw z2 .. z3;
fet_endchar
-fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest")
+fet_beginchar("Neo-mensural 16th rest","4neomensural","neomenssemifusarest")
set_char_box(0,neomensrestsize#,0,staff_space#);
pickup pencircle scaled 2 stafflinethickness;
rt x1 = w;
enddef;
%% tempus imperfectum cum prolatione imperfecta
-neo_mens_timesig ("Mensural 4/4 meter", "neo_mensural4/4", "neomensuralfourfourmeter",
+neo_mens_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", "neo_mensural2/2", "neomensuralallabreve",
+neo_mens_timesig ("Mensural 2/2 meter", "neomensural2/2", "neomensuralallabreve",
false, false, true, false);
%% tempus perfectum cum prolatione imperfecta
-neo_mens_timesig ("Mensural 3/2 meter", "neo_mensural3/2", "neomensuralthreetwometer",
+neo_mens_timesig ("Mensural 3/2 meter", "neomensural3/2", "neomensuralthreetwometer",
true, false, false, false);
%% tempus imperfectum cum prolatione perfecta
-neo_mens_timesig ("Mensural 6/4 meter", "neo_mensural6/4", "neomensuralsixfourmeter",
+neo_mens_timesig ("Mensural 6/4 meter", "neomensural6/4", "neomensuralsixfourmeter",
false, false, false, true);
%% tempus perfectum cum prolatione perfecta
-neo_mens_timesig ("Mensural 9/4 meter", "neo_mensural9/4", "neomensuralninefourmeter",
+neo_mens_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", "neo_mensural3/4", "neomensuralthreefourmeter",
+neo_mens_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", "neo_mensural6/8", "neomensuralsixeightmeter",
+neo_mens_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", "neo_mensural9/8", "neomensuralnineeight",
+neo_mens_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", "neo_mensural4/8", "neomensuralfoureightmeter",
+neo_mens_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", "neo_mensural6/8alt", "neomensuralsixeightmeteralt",
+neo_mens_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", "neo_mensural2/4", "neomensuraltwofourmeter",
+neo_mens_timesig ("Mensural 2/4 meter", "neomensural2/4", "neomensuraltwofourmeter",
false, true, true, false);
fet_endgroup ("timesig")
conversions.append (((2, 3, 8), conv,
'''remove \\consistsend, strip \\lyrics from \\lyricsto.'''))
+def conv (str):
+ str = re.sub (r'neo_mensural', 'neomensural', str)
+ return str
+
+conversions.append (((2, 3, 9), conv,
+ '''neo_mensural -> neomensural'''))
+
def conv_mode_experiment (str):
str = re.sub (r'\\chords\b', r'\\chordmode', str)