rename feta-generic to feta-other-generic; similarly parmesan-generic

these files are not for the whole font,
but just some glyphs that aren't in their own subfonts

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
deleted file mode 100644 (file)
index 6012e2a..0000000
--- a/mf/feta-generic.mf
+++ /dev/null
@@ -1,54 +0,0 @@
-% Feta (not the Font-En-Tja) music font --  generic stuff: include lots of files, but don't
-% This file is part of LilyPond, the GNU music typesetter.
-%
-% Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
-%
-% The LilyPond font is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version, or under the SIL Open Font License.
-%
-% LilyPond is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
-
-
-staffsize# := design_size * pt#;
-
-mode_setup;
-
-input feta-macros;
-
-input feta-params;
-
-font_x_height staff_space#;
-
-fet_beginfont ("feta", design_size, "fetaMusic");
-
-if test = 0:
-       input feta-rests;
-       input feta-accidentals;
-       input feta-arrowheads;
-       input feta-dots;
-       input feta-scripts;
-       input feta-clefs;
-       input feta-timesignatures;
-       input feta-pedals;
-       input feta-brackettips;
-       input feta-accordion;
-       input feta-ties;
-fi
-
-autometric_parameter ("staffsize", staffsize#);
-autometric_parameter ("stafflinethickness", stafflinethickness#);
-autometric_parameter ("staff_space", staff_space#);
-autometric_parameter ("linethickness", linethickness#);
-autometric_parameter ("black_notehead_width", black_notehead_width#);
-autometric_parameter ("ledgerlinethickness", ledgerlinethickness#);
-autometric_parameter ("blot_diameter", blot_diameter#);
-
-fet_endfont;

diff --git a/mf/feta-other-generic.mf b/mf/feta-other-generic.mf
new file mode 100644 (file)
index 0000000..6012e2a
--- /dev/null
+++ b/mf/feta-other-generic.mf
@@ -0,0 +1,54 @@
+% Feta (not the Font-En-Tja) music font --  generic stuff: include lots of files, but don't
+% This file is part of LilyPond, the GNU music typesetter.
+%
+% Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%
+% The LilyPond font is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version, or under the SIL Open Font License.
+%
+% LilyPond is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+
+
+staffsize# := design_size * pt#;
+
+mode_setup;
+
+input feta-macros;
+
+input feta-params;
+
+font_x_height staff_space#;
+
+fet_beginfont ("feta", design_size, "fetaMusic");
+
+if test = 0:
+       input feta-rests;
+       input feta-accidentals;
+       input feta-arrowheads;
+       input feta-dots;
+       input feta-scripts;
+       input feta-clefs;
+       input feta-timesignatures;
+       input feta-pedals;
+       input feta-brackettips;
+       input feta-accordion;
+       input feta-ties;
+fi
+
+autometric_parameter ("staffsize", staffsize#);
+autometric_parameter ("stafflinethickness", stafflinethickness#);
+autometric_parameter ("staff_space", staff_space#);
+autometric_parameter ("linethickness", linethickness#);
+autometric_parameter ("black_notehead_width", black_notehead_width#);
+autometric_parameter ("ledgerlinethickness", ledgerlinethickness#);
+autometric_parameter ("blot_diameter", blot_diameter#);
+
+fet_endfont;

diff --git a/mf/feta11.mf b/mf/feta11.mf
index 6eca785eddbbdbc372128fbea0a1692402242b0e..c9238948e7ddb49834e2d50de04569374aec59e6 100644 (file)
--- a/mf/feta11.mf
+++ b/mf/feta11.mf
@@ -5,7 +5,7 @@ input feta-autometric;
 
 design_size := 11.22;
 
-input feta-generic;
+input feta-other-generic;
 
 end.
 

diff --git a/mf/feta13.mf b/mf/feta13.mf
index 2fbe96b467fb4c490145b99b2c8a4f0d283b8e0a..4efb04b496882b6a1e57afe827eb63ea6bfb5a05 100644 (file)
--- a/mf/feta13.mf
+++ b/mf/feta13.mf
@@ -5,7 +5,7 @@ input feta-autometric;
 
 design_size := 12.60;
 
-input feta-generic;
+input feta-other-generic;
 
 end.
 

diff --git a/mf/feta14.mf b/mf/feta14.mf
index 738606985e8484a04c62ba6053f62e71315a17e9..1f9bc5c679c7977e504f775a23bcb7eeddc2b598 100644 (file)
--- a/mf/feta14.mf
+++ b/mf/feta14.mf
@@ -5,7 +5,7 @@ input feta-autometric;
 
 design_size := 14.14;
 
-input feta-generic;
+input feta-other-generic;
 
 
 end.

diff --git a/mf/feta16.mf b/mf/feta16.mf
index 6b0619345728b773e6975150e8f9d275fd3873d5..e882ad6015edf4cd16a19c5b63984f079d2d9b36 100644 (file)
--- a/mf/feta16.mf
+++ b/mf/feta16.mf
@@ -5,7 +5,7 @@ input feta-autometric;
 
 design_size := 15.87;
 
-input feta-generic;
+input feta-other-generic;
 
 end.
 

diff --git a/mf/feta18.mf b/mf/feta18.mf
index 6b6dd49524e0639c5ca25b58355f2a98dbc3911a..247994adc6ffb131f62665a92082482806e393d7 100644 (file)
--- a/mf/feta18.mf
+++ b/mf/feta18.mf
@@ -6,7 +6,7 @@ input feta-autometric;
 % todo change file name
 design_size := 17.82;
 
-input feta-generic;
+input feta-other-generic;
 
 
 end.

diff --git a/mf/feta20.mf b/mf/feta20.mf
index 46c923fa564319f9b3474f1f61f2dd99eb3a8d8b..2eec430ddb6e382fb64011d05f3a32448bd3e327 100644 (file)
--- a/mf/feta20.mf
+++ b/mf/feta20.mf
@@ -7,7 +7,7 @@ input feta-autometric;
 
 
 % use feta-test for debugging.
-input feta-generic;
+input feta-other-generic;
 
 
 end.

diff --git a/mf/feta23.mf b/mf/feta23.mf
index 93b867976110d3d8e3c7926fbe81fa2f719bb359..53221760677030371369fd100fbaabbbd1781e02 100644 (file)
--- a/mf/feta23.mf
+++ b/mf/feta23.mf
@@ -6,7 +6,7 @@ input feta-autometric;
 % todo change file name
 design_size := 22.45;
 
-input feta-generic;
+input feta-other-generic;
 
 
 end.

diff --git a/mf/feta26.mf b/mf/feta26.mf
index 2877d7431d569a77ed127701edaffaf43b65c1f3..f3379b2b58605909c30b24260f234ad0a206ccff 100644 (file)
--- a/mf/feta26.mf
+++ b/mf/feta26.mf
@@ -5,7 +5,7 @@ input feta-autometric;
 
 design_size := 25.20;
 
-input feta-generic;
+input feta-other-generic;
 
 
 end.

diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf
deleted file mode 100644 (file)
index c3e6f85..0000000
--- a/mf/parmesan-generic.mf
+++ /dev/null
@@ -1,46 +0,0 @@
-% Feta (not the Font-En-Tja) music font --  generic stuff: include lots of files,
-% This file is part of LilyPond, the GNU music typesetter.
-%
-% Copyright (C) 2002--2012 Juergen Reuter <reuter@ipd.uka.de>
-%
-% The LilyPond font is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version, or under the SIL Open Font License.
-%
-% LilyPond is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
-
-
-mode_setup;
-
-staffsize# := design_size * pt#;
-
-input feta-macros;
-input feta-params;
-
-input parmesan-macros;
-
-
-font_x_height staff_space#;
-
-
-fet_beginfont ("parmesan", design_size, "parmesanMusic");
-       if test = 0:
-               input parmesan-rests;
-               input parmesan-clefs;
-               input parmesan-custodes
-               input parmesan-accidentals;
-               input parmesan-flags;
-               input parmesan-timesignatures;
-               input parmesan-scripts;
-               input parmesan-dots;
-       else:
-
-       fi;
-fet_endfont;

diff --git a/mf/parmesan-other-generic.mf b/mf/parmesan-other-generic.mf
new file mode 100644 (file)
index 0000000..c3e6f85
--- /dev/null
+++ b/mf/parmesan-other-generic.mf
@@ -0,0 +1,46 @@
+% Feta (not the Font-En-Tja) music font --  generic stuff: include lots of files,
+% This file is part of LilyPond, the GNU music typesetter.
+%
+% Copyright (C) 2002--2012 Juergen Reuter <reuter@ipd.uka.de>
+%
+% The LilyPond font is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version, or under the SIL Open Font License.
+%
+% LilyPond is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+
+
+mode_setup;
+
+staffsize# := design_size * pt#;
+
+input feta-macros;
+input feta-params;
+
+input parmesan-macros;
+
+
+font_x_height staff_space#;
+
+
+fet_beginfont ("parmesan", design_size, "parmesanMusic");
+       if test = 0:
+               input parmesan-rests;
+               input parmesan-clefs;
+               input parmesan-custodes
+               input parmesan-accidentals;
+               input parmesan-flags;
+               input parmesan-timesignatures;
+               input parmesan-scripts;
+               input parmesan-dots;
+       else:
+
+       fi;
+fet_endfont;

diff --git a/mf/parmesan11.mf b/mf/parmesan11.mf
index c0f37e194512dfbb541671c6b59afeed21ef6865..f6c15781be80ccfc90c42eff74c6b0ba67c4eb3b 100644 (file)
--- a/mf/parmesan11.mf
+++ b/mf/parmesan11.mf
@@ -5,7 +5,7 @@ design_size := 11.22;
 
 input feta-autometric;
 
-input parmesan-generic;
+input parmesan-other-generic;
 
 end.
 

diff --git a/mf/parmesan13.mf b/mf/parmesan13.mf
index 5ca92f334a9fc1948a1b45de22be739b490ae7d3..288330694eeba9f928e34b72506483eb11d8d633 100644 (file)
--- a/mf/parmesan13.mf
+++ b/mf/parmesan13.mf
@@ -5,7 +5,7 @@ design_size := 12.60;
 
 input feta-autometric;
 
-input parmesan-generic;
+input parmesan-other-generic;
 
 
 end.

diff --git a/mf/parmesan14.mf b/mf/parmesan14.mf
index 22e3c276619d7cc466f5f56836ca6242141ab61c..2586d7962e4f3068ecf1881575e80f3cf27cf86a 100644 (file)
--- a/mf/parmesan14.mf
+++ b/mf/parmesan14.mf
@@ -5,8 +5,7 @@ design_size := 14.14;
 
 input feta-autometric;
 
-input parmesan-generic;
-
+input parmesan-other-generic;
 
 end.
 

diff --git a/mf/parmesan16.mf b/mf/parmesan16.mf
index 75573a6707a6b8fa2c7bbf6dc400d0625f3949b0..354657643f271eab70ccc305582539d1ba006d48 100644 (file)
--- a/mf/parmesan16.mf
+++ b/mf/parmesan16.mf
@@ -5,7 +5,7 @@ design_size := 15.87;
 
 input feta-autometric;
 
-input parmesan-generic;
+input parmesan-other-generic;
 
 
 end.

diff --git a/mf/parmesan18.mf b/mf/parmesan18.mf
index 76a6718d50d03fb435f4e02a65dc7a8e4a919472..0360c88104fe1ae28b1f65b4f43adc392a0825e8 100644 (file)
--- a/mf/parmesan18.mf
+++ b/mf/parmesan18.mf
@@ -5,7 +5,7 @@ design_size := 17.82;
 
 input feta-autometric;
 
-input parmesan-generic;
+input parmesan-other-generic;
 
 
 end.

diff --git a/mf/parmesan20.mf b/mf/parmesan20.mf
index d7229287466e519ff873d27e1976f6a0cdb44ebb..6d6b8c5cf77a9a72bd7a798fb4d841e515a6554c 100644 (file)
--- a/mf/parmesan20.mf
+++ b/mf/parmesan20.mf
@@ -5,7 +5,7 @@ design_size := 20;
 
 input feta-autometric;
 
-input parmesan-generic;
+input parmesan-other-generic;
 
 
 end.

diff --git a/mf/parmesan23.mf b/mf/parmesan23.mf
index ac0b0179513af62f59962905f21dad60bb1124fc..b56d593819d82caa553baada80d9b9ba5089fda5 100644 (file)
--- a/mf/parmesan23.mf
+++ b/mf/parmesan23.mf
@@ -5,7 +5,7 @@ design_size := 22.45;
 
 input feta-autometric;
 
-input parmesan-generic;
+input parmesan-other-generic;
 
 
 end.

diff --git a/mf/parmesan26.mf b/mf/parmesan26.mf
index c2cf1946be03e4272e2f5e3963f8d97adef448e2..0e1fce27e42ee0104b2b2bdf83c494bbff56808e 100644 (file)
--- a/mf/parmesan26.mf
+++ b/mf/parmesan26.mf
@@ -5,7 +5,7 @@ design_size := 25.20;
 
 input feta-autometric;
 
-input parmesan-generic;
+input parmesan-other-generic;
 
 
 end.