From: Janek WarchoĊ‚ Date: Fri, 6 Dec 2013 16:45:59 +0000 (+0100) Subject: rename feta-generic to feta-other-generic; similarly parmesan-generic X-Git-Tag: release/2.19.0-1~63 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=47a6f6d4c195e94edf25c451e8419b11c99dd512;p=lilypond.git 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 index 6012e2adee..0000000000 --- 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 -% -% 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 . - - -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 index 0000000000..6012e2adee --- /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 +% +% 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 . + + +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 6eca785edd..c9238948e7 100644 --- 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 2fbe96b467..4efb04b496 100644 --- 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 738606985e..1f9bc5c679 100644 --- 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 6b06193457..e882ad6015 100644 --- 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 6b6dd49524..247994adc6 100644 --- 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 46c923fa56..2eec430ddb 100644 --- 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 93b8679761..5322176067 100644 --- 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 2877d7431d..f3379b2b58 100644 --- 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 index c3e6f85911..0000000000 --- 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 -% -% 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 . - - -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 index 0000000000..c3e6f85911 --- /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 +% +% 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 . + + +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 c0f37e1945..f6c15781be 100644 --- 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 5ca92f334a..288330694e 100644 --- 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 22e3c27661..2586d7962e 100644 --- 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 75573a6707..354657643f 100644 --- 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 76a6718d50..0360c88104 100644 --- 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 d722928746..6d6b8c5cf7 100644 --- 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 ac0b017951..b56d593819 100644 --- 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 c2cf1946be..0e1fce27e4 100644 --- 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.