From: Jürgen Reuter <j@web.de>
Date: Tue, 8 Apr 2003 00:17:16 +0000 (+0000)
Subject: * Documentation/user/refman.itely: Section Custodes: added more
X-Git-Tag: release/1.7.16~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e533204c796e3c6be8634d527e8f80b186a04ac5;p=lilypond.git
* Documentation/user/refman.itely: Section Custodes: added more
example code
* mf/feta-eindelijk.mf, mf/parmesan-rests.mf: cleanup: moved
neo-mensural rests to parmesan font
* mf/parmesan-heads.mf, mf/parmesan-timesig.mf: updated file header
---
diff --git a/ChangeLog b/ChangeLog
index 82ec499dc9..9b63db0f2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-08 Juergen Reuter <reuter@ipd.uka.de>
+
+ * Documentation/user/refman.itely: Section Custodes: added more
+ example code
+
+ * mf/feta-eindelijk.mf, mf/parmesan-rests.mf: cleanup: moved
+ neo-mensural rests to parmesan font
+
+ * mf/parmesan-heads.mf, mf/parmesan-timesig.mf: updated file
+ header
+
2003-04-07 Han-Wen Nienhuys <hanwen@cs.uu.nl>
* Documentation/user/macros.itexi: @fileref macro.
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 735060e0ae..e7a814dd0f 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -4427,6 +4427,19 @@ will point downwards. If set to @code{1}, the appendage will point
upwards. Other values such as @code{0} are reserved for future
extensions and should not be used.
+Example:
+
+@example
+\notes @{
+ \property Staff.Custos \set #'neutral-position = #4
+ \property Staff.Custos \set #'neutral-direction = #-1
+ \property Staff.Custos \set #'adjust-if-on-staffline = ##t
+
+ ...
+
+@}
+@end example
+
@node Divisiones
@subsection Divisiones
diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index 4da3607f7f..0d9b34d44e 100644
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -466,114 +466,4 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest");
endgroup;
-
-%%%%%%%%
-%
-%
-%
-% MENSURAL NOTATION
-%
-%
-%
-
-% Neo-mensural longa and breve are identical with default longa and breve.
-
-neomens_block_rest_x# = 2/5 staff_space#;
-neomens_block_rest_y# = 1/1 staff_space#;
-neomens_half_block_rest_y# = 5/8 staff_space#;
-
-define_pixels(neomens_block_rest_x,
- neomens_block_rest_y, neomens_half_block_rest_y);
-
-def neomens_half_block_rest =
- draw_block ((0,0), (neomens_block_rest_x, neomens_half_block_rest_y));
- enddef;
-
-fet_beginchar("Neo-mensural maxima rest", "-3neo_mensural", "neomensmaximarest");
- set_char_box(0, neomens_block_rest_x#,
- neomens_block_rest_y#, 2 neomens_block_rest_y#);
- draw_block ((0,-neomens_block_rest_y),
- (neomens_block_rest_x, 2 neomens_block_rest_y));
-fet_endchar;
-
-fet_beginchar("Neo-mensural longa rest", "-2neo_mensural", "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");
- 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");
- set_char_box(0, neomens_block_rest_x#,
- neomens_half_block_rest_y#, 0);
- neomens_half_block_rest;
- currentpicture :=
- currentpicture shifted (0,- neomens_half_block_rest_y);
-fet_endchar;
-
-fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest");
- set_char_box(0, neomens_block_rest_x#,
- 0, neomens_half_block_rest_y#);
- neomens_half_block_rest;
-fet_endchar;
-
-neomensrestsize# = 0.8 staff_space#;
-
-fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
- set_char_box(0,neomensrestsize#,0,neomensrestsize#);
- pickup pencircle scaled 2 stafflinethickness;
- lft x1 = 0;
- bot y1 = 0;
- lft x2 = 0;
- top y2 = h;
- rt x3 = w;
- bot y3 = h/2;
- draw z1 .. z2;
- draw z2 .. z3;
-fet_endchar
-
-fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest")
- set_char_box(0,neomensrestsize#,0,neomensrestsize#);
- pickup pencircle scaled 2 stafflinethickness;
- rt x1 = w;
- bot y1 = 0;
- rt x2 = w;
- top y2 = h;
- lft x3 = 0;
- bot y3 = h/2;
- draw z1 .. z2;
- draw z2 .. z3;
-fet_endchar
-
-fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest")
- set_char_box(0,neomensrestsize#,0,staff_space#);
- pickup pencircle scaled 2 stafflinethickness;
- rt x1 = w;
- bot y1 = 0;
- rt x2 = w;
- top y2 = h;
-
- draw z1 .. z2;
-
- pickup pencircle scaled 2 stafflinethickness;
- rt x3 = w;
- top y3 = h;
- lft x4 = 0;
- bot y4 = h/2;
- rt x5 = w;
- top y5 = 5/8h;
- lft x6 = 0;
- bot y6 = h/8;
-
- draw z3 .. z4;
- draw z5 .. z6;
-fet_endchar
-
-
fet_endgroup("rests")
diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf
index 3f15e6428b..d77cab6198 100644
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-heads.mf
@@ -5,6 +5,9 @@
%
% (c) 2001--2002 Juergen Reuter <reuter@ipd.uka.de>
%
+% Neo-mensural heads originally by
+% Christian Mondrup and Mats Bengtsson
+%
save black_notehead_width;
numeric black_notehead_width;
diff --git a/mf/parmesan-rests.mf b/mf/parmesan-rests.mf
index db96bc7fcb..20ee8da7e1 100644
--- a/mf/parmesan-rests.mf
+++ b/mf/parmesan-rests.mf
@@ -3,12 +3,124 @@
%
% source file of LilyPond's pretty-but-neat music font
%
-% (c) 2001--2002 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2001--2003 Juergen Reuter <reuter@ipd.uka.de>
+%
+% Neo-mensural rests originally by
+% Christian Mondrup and Mats Bengtsson
%
fet_begingroup("rests")
+%%%%%%%%
+%
+%
+%
+% NEO-MENSURAL NOTATION
+%
+%
+%
+
+% Neo-mensural longa and breve are identical with default longa and breve.
+
+neomens_block_rest_x# = 2/5 staff_space#;
+neomens_block_rest_y# = 1/1 staff_space#;
+neomens_half_block_rest_y# = 5/8 staff_space#;
+
+define_pixels(neomens_block_rest_x,
+ neomens_block_rest_y, neomens_half_block_rest_y);
+
+def neomens_half_block_rest =
+ draw_block ((0,0), (neomens_block_rest_x, neomens_half_block_rest_y));
+ enddef;
+
+fet_beginchar("Neo-mensural maxima rest", "-3neo_mensural", "neomensmaximarest");
+ set_char_box(0, neomens_block_rest_x#,
+ neomens_block_rest_y#, 2 neomens_block_rest_y#);
+ draw_block ((0,-neomens_block_rest_y),
+ (neomens_block_rest_x, 2 neomens_block_rest_y));
+fet_endchar;
+
+fet_beginchar("Neo-mensural longa rest", "-2neo_mensural", "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");
+ 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");
+ set_char_box(0, neomens_block_rest_x#,
+ neomens_half_block_rest_y#, 0);
+ neomens_half_block_rest;
+ currentpicture :=
+ currentpicture shifted (0,- neomens_half_block_rest_y);
+fet_endchar;
+
+fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest");
+ set_char_box(0, neomens_block_rest_x#,
+ 0, neomens_half_block_rest_y#);
+ neomens_half_block_rest;
+fet_endchar;
+
+neomensrestsize# = 0.8 staff_space#;
+
+fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest")
+ set_char_box(0,neomensrestsize#,0,neomensrestsize#);
+ pickup pencircle scaled 2 stafflinethickness;
+ lft x1 = 0;
+ bot y1 = 0;
+ lft x2 = 0;
+ top y2 = h;
+ rt x3 = w;
+ bot y3 = h/2;
+ draw z1 .. z2;
+ draw z2 .. z3;
+fet_endchar
+
+fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest")
+ set_char_box(0,neomensrestsize#,0,neomensrestsize#);
+ pickup pencircle scaled 2 stafflinethickness;
+ rt x1 = w;
+ bot y1 = 0;
+ rt x2 = w;
+ top y2 = h;
+ lft x3 = 0;
+ bot y3 = h/2;
+ draw z1 .. z2;
+ draw z2 .. z3;
+fet_endchar
+
+fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest")
+ set_char_box(0,neomensrestsize#,0,staff_space#);
+ pickup pencircle scaled 2 stafflinethickness;
+ rt x1 = w;
+ bot y1 = 0;
+ rt x2 = w;
+ top y2 = h;
+
+ draw z1 .. z2;
+
+ pickup pencircle scaled 2 stafflinethickness;
+ rt x3 = w;
+ top y3 = h;
+ lft x4 = 0;
+ bot y4 = h/2;
+ rt x5 = w;
+ top y5 = 5/8h;
+ lft x6 = 0;
+ bot y6 = h/8;
+
+ draw z3 .. z4;
+ draw z5 .. z6;
+fet_endchar
+
+
%%%%%%%%
%
%
diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf
index 2e077f4d2a..67a06f421f 100644
--- a/mf/parmesan-timesig.mf
+++ b/mf/parmesan-timesig.mf
@@ -4,7 +4,9 @@
% source file of LilyPond's pretty-but-neat music font
%
% (c) 1998--2002 Mats Bengtsson <matsb@s3.kth.se>,
-% Christian Mondrup <scancm@biobase.dk>
+% Christian Mondrup <scancm@biobase.dk>,
+% Juergen Reuter <reuter@ipd.uka.de>
+%
fet_begingroup ("timesig")