-
+pl 28.jcn1
+ - bit nicer + renamed feta-din10
pl 28
- revised Staff_symbol::brew_molecule_p ()
TOPLEVEL_MAJOR_VERSION = 0
TOPLEVEL_MINOR_VERSION = 1
TOPLEVEL_PATCH_LEVEL = 28
-TOPLEVEL_MY_PATCH_LEVEL =
+TOPLEVEL_MY_PATCH_LEVEL = jcn1
# use the above to send patches, always empty for released version:
# please don't move these comments up; the patch should fail if
% generated automatically by mf-to-table.py version 0.4
-% on Wed Oct 29 16:41:31 1997
+% on Fri Oct 31 08:26:30 1997
% Do not edit
% input from out/feta16.log
% name=\symboltables {
"1" "\\halfball" -0.00\pt 5.51\pt -2.20\pt 2.20\pt
"1l" "\\halfledger" -1.38\pt 6.89\pt -0.40\pt 0.40\pt
"2" "\\quartball" -0.00\pt 5.28\pt -2.20\pt 2.20\pt
- "2l" "\\quartledger" 0.\pt 0.\pt -0.40\pt 0.40\pt
+ "2l" "\\quartledger" -1.32\pt 6.61\pt -0.40\pt 0.40\pt
}
"scripts" = \table {
"ufermata" "\\ufermata" -5.30\pt 5.30\pt -0.30\pt 5.80\pt
% generated automatically by mf-to-table.py version 0.4
-% on Wed Oct 29 16:41:35 1997
+% on Fri Oct 31 08:26:34 1997
% Do not edit
% input from out/feta20.log
% name=\symboltables {
% A tex file to help view dynamic letters
%
-\font\dynfont=dyn10 scaled \magstep2
+\font\dynfont=feta-din10 scaled \magstep2
\def\thefont{\dynfont}
\def\mb#1{{\thefont\char#1}}
-% dyn10.mf
-% from cmbxti10.mf
-%
-% music dynamics font
-%
-% 16pt staff: \font\dynfont=dyn10 scaled \magstep1
-% 20pt staff: \font\dynfont=dyn10 scaled \magstep2
-
-% Computer Modern Bold Extended Text Italic 10 point
-% if unknown cmbase: input cmbase fi
-
-% font_identifier:="CMBXTI"; font_size 10pt#;
-
-input cmbase;
-font_identifier:="DYN"; font_size 10pt#;
-
-u#:=21.2/36pt#; % unit width
-width_adj#:=11/36pt#; % width adjustment for certain characters
-serif_fit#:=0pt#; % extra sidebar near lowercase serifs
-cap_serif_fit#:=7/36pt#; % extra sidebar near uppercase serifs
-letter_fit#:=11/36pt#; % extra space added to all sidebars
-
-body_height#:=270/36pt#; % height of tallest characters
-asc_height#:=250/36pt#; % height of lowercase ascenders
-cap_height#:=247/36pt#; % height of caps
-fig_height#:=232/36pt#; % height of numerals
-x_height#:=160/36pt#; % height of lowercase without ascenders
-math_axis#:=90/36pt#; % axis of symmetry for math symbols
-bar_height#:=85/36pt#; % height of crossbar in lowercase e
-comma_depth#:=70/36pt#; % depth of comma below baseline
-desc_depth#:=70/36pt#; % depth of lowercase descenders
-
-crisp#:=13/36pt#; % diameter of serif corners
-tiny#:=13/36pt#; % diameter of rounded corners
-fine#:=10/36pt#; % diameter of sharply rounded corners
-thin_join#:=10/36pt#; % width of extrafine details
-hair#:=20/36pt#; % lowercase hairline breadth
-stem#:=38/36pt#; % lowercase stem breadth
-curve#:=43/36pt#; % lowercase curve breadth
-ess#:=35/36pt#; % breadth in middle of lowercase s
-flare#:=42/36pt#; % diameter of bulbs or breadth of terminals
-dot_size#:=53/36pt#; % diameter of dots
-cap_hair#:=22/36pt#; % uppercase hairline breadth
-cap_stem#:=49/36pt#; % uppercase stem breadth
-cap_curve#:=52/36pt#; % uppercase curve breadth
-cap_ess#:=50/36pt#; % breadth in middle of uppercase s
-rule_thickness#:=.6pt#; % thickness of lines in math symbols
-
-dish#:=1/36pt#; % amount erased at top or bottom of serifs
-bracket#:=10/36pt#; % vertical distance from serif base to tangent
-jut#:=27/36pt#; % protrusion of lowercase serifs
-cap_jut#:=39/36pt#; % protrusion of uppercase serifs
-beak_jut#:=10/36pt#; % horizontal protrusion of beak serifs
-beak#:=70/36pt#; % vertical protrusion of beak serifs
-vair#:=13/36pt#; % vertical diameter of hairlines
-notch_cut#:=10pt#; % maximum breadth above or below notches
-bar#:=17/36pt#; % lowercase bar thickness
-slab#:=17/36pt#; % serif and arm thickness
-cap_bar#:=17/36pt#; % uppercase bar thickness
-cap_band#:=17/36pt#; % uppercase thickness above/below lobes
-cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches
-serif_drop#:=3/36pt#; % vertical drop of sloped serifs
-stem_corr#:=2/36pt#; % for small refinements of stem breadth
-vair_corr#:=1.5/36pt#; % for small refinements of hairline height
-apex_corr#:=0pt#; % extra width at diagonal junctions
-
-o#:=6/36pt#; % amount of overshoot for curves
-apex_o#:=6/36pt#; % amount of overshoot for diagonal junctions
-
-slant:=.25; % tilt ratio $(\Delta x/\Delta y)$
-fudge:=1; % factor applied to weights of heavy characters
-math_spread:=.5; % extra openness of math symbols
-superness:=8/11; % parameter for superellipses
-superpull:=1/8; % extra openness inside bowls
-beak_darkness:=.4; % fraction of triangle inside beak serifs
-ligs:=2; % level of ligatures to be included
-
-square_dots:=false; % should dots be square?
-hefty:=false; % should we try hard not to be overweight?
-serifs:=true; % should serifs and bulbs be attached?
-monospace:=false; % should all characters have the same width?
-variant_g:=true; % should an italic-style g be used?
-low_asterisk:=false; % should the asterisk be centered at the axis?
-math_fitting:=false; % should math-mode spacing be used?
-
-% generate textit % switch to the driver file
-
-% mode_setup; font_setup;
-
-% "f" obviously has a _lot_ bigger slant than "p" (see Wanske p.239)
-% however; perhaps we need two f symbols:
-% - a super-slanted one used in "f" "mf" "sfz" "sf", and
-% - a more normal-slanted in "ff" "fff" "fp" "fp" (see Wanske p.241)
-%
-% looking at professionally typeset music reveals that typesetters
-% are somewhat unsure about slanting in "mf", "fp", "sfz"
-
-% "f" and "p" (in any combination) are a lot (factor two) fatter than
-% "s", "m", and "z". sometimes the "m" and "z" are a bit fatter than
-% "s".
-
-slant:=.68; % tilt ratio $(\Delta x/\Delta y)$
-crisp#:=19/36pt#; % diameter of serif corners
-tiny#:=19/36pt#; % diameter of rounded corners
-fine#:=20/36pt#; % diameter of sharply rounded corners
-thin_join#:=20/36pt#; % width of extrafine details
-stem#:=72/36pt#; % lowercase stem breadth
-%curve#:=64/36pt#; % lowercase curve breadth
-flare#:=52/36pt#; % diameter of bulbs or breadth of terminals
-
-% mode_setup; font_setup;
-mode_setup;
-font_setup;
-
-input autometric;
-fet_beginfont("dyn", 10);
-
-num=-1;
-input ital-f;
-
-slant:=.38; % tilt ratio $(\Delta x/\Delta y)$
-stem#:=58/36pt#; % lowercase stem breadth
-font_setup;
-
-input ital-f;
-stem#:=54/36pt#; % lowercase stem breadth
-hair#:=12/36pt#; % lowercase hairline breadth
-vair#:=7/36pt#; % vertical diameter of hairlines
-
-% mode_setup; font_setup;
-font_setup;
-
-input ital-p;
-
-slant:=.28; % tilt ratio $(\Delta x/\Delta y)$
-stem#:=26/36pt#; % lowercase stem breadth
-ess#:=24/36pt#; % breadth in middle of lowercase s
-hair#:=9/36pt#; % lowercase hairline breadth
-vair#:=6/36pt#; % vertical diameter of hairlines
-flare#:=32/36pt#; % diameter of bulbs or breadth of terminals
-
-crisp#:=13/36pt#; % diameter of serif corners
-tiny#:=13/36pt#; % diameter of rounded corners
-fine#:=10/36pt#; % diameter of sharply rounded corners
-thin_join#:=10/36pt#; % width of extrafine details
-% hair#:=20/36pt#; % lowercase hairline breadth
-% stem#:=38/36pt#; % lowercase stem breadth
-curve#:=43/36pt#; % lowercase curve breadth
-% flare#:=42/36pt#; % diameter of bulbs or breadth of terminals
-% ess#:=35/36pt#; % breadth in middle of lowercase s
-% vair#:=13/36pt#; % vertical diameter of hairlines
-
-% mode_setup; font_setup;
-font_setup;
-
-input ital-m;
-input ital-r;
-input ital-s;
-input ital-z;
-
-font_slant slant; font_x_height x_height#;
-
-fet_endfont("dyn");
-end.
--- /dev/null
+% feta-din10.mf
+% from cmbxti10.mf
+%
+% feta dynamics
+% too easy now to use this copy from cm, but we might want to do ourselves
+%
+% 16pt staff: \font\dynfont=feta-din10 scaled \magstep1
+% 20pt staff: \font\dynfont=feta-din10 scaled \magstep2
+
+% Computer Modern Bold Extended Text Italic 10 point
+% if unknown cmbase: input cmbase fi
+
+% font_identifier:="CMBXTI"; font_size 10pt#;
+
+input cmbase;
+font_identifier:="FETA-DYN"; font_size 10pt#;
+
+u#:=21.2/36pt#; % unit width
+width_adj#:=11/36pt#; % width adjustment for certain characters
+serif_fit#:=0pt#; % extra sidebar near lowercase serifs
+cap_serif_fit#:=7/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=11/36pt#; % extra space added to all sidebars
+
+body_height#:=270/36pt#; % height of tallest characters
+asc_height#:=250/36pt#; % height of lowercase ascenders
+cap_height#:=247/36pt#; % height of caps
+fig_height#:=232/36pt#; % height of numerals
+x_height#:=160/36pt#; % height of lowercase without ascenders
+math_axis#:=90/36pt#; % axis of symmetry for math symbols
+bar_height#:=85/36pt#; % height of crossbar in lowercase e
+comma_depth#:=70/36pt#; % depth of comma below baseline
+desc_depth#:=70/36pt#; % depth of lowercase descenders
+
+crisp#:=13/36pt#; % diameter of serif corners
+tiny#:=13/36pt#; % diameter of rounded corners
+fine#:=10/36pt#; % diameter of sharply rounded corners
+thin_join#:=10/36pt#; % width of extrafine details
+hair#:=20/36pt#; % lowercase hairline breadth
+stem#:=38/36pt#; % lowercase stem breadth
+curve#:=43/36pt#; % lowercase curve breadth
+ess#:=35/36pt#; % breadth in middle of lowercase s
+flare#:=42/36pt#; % diameter of bulbs or breadth of terminals
+dot_size#:=53/36pt#; % diameter of dots
+cap_hair#:=22/36pt#; % uppercase hairline breadth
+cap_stem#:=49/36pt#; % uppercase stem breadth
+cap_curve#:=52/36pt#; % uppercase curve breadth
+cap_ess#:=50/36pt#; % breadth in middle of uppercase s
+rule_thickness#:=.6pt#; % thickness of lines in math symbols
+
+dish#:=1/36pt#; % amount erased at top or bottom of serifs
+bracket#:=10/36pt#; % vertical distance from serif base to tangent
+jut#:=27/36pt#; % protrusion of lowercase serifs
+cap_jut#:=39/36pt#; % protrusion of uppercase serifs
+beak_jut#:=10/36pt#; % horizontal protrusion of beak serifs
+beak#:=70/36pt#; % vertical protrusion of beak serifs
+vair#:=13/36pt#; % vertical diameter of hairlines
+notch_cut#:=10pt#; % maximum breadth above or below notches
+bar#:=17/36pt#; % lowercase bar thickness
+slab#:=17/36pt#; % serif and arm thickness
+cap_bar#:=17/36pt#; % uppercase bar thickness
+cap_band#:=17/36pt#; % uppercase thickness above/below lobes
+cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches
+serif_drop#:=3/36pt#; % vertical drop of sloped serifs
+stem_corr#:=2/36pt#; % for small refinements of stem breadth
+vair_corr#:=1.5/36pt#; % for small refinements of hairline height
+apex_corr#:=0pt#; % extra width at diagonal junctions
+
+o#:=6/36pt#; % amount of overshoot for curves
+apex_o#:=6/36pt#; % amount of overshoot for diagonal junctions
+
+slant:=.25; % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1; % factor applied to weights of heavy characters
+math_spread:=.5; % extra openness of math symbols
+superness:=8/11; % parameter for superellipses
+superpull:=1/8; % extra openness inside bowls
+beak_darkness:=.4; % fraction of triangle inside beak serifs
+ligs:=2; % level of ligatures to be included
+
+square_dots:=false; % should dots be square?
+hefty:=false; % should we try hard not to be overweight?
+serifs:=true; % should serifs and bulbs be attached?
+monospace:=false; % should all characters have the same width?
+variant_g:=true; % should an italic-style g be used?
+low_asterisk:=false; % should the asterisk be centered at the axis?
+math_fitting:=false; % should math-mode spacing be used?
+
+% generate textit % switch to the driver file
+
+% mode_setup; font_setup;
+
+% "f" obviously has a _lot_ bigger slant than "p" (see Wanske p.239)
+% however; perhaps we need two f symbols:
+% - a super-slanted one used in "f" "mf" "sfz" "sf", and
+% - a more normal-slanted in "ff" "fff" "fp" "fp" (see Wanske p.241)
+%
+% looking at professionally typeset music reveals that typesetters
+% are somewhat unsure about slanting in "mf", "fp", "sfz"
+
+% "f" and "p" (in any combination) are a lot (factor two) fatter than
+% "s", "m", and "z". sometimes the "m" and "z" are a bit fatter than
+% "s".
+
+slant:=.68; % tilt ratio $(\Delta x/\Delta y)$
+crisp#:=19/36pt#; % diameter of serif corners
+tiny#:=19/36pt#; % diameter of rounded corners
+fine#:=20/36pt#; % diameter of sharply rounded corners
+thin_join#:=20/36pt#; % width of extrafine details
+stem#:=72/36pt#; % lowercase stem breadth
+%curve#:=64/36pt#; % lowercase curve breadth
+flare#:=52/36pt#; % diameter of bulbs or breadth of terminals
+
+mode_setup;
+font_setup;
+
+input autometric;
+fet_beginfont("feta-din", 10);
+
+num=-1;
+xbar:=u;
+input ital-f;
+
+bar#:=17/36pt#; % lowercase bar thickness
+slant:=.38; % tilt ratio $(\Delta x/\Delta y)$
+stem#:=58/36pt#; % lowercase stem breadth
+font_setup;
+xbar:=.4u;
+
+input ital-f;
+stem#:=54/36pt#; % lowercase stem breadth
+hair#:=12/36pt#; % lowercase hairline breadth
+vair#:=7/36pt#; % vertical diameter of hairlines
+
+font_setup;
+
+input ital-p;
+
+slant:=.28; % tilt ratio $(\Delta x/\Delta y)$
+%stem#:=38/36pt#; % lowercase stem breadth
+stem#:=28/36pt#; % lowercase stem breadth
+% ess#:=35/36pt#; % breadth in middle of lowercase s
+ess#:=28/36pt#; % breadth in middle of lowercase s
+%hair#:=20/36pt#; % lowercase hairline breadth
+hair#:=16/36pt#; % lowercase hairline breadth
+%vair#:=13/36pt#; % vertical diameter of hairlines
+vair#:=9/36pt#; % vertical diameter of hairlines
+% flare#:=42/36pt#; % diameter of bulbs or breadth of terminals
+flare#:=36/36pt#; % diameter of bulbs or breadth of terminals
+
+crisp#:=13/36pt#; % diameter of serif corners
+tiny#:=13/36pt#; % diameter of rounded corners
+fine#:=10/36pt#; % diameter of sharply rounded corners
+thin_join#:=10/36pt#; % width of extrafine details
+curve#:=43/36pt#; % lowercase curve breadth
+
+% Chester, Breitkopf suggest smaller sizes of these other chars,
+% using the x-height as reference point.
+% x_height#:=160/36pt#; % height of lowercase without ascenders
+x_height#:=145/36pt#; % height of lowercase without ascenders
+
+font_setup;
+
+input ital-m;
+input ital-r;
+input ital-s;
+input ital-z;
+
+font_slant slant; font_x_height x_height#;
+
+fet_endfont("feta-din");
+end.
filldraw stroke z5e{z89-z88}...z6e...{left}z7e; % lower arc
pickup crisp.nib; pos20(bar,90); pos21(bar,90);
top y20r=top y21r=x_height;
-lft x20=lft x4r-.5stem-u; rt x21=rt x4l+.5stem+1.5u;
+%lft x20=lft x4r-.5stem-u; rt x21=rt x4l+.5stem+1.5u;
+lft x20=lft x4r-.5stem-xbar; rt x21=rt x4l+.5stem+1.5xbar;
filldraw stroke z20e--z21e; % crossbar
math_fit(desc_depth#*slant+u#,x_height#*slant);
penlabels(0,1,2,3,4,5,6,7,8,9,20,21,88,89); endchar;
-% generated at Fri Sep 26 14:26:49 1997 from out/dyn10.log
-% changes will be lost
-
-% dyn
\def\dynnf{\dynfont\char1}
\def\dynnf{\dynfont\char1}
\def\dynp{\dynfont\char2}
-\def\dynm{\dynfont\char3}
-\def\dynr{\dynfont\char4}
-\def\dyns{\dynfont\char5}
-\def\dynz{\dynfont\char6}
+\def\dynm{\raise.1ex\hbox{\dynfont\char3}}
+\def\dynr{\raise.1ex\hbox{\dynfont\char4}}
+\def\dyns{\raise.1ex\hbox{\dynfont\char5}}
+\def\dynz{\raise.1ex\hbox{\dynfont\char6}}
-\def\kdynf{\dynnf}
-\def\kdynp{\dynp\kern-.1ex}
+\def\kdynf{\dynnf\kern-.25ex}
+\def\kdynp{\dynp\kern-.15ex}
\def\dynf{{\dynaf}}
\def\dynpp{{\kdynp\dynp}}
\def\dynppp{{\kdynp\kdynp\dynp}}
\def\dynmp{{\dynm\kern -.2ex\dynp}}
-\def\dynmf{{\dynfont\raise.08ex\hbox{\dynm}\kern-.3ex\dynnf}}
+\def\dynmf{{\dynfont\raise.08ex\hbox{\dynm}\kern-.4ex\dynnf}}
\def\dynff{{\kdynf\dynnf}}
\def\dynfff{{\kdynf\kdynf\dynnf}}
-\def\dynfp{{\kdynf\dynp}}
-\def\dynsf{{\dyns\kern-.3ex\dynnf}}
-\def\dynsfz{{\dynsf\dynz}}
+\def\dynfp{{\kdynf\kern.1ex\dynp}}
+\def\dynsf{{\dyns\kern-.5ex\dynnf}}
+\def\dynsfz{{\dynsf\kern-.15ex\dynz}}
\def\dynfz{{\dynf\dynz}}
-\def\dynrf{{\dynr\dynf}}
+\def\dynrf{{\dynr\kern-.4ex\dynf}}
% generated automatically by mf-to-table.py version 0.4
-% on Wed Oct 29 16:41:31 1997
+% on Fri Oct 31 08:26:30 1997
% Do not edit
% input from out/feta16.log
% name
% generated automatically by mf-to-table.py version 0.4
-% on Wed Oct 29 16:41:35 1997
+% on Fri Oct 31 08:26:34 1997
% Do not edit
% input from out/feta20.log
% name
\font\fontentja=feta16
\font\vetfont=feta-beams16
\font\fetanummer=feta-nummer8
+ \font\dynfont=feta-din10 scaled \magstep1
}
\def\fettwentydefs{
\font\fontentja=feta20
\font\vetfont=feta-beams20
\font\fetanummer=feta-nummer10
+ \font\dynfont=feta-din10 scaled \magstep2
}
\def\fetdef#1#2{\def#1{%
% what the fuck is this?
\font\musicfnt=musix20
\font\musicdraw=musixsps
\font\italicfont=cmti10
- \font\dynfont=dyn10 scaled \magstep2
+ \font\dynfont=cmbxti10 scaled \magstep2
\font\musicmathfont=cmsy10
\fettwentydefs
}
\font\hslurdfont=xslhd16
\font\hslurhfont=xslhz20
\font\musicfnt=musix16
- \font\dynfont=dyn10 scaled \magstep1
+ \font\dynfont=cmbxti10 scaled \magstep1
\font\musicdraw=musixsps
\font\musicmathfont=cmsy8
\fetsixteendefs
projects / lilypond.git / commitdiff