diff options
author | Karl Berry <karl@freefriends.org> | 2015-03-01 22:07:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-03-01 22:07:08 +0000 |
commit | 62331cbac5f5ad24aad892b8f863b08dd8e08141 (patch) | |
tree | 84f1b7c1ab5f9eae48ab5eb6ad8c49239fa48fe4 /Master/texmf-dist | |
parent | 12d15156b306b9558ba418999aba33d28812ef03 (diff) |
musixtex-fonts (28feb15)
git-svn-id: svn://tug.org/texlive/trunk@36414 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
27 files changed, 766 insertions, 5 deletions
diff --git a/Master/texmf-dist/doc/fonts/musixtex-fonts/README b/Master/texmf-dist/doc/fonts/musixtex-fonts/README index 10c3a43ddbd..028653f45bd 100644 --- a/Master/texmf-dist/doc/fonts/musixtex-fonts/README +++ b/Master/texmf-dist/doc/fonts/musixtex-fonts/README @@ -1,4 +1,4 @@ -This is musixtex-fonts, packaged 2013-01-24. It contains all of +This is musixtex-fonts, packaged 2015-02-23. It contains all of the font-related files for MusiXTeX, including both the original metafont sources and Type 1 versions by Takanori Uchiyama. @@ -8,15 +8,18 @@ Andreas Egler and Ross Mitchell. MusiXTeX is now being maintained by Don Simons dsimons(at)roadrunner(dot)com Hiroaki Morimoto CQX05646(at)nifty(dot)com +Bob Tennent rdt(at)cs(dot)queensu(dot)ca musixtex-fonts-install.{pdf,tex} is a more-detailed version of the following instructions: To install (on TDS-compliant TeX systems): - + unzip tex-archive/install/fonts/musixtex-fonts.tds.zip at the root - of a texmf tree and, if necessary, update the filename database; - e.g., texhash texmf. + + download "tex-archive"/install/fonts/musixtex-fonts.tds.zip where + the preferred URL for "tex-archive" is http://mirror.ctan.org + + + unzip the archive at the root of a texmf tree and, if necessary, + update the filename database; e.g., texhash texmf. + update the relevant font-map files; e.g., append diff --git a/Master/texmf-dist/doc/fonts/musixtex-fonts/musixtex-fonts-install.pdf b/Master/texmf-dist/doc/fonts/musixtex-fonts/musixtex-fonts-install.pdf Binary files differindex 928f8412bea..df90f30ff96 100644 --- a/Master/texmf-dist/doc/fonts/musixtex-fonts/musixtex-fonts-install.pdf +++ b/Master/texmf-dist/doc/fonts/musixtex-fonts/musixtex-fonts-install.pdf diff --git a/Master/texmf-dist/doc/fonts/musixtex-fonts/musixtex-fonts-install.tex b/Master/texmf-dist/doc/fonts/musixtex-fonts/musixtex-fonts-install.tex index eaf0bdbcaff..2768334dfb8 100644 --- a/Master/texmf-dist/doc/fonts/musixtex-fonts/musixtex-fonts-install.tex +++ b/Master/texmf-dist/doc/fonts/musixtex-fonts/musixtex-fonts-install.tex @@ -37,7 +37,7 @@ and installing files\footnote{% In this distribution of the MusiXTeX fonts, all of the files to be installed are in \begin{list}{}{}\item -\texttt{tex-archive/install/fonts/musixtex-fonts.tds.zip} +\myurl{http://mirror.ctan.org/install/fonts/musixtex-fonts.tds.zip} \end{list} at CTAN. The archive is a zipped TEXMF hierarchy; simply download and unzip this archive in the root folder/directory of whichever TEXMF tree diff --git a/Master/texmf-dist/fonts/map/dvips/musixtex-fonts/musix.map b/Master/texmf-dist/fonts/map/dvips/musixtex-fonts/musix.map index a8d8de9ebd9..f128b3e1398 100644 --- a/Master/texmf-dist/fonts/map/dvips/musixtex-fonts/musix.map +++ b/Master/texmf-dist/fonts/map/dvips/musixtex-fonts/musix.map @@ -70,3 +70,10 @@ xslup20 TeXXSLUP20-Regular <xslup20.pfb xslz20 TeXXSLZ20-Regular <xslz20.pfb xslz20d TeXXSLZ20D-Regular <xslz20d.pfb xtie20 TeXXTIE20-Regular <xtie20.pfb +xppff10 TeXXPPFF10-Regular <xppff10.pfb +xadf29 TeXXADF29-Regular <xadf29.pfb +xadf24 TeXXADF24-Regular <xadf24.pfb +xadf20 TeXXADF20-Regular <xadf20.pfb +xadf16 TeXXADF16-Regular <xadf16.pfb +xadf13 TeXXADF13-Regular <xadf13.pfb +xadf11 TeXXADF11-Regular <xadf11.pfb diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf11.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf11.mf new file mode 100644 index 00000000000..42023aa6ca0 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf11.mf @@ -0,0 +1,28 @@ + +font_identifier:="xadf11"; + +mode_setup; + +font_size 10.24pt#; + +nhh#:=2.56pt#; +nhw#:=3.072pt#; +gregwidth#:=0.5*sqrt(2)*nhw#; + +thin#:=1/50designsize; +med#:=1/33designsize; +thick#:=1/16designsize; + +thinwidth := 0.064pt; +beamht#:=0.48nhh#; + +define_pixels(nhh,nhw,beamht,gregwidth); +define_blacker_pixels(thin,med,thick); + +pair ne,se,sw,nw; %northeast,southeast,southwest,northwest +ne = up+right; se = down+right; sw = down+left; nw = up+left; + +font_x_height nhh#; +font_quad nhw#; + +input xadfgen diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf13.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf13.mf new file mode 100644 index 00000000000..ab371ef2fa4 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf13.mf @@ -0,0 +1,28 @@ + +font_identifier:="xadf13"; + +mode_setup; + +font_size 12.8pt#; + +nhh#:=3.2pt#; +nhw#:=3.84pt#; +gregwidth#:=0.5*sqrt(2)*nhw#; + +thin#:=1/50designsize; +med#:=1/33designsize; +thick#:=1/16designsize; + +thinwidth := 0.08pt; +beamht#:=0.48nhh#; + +define_pixels(nhh,nhw,beamht,gregwidth); +define_blacker_pixels(thin,med,thick); + +pair ne,se,sw,nw; %northeast,southeast,southwest,northwest +ne = up+right; se = down+right; sw = down+left; nw = up+left; + +font_x_height nhh#; +font_quad nhw#; + +input xadfgen diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf16.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf16.mf new file mode 100644 index 00000000000..a2140ca960d --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf16.mf @@ -0,0 +1,28 @@ + +font_identifier:="xadf16"; + +mode_setup; + +font_size 16pt#; + +nhh#:=4pt#; +nhw#:=4.8pt#; +gregwidth#:=0.5*sqrt(2)*nhw#; + +thin#:=1/50designsize; +med#:=1/33designsize; +thick#:=1/16designsize; + +thinwidth := 0.1pt; +beamht#:=0.48nhh#; + +define_pixels(nhh,nhw,beamht,gregwidth); +define_blacker_pixels(thin,med,thick); + +pair ne,se,sw,nw; %northeast,southeast,southwest,northwest +ne = up+right; se = down+right; sw = down+left; nw = up+left; + +font_x_height nhh#; +font_quad nhw#; + +input xadfgen diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf20.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf20.mf new file mode 100644 index 00000000000..7244f342437 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf20.mf @@ -0,0 +1,28 @@ + +font_identifier:="xadf20"; + +mode_setup; + +font_size 20pt#; + +nhh#:=5pt#; +nhw#:=1.2*nhh#; +gregwidth#:=0.5*sqrt(2)*nhw#; + +thin#:=1/50designsize; +med#:=1/33designsize; +thick#:=1/16designsize; + +thinwidth := 0.125pt; +beamht#:=0.48nhh#; + +define_pixels(nhh,nhw,beamht,gregwidth); +define_blacker_pixels(thin,med,thick); + +pair ne,se,sw,nw; %northeast,southeast,southwest,northwest +ne = up+right; se = down+right; sw = down+left; nw = up+left; + +font_x_height nhh#; +font_quad nhw#; + +input xadfgen diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf24.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf24.mf new file mode 100644 index 00000000000..afad47b565e --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf24.mf @@ -0,0 +1,28 @@ + +font_identifier:="xadf24"; + +mode_setup; + +font_size 24pt#; + +nhh#:=6pt#; +nhw#:=1.2nhh#; +gregwidth#:=0.5*sqrt(2)*nhw#; + +thin#:=1/50designsize; +med#:=1/33designsize; +thick#:=1/16designsize; + +thinwidth := 0.15pt; +beamht#:=0.48nhh#; + +define_pixels(nhh,nhw,beamht,gregwidth); +define_blacker_pixels(thin,med,thick); + +pair ne,se,sw,nw; %northeast,southeast,southwest,northwest +ne = up+right; se = down+right; sw = down+left; nw = up+left; + +font_x_height nhh#; +font_quad nhw#; + +input xadfgen diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf29.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf29.mf new file mode 100644 index 00000000000..5ee0dd54f60 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadf29.mf @@ -0,0 +1,28 @@ + +font_identifier:="xadf29"; + +mode_setup; + +font_size 29pt#; + +nhh#:=7.2pt#; +nhw#:=1.2*nhh#; +gregwidth#:=0.5*sqrt(2)*nhw#; + +thin#:=1/50designsize; +med#:=1/33designsize; +thick#:=1/16designsize; + +thinwidth := 0.15pt; +beamht#:=0.48nhh#; + +define_pixels(nhh,nhw,beamht,gregwidth); +define_blacker_pixels(thin,med,thick); + +pair ne,se,sw,nw; %northeast,southeast,southwest,northwest +ne = up+right; se = down+right; sw = down+left; nw = up+left; + +font_x_height nhh#; +font_quad nhw#; + +input xadfgen diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadfgen.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadfgen.mf new file mode 100644 index 00000000000..51a5375374f --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xadfgen.mf @@ -0,0 +1,236 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% basic def's -- taken from musixgen.mf % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +pair pone, ptwo; +transform t; +path p; + +hlthick=.2pt; +lthick=.4pt; + +pen line_pen, med_pen, coda_pen, thin_pen; +med_pen:= pencircle scaled med; +line_pen:= pencircle scaled lthick; +coda_pen:= pencircle xscaled 1.25thick yscaled max(1,.75med); +%thin_pen:= pencircle scaled max(1,.25pt); +thin_pen:= pencircle scaled max(1,.4pt); + +apog_fact=.75; +apog_nhw#=apog_fact*nhw#; + +picture save_pic, elem_pic; + +def savepic = save_pic:= currentpicture enddef; +def save_elempic = elem_pic:= currentpicture enddef; +def callpic = currentpicture:= save_pic enddef; + +def mirror (expr pone, ptwo) = + currentpicture:=currentpicture reflectedabout(round(pone),round(ptwo)) +enddef; + +def add_mirror (expr pone, ptwo) = + addto currentpicture also currentpicture + reflectedabout (round(pone), round(ptwo)) +enddef; + +def call_mirror (expr pone, ptwo) = callpic; mirror (pone, ptwo) enddef; + +def add_shift (expr pone, ptwo) = + addto currentpicture also currentpicture shifted (pone, ptwo) +enddef; + +def call_add_shift (expr pone, ptwo) = + callpic; add_shift (pone, ptwo) +enddef; + +def add_elempic (expr pone, ptwo) = + addto currentpicture also elem_pic shifted (pone, ptwo) +enddef; + +def call_add_save_elempic (expr pone, ptwo) = + callpic; add_elempic(pone, ptwo); savepic +enddef; + +def shift_pic (expr pone, ptwo) = + currentpicture:=currentpicture shifted (round(pone),round(ptwo)) +enddef; + +def fill_circle (expr diameter, zshift) = + fill fullcircle scaled diameter shifted zshift +enddef; + +def fill_square (expr xwidth, ywidth, zshift) = + fill unitsquare xscaled xwidth yscaled ywidth shifted zshift +enddef; + +% + +def staff= + for i=0 upto 4: + pickup pencircle yscaled lthick; + draw (-5nhw,i*nhh)--(5nhw,i*nhh); + endfor +enddef; + +def Staff= + for i=0 upto 4: + pickup pencircle yscaled lthick; + draw (-5nhw,(i*nhh-.5nhh))--(5nhw,(i*nhh-.5nhh)); + endfor +enddef; + +def upstem= + fill_square (lthick, 5nhh, (0,-5nhh)) +enddef; + +def downstem= + fill_square (lthick, 5nhh, (nhw-hlthick,0)) +enddef; + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% character definitions % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% +% so-called Miyoshi accent ...something like <> +% (give me the true name of this!) +% +beginchar(30, 0, 2.25nhh#, 0); "upper Miyoshi accent"; + pickup med_pen; + draw (.15nhw, 1.9nhh)--(1.15nhw, 1.5nhh)--(.15nhw, 1.1nhh); + add_mirror (origin, down); + shift_pic (.5nhw, 0); + savepic; +endchar; + +beginchar(31, 0, 0, 2.25nhh#); "lower Miyoshi accent"; + call_mirror (origin, right); +endchar; + +% +% size-balanced (a little large) sforzato +% +beginchar(20, 0, 2.25nhh#, 0); "upper sforzato (size-balanced)"; + x1=-.05nhw; x2=.5nhw; x3=nhw-x1; x3=x4+.28nhw; x6=x1+med; + y1=y6=y4=y3=nhh; y2=y1+1.4nhh; + z5-z6=whatever*(z2-z1); + z5-z4=whatever*(z2-z3); + fill z1--z2--z3--z4--z5--z6--cycle; + savepic; +endchar; + +beginchar(21, 0, 0, 2.25nhh#); "lower sforzato (size-balanced)"; + call_mirror (origin, right); +endchar; + +% +% coda with serif +% +beginchar(85, 0, 3.25nhh#, 0); "coda with serif"; + mh:=3nhh; + x2 = 2nhw-x4 = 1/6mh; y2 = y4 = 1/2mh; + x3 = x5 = nhw; y3 = mh-y5 = 5/6mh; +% pickup thin_pen; + pickup thin_pen; + draw (0,mh/2)--(2nhw,mh/2); + draw (nhw-.3nhw,0 )--(nhw+.3nhw,0 ); + draw (nhw-.3nhw,mh)--(nhw+.3nhw,mh); + draw (nhw,0)--(nhw,mh); + draw (0 ,mh/2-.3nhw)--(0 ,mh/2+.3nhw); + draw (2nhw,mh/2-.3nhw)--(2nhw,mh/2+.3nhw); + savepic; + pickup coda_pen; + draw z2..z3..z4..z5..cycle; + shift_pic (-nhw, 0); + labels (1,2,3,4); +endchar; + +% +% upright segno +% +beginchar(86, 0, 3.25nhh#, 0); "upright segno"; + x1:= 0; y1:=0; + x4:=-.69nhw; y4:=y1; + x5:=.36nhw; y5:=.9nhh; + x6:=-.28nhw; y6:=.97nhh; + x7:=-x5; y7:=-y5; + x8:=-x6; y8:=-y6; + z1'= (x1+1,y1); + penpos1'(.5nhh+blacker, 75); + penpos6(max(1,thin), -45); + penpos5(max(1,thin), -180); + penpos8(max(1,thin), -45); + penpos7(max(1,thin), -180); + fill_circle (.45nhh, (x5-.15nhh, y5l-.12nhh)); + fill_circle (.42nhh, (x4, y4)); +% pickup thin_pen; + pickup thin_pen; + draw ( ( (x4-.2nhh)+(2x1-x5) )/2, y1-(y5l-y4)/2-.05nhh)--z1; + addto currentpicture also currentpicture rotatedaround (z1, 180); + penstroke z7e..{ne}z8e..z1'e{dir135}..{ne}z6e..z5e; +% penlabels (1,4,5,6,7,8); + shift_pic (.5nhw, 1.5nhh); +endchar; + +% +% V-shaped breath +% +beginchar(33, 0, 1.5nhh#, 0); "V-shaped breath (up)"; + pickup thin_pen; + draw (.1nhw, 1.5nhh)--(.5nhw, .05nhh); + add_mirror ((.5nhw,0),(.5nhw,1)); + savepic; +endchar; +beginchar(34, 0, 0, 1.5nhh#); "V-shaped breath (down)"; + call_mirror (origin, right); +endchar; + + +%%%%%%% +message ("<noteheads>"); +%%%%%%% + +NHW=nhw+hlthick; + +beginchar(7, 0, .5nhh#, .5nhh#); "quarter note"; +% makeshift, expedience + corNHW=1.065*NHW; + fill fullcircle xscaled corNHW yscaled 1.85h + rotated 20 shifted (.5NHW, 0); +endchar; + +beginchar(8, 0, .5nhh#, .5nhh#); "half note"; + penpos1(max(1,2hlthick), 0); + penpos3(max(1,2hlthick), 180); + penpos2(thick,-90); + penpos4(thick, 90); + -x1l = .53NHW; + x3l = .5NHW; + x2 = x4 = y1 = y3 = 0; + y2l =-y4l = h; + penstroke (z1e{up}..z2e{right}..z3e{down}..z4e{left}..cycle) + rotated 20 shifted (.5NHW, 0); +endchar; + +beginchar(9, 0, .5nhh#, .5nhh#); "whole note"; + x1= y1 = y3 = y5 = y7 = 0; + x3= 2x2 = 2x4 = 2x6 = 2x8 = 5/4nhw; + y2=-y4 = h; + x5= x3-x7 = x1+.375nhw-blacker; + y6=-y8 = y2-.1thin; + fill z1{curl3}..z2..{curl3}z3{curl3}..z4..{curl3}cycle; + unfill (z5..z6..z7..z8..cycle) rotatedaround ((x2,0), 45) shifted (.5,.5); +%{{{ + currentpen:= pencircle; + draw rt z1{curl3}..bot z2..{curl3}lft z3{curl3}..top z4..{curl3}cycle; +%}}} + labels(range 1 thru 8); + savepic; +endchar; + + + +end. diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xppff10.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xppff10.mf new file mode 100644 index 00000000000..141db0c2374 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xppff10.mf @@ -0,0 +1,86 @@ +%% +%% xppff10.mf - an alternative font for MusiXTeX \ppff +%% font source code, parameters definition +%% +%% Modified from official cmbxti10.mf cmbase.mf textit.mf itall.mf +%% (Computer Modern Text Italic family) +%% +%% by Hiroaki MORIMOTO <CQX05646@nifty.com> +%% +%% August, 2004. +%% + +if unknown cmbase: input cmbase fi + +font_identifier:="XPPFF"; font_size 10pt#; + +u#:=1.1*21.2/36pt#; % unit width +width_adj#:=1.1*11/36pt#; % width adjustment for certain characters +serif_fit#:=0pt#; % extra sidebar near lowercase serifs +cap_serif_fit#:=1.1*7/36pt#; % extra sidebar near uppercase serifs +letter_fit#:=1.1*11/36pt#; % extra space added to all sidebars + +body_height#:=1.1*270/36pt#; % height of tallest characters 270 +asc_height#:=1.1*250/36pt#; % height of lowercase ascenders 250 +cap_height#:=1.1*247/36pt#; % height of caps 247 +fig_height#:=1.1*232/36pt#; % height of numerals 232 +x_height#:=1.1*160/36pt#; % height of lowercase without ascenders 160 +math_axis#:=1.1*90/36pt#; % axis of symmetry for math symbols +bar_height#:=1.1*85/36pt#; % height of crossbar in lowercase e +comma_depth#:=1.1*70/36pt#; % depth of comma below baseline +desc_depth#:=1.1*70/36pt#; % depth of lowercase descenders + +crisp#:=0/36pt#; % diameter of serif corners +tiny#:=0/36pt#; % diameter of rounded corners +fine#:=0/36pt#; % diameter of sharply rounded corners +thin_join#:=10/36pt#; % width of extrafine details 10 +hair#:=16/36pt#; % lowercase hairline breadth 20 +stem#:=52/36pt#; % lowercase stem breadth 38 +curve#:=50/36pt#; % lowercase curve breadth 43 +ess#:=32/36pt#; % breadth in middle of lowercase s 35 ( stem of m ) +flare#:=42/36pt#; % diameter of bulbs or breadth of terminals 42 +dot_size#:=53/36pt#; % diameter of dots 53 +cap_hair#:=22/36pt#; % uppercase hairline breadth 22 +cap_stem#:=49/36pt#; % uppercase stem breadth 49 +cap_curve#:=52/36pt#; % uppercase curve breadth 52 +cap_ess#:=50/36pt#; % breadth in middle of uppercase s 50 +rule_thickness#:=.6pt#; % thickness of lines in math symbols + +dish#:=0/36pt#; % amount erased at top or bottom of serifs 1 +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#:=19/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:=.36; % 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 xppffgen % switch to the driver file diff --git a/Master/texmf-dist/fonts/source/public/musixtex-fonts/xppffgen.mf b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xppffgen.mf new file mode 100644 index 00000000000..df847f51195 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/musixtex-fonts/xppffgen.mf @@ -0,0 +1,261 @@ +%% +%% xppffgen.mf - an alternative font for MusiXTeX \ppff +%% font source code, letter figure definition +%% +%% Modified from official cmbxti10.mf cmbase.mf textit.mf itall.mf +%% (Computer Modern Text Italic family) +%% +%% by Hiroaki MORIMOTO <CQX05646@nifty.com> +%% +%% August, 2004. +%% + +mode_setup; font_setup; + +%----patches for cmbase-------------------------------------------------------- +def bulb(suffix $,$$,$$$) = +pair uprevsl, dnrevsl; +uprevsl := (0,y$r-y$$r) slanted -slant; +dnrevsl := (0,y$$r-y$r) slanted -slant; + z$$$r=z$$r; +% path_.l:=z$l{x$$r-x$r,0}...{0,y$$r-y$r}z$$l; + path_.l:=z$l{x$$r-x$r,0}...{dnrevsl}z$$l; +% draw path_.l--z$$r{0,y$r-y$$r}...{x$r-x$$r,0}z$r--cycle; % link + filldraw path_.l--z$$r{uprevsl}...{x$r-x$$r,0}z$r--cycle; % link +% path_.r:=z$$$l{0,y$r-y$$r}..z$$$r{0,y$$r-y$r}; % near-circle + path_.r:=z$$$l{uprevsl}..z$$$r{dnrevsl}; % near-circle +% filldraw subpath(0,xpart(path_.r intersectiontimes path_.l)) of path_.r +% --z$$r{0,y$$r-y$r}..cycle; % bulb + filldraw path_.r--z$$r{dnrevsl}..cycle; % bulb + enddef; + +def hook_out(suffix $,$$,$$$)suffix modifier= % |x$| and |x$$$| (only) are known + pos$(stem,0); pos$$(vair,90); + x$$$:=hround(x$$$+.5hair-eps)-.5hair; pos$$$(hair,180); + y$=1/4x_height; bot y$$l=-oo; y$$$=1/3x_height; +% if skewed.modifier: x$$=x$+1.25u; +% filldraw stroke z$e{-u,-x_height}...z$$e{right}...{up}z$$$e; % hook +% else: x$$=x$+1.5u; +% filldraw stroke z$e{down}...z$$e{right} +% ...{x$$$-(x$+2.5u),x_height}z$$$e; fi enddef; % hook + x$$=x$$$-u; + filldraw stroke z$e{down}...z$$e{right} + ...{up slanted .5slant}z$$$e; % hook +enddef; + +def hook_in(suffix $,$$,$$$)suffix modifier= % |x$| and |x$$$| (only) are known + x$:=hround(x$-.5hair)+.5hair; pos$(hair,180); +% x$:=hround(x$-.5hair)+.5hair; pos$(vair,180); + pos$$(vair,90); pos$$$(stem,0); +% pos$$(hair,90); pos$$$(stem,0); +% y$=2/3x_height; top y$$r=x_height+oo; y$$$=3/4x_height; + y$=.55x_height; top y$$r=x_height+.9oo; y$$$=3/4x_height; +% if skewed.modifier: x$$=x$$$-1.25u; + x$$=x$+u; +% filldraw stroke z$e{up}..z$$e{right}...{-u,-x_height}z$$$e; % hook + filldraw stroke z$e{up slanted .5slant}...z$$e{right}...{down}z$$$e; % hook +% else: x$$=x$$$-1.5u; +% filldraw stroke z$e{x$$$-2.5u-x$,x_height} +% ...z$$e{right}...{down}z$$$e; fi enddef; % hook +enddef; + +%----letter f------------------------------------------------------------------ +cmchar "Italic letter f"; +%beginchar("f",max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#); +beginchar("f",max(1.5u#,stem#)+max(3.5u#,2flare#)-.6u#,asc_height#,desc_depth#); +%italcorr asc_height#*slant+.75u#; +italcorr asc_height#*slant; +adjust_fit(if monospace:u#,u# else: 0,0 fi); pickup fine.nib; +%numeric theta; z88=(.5w-.5u,h); z89=(.5w+.5u,-d); theta=angle(z88-z89); +numeric theta; z88=(.5w,h); z89=(.5w,-d); theta=angle(z88-z89); +pos0(flare,0); pos1(hair,0); pos2(vair,90); +%pos3(.5[hair,stem],180); pos4(stem,theta+90); +%pos3(.5[hair,stem],180); pos4(stem,270-theta); +pos3(.5[hair,stem],180); pos4(stem,180); +%pos5(stem,theta-90); pos6(.5[hair,stem],0); +%pos5(stem,90-theta); pos6(.5[hair,stem],0); +pos5(stem,0); pos6(.5[hair,stem],0); +%pos7(vair,-90); pos8(hair,-180); pos9(flare,-180); +pos7(vair,-75); pos8(hair,-180); pos9(flare,-180); +%rt x1r=hround(w+.25u); lft x8r=hround-.35u; x2=.6[x1,x4]; x7=.6[x8,x5]; +rt x1r=hround(w+.25u)+.9u; lft x8r=hround-1.4u; x2=.6[x1,x4]; x7=.6[x8,x5]; +%y9-.5flare=vround -.85d; y2-y0=y9-y7; top y2r=h+oo; bot y7r=-d-oo; +y9-.5flare=vround -d; y2-y0=y9-y7; top y2r=h+oo+.2hair; bot y7r=-d-oo-.2hair; +%y4=.25[x_height,h]; y5=.5[-d,y4]; +y4=.2[x_height,h]; y5=.47[-d,y4]; +z4=whatever[z88,z89]; z5=whatever[z88,z89]; +%x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.8[y4,y2]; y6=.8[y5,y7]; +x3=.8[x2+x4-x88,x88]; x6=.8[x7+x5-x89,x89]; y3=.7[y4,y2]; y6=.7[y5,y7]; +bulb(2,1,0); bulb(7,8,9); % bulbs +filldraw stroke z2e{left}...z3e...{z89-z88}z4e; % upper arc +filldraw z4r--z5l--z5r--z4l--cycle; % stem +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; +top y20r=top y21r=x_height; +%lft x20=lft x4r-.5stem-u; rt x21=rt x4l+.5stem+1.5u; +lft x20=lft x4r-.5stem-1.1u; rt x21=rt x4l+.5stem+1.1u; +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); +currentpicture:=currentpicture shifted (.3u,.025x_height); +endchar; + + +%----letter p------------------------------------------------------------------ +cmchar "Italic letter p"; +%beginchar("p",9u#,x_height#,desc_depth#); +%beginchar("p",6.7u#,x_height#,desc_depth#); +beginchar("p",7u#,x_height#,desc_depth#); +italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; +adjust_fit(0,0); pickup fine.nib; +x0=0-.1u; x2-.5stem=hround(2.5u-.5stem); hook_in(0,1,2); % opening hook +pos4(hair,-180); pos5(vair,-90); pos6(curve,0); pos7(vair,90); +%x4=x2; rt x6r=hround(w-1.5u+.5curve); x5=x7=.5[x4,x6]; +%x4=.4[x2,x2r]; rt x6r=hround(w+.25u+.5curve); x5=.55[x4,x6]; x7=.4[x4,x6]; +x4=.4[x2,x2r]; rt x6r=hround(w-.05u+.5curve); x5=.55[x4,x6]; x7=.4[x4,x6]; +%bot y5r=-oo+.5hair; top y7r=h+oo+.25hair; y4=.55[y5,y7]; y6=.45[y5,y7]; +bot y5r=-oo+hair; top y7r=h+oo+.1hair; y4=.55[y5,y7]; y6=.45[y5,y7]; +filldraw stroke super_arc.e(4,5) & pulled_arc.e(5,6) + & pulled_arc.e(6,7) & super_arc.e(7,4); % bowl +filldraw stroke super_arc.e(4,5) & super_arc.e(5,6) + & super_arc.e(6,7) & super_arc.e(7,4); % bowl +pickup tiny.nib; pos2'(stem,0); pos3(stem,0); +z2=z2'; x3=x2; bot y3=-d; filldraw stroke z2'e--z3e; % stem +dish_serif(3,2',a,1/3,.75jut,b,1/3,jut); % serif +math_fit(-min(2/3x_height#*slant-.5hair#-.5u#, + 2u#-.5stem#-desc_depth#*slant),ic#); +penlabels(0,1,2,3,4,5,6,7); +currentpicture:=currentpicture shifted (.25u,.025x_height); +endchar; + + +%----letter m------------------------------------------------------------------ +cmchar "Italic letter m"; +beginchar("m",9u#,x_height#,0); +%italcorr 1/3x_height#*slant; +italcorr 1/3x_height#*slant+.5hair#+.5u#; +x_height_o:=x_height; x_height:=.8x_height; +adjust_fit(if monospace:-1.5u#,-2u# else: 0,0 fi); pickup fine.nib; +%w := .9w; +numeric shaved_stem; %shaved_stem=mfudged.stem; +shaved_stem=.2[ess,stem]; +save stem; stem=shaved_stem; +pos2(stem,0); x1=x2; +%if monospace: pos1(stem,0); lft x1l=hround(2.5u-.5stem); top y1=h; +%else:% x0=0; lft x2l=hround(2.5u-.5stem); +% x0=0; lft x2l=hround(2.5u-.5stem); +% x0=0+.08w; lft x2l=hround(2.5u-.5stem); + x0=0-.5hair+.5stem; lft x2l=hround(2.5u-.5stem); + hook_in(0,a,1);% fi % opening hook +y2-.5stem=-oo; filldraw circ_stroke z2e--z1e; % left stem +%x4+.5stem=hround(.5w+.5stem); ital_arch(2,3,4); % left arch +%x4+.5stem=hround(.675w+.5stem); ital_arch(2,3,4); % left arch +x4+.5stem=hround(.58w+.5stem); ital_arch(2,3,4); % left arch +pos5(stem,0); y5=y2; x5=x4; +filldraw circ_stroke z5e--z4e; % middle stem +%x7+.5stem=hround(w-2.5u+.5stem); +%x7+.5stem=hround(1.35w-2.5u+.5stem); +x7+.5stem=hround(1.16w-2.5u+.5stem); +%x8=x7-.25u; ital_arch(5,6,7); % right arch +x8=x7; ital_arch(5,6,7); % right arch +%if monospace: pos9(vair,90); x9=good.x .5[x8,w]; bot y9l=0; y8=1/3h; +% pos8(stem,0); filldraw stroke z8e{-u,-x_height}...{right}z9e; % terminal +%else:% x9=w; hook_out(8,b,9)(skewed); fi % closing hook +%x9=1.25w; hook_out(8,b,9)(skewed);% fi % closing hook +x9=w+1u; hook_out(8,b,9)(skewed);% fi % closing hook +%filldraw stroke z7e{down}..{-u,-x_height}z8e; % right stem +%filldraw stroke z7e{down}--{down}z8e; % right stem +filldraw stroke z7e--z8e; % right stem +math_fit(-2/3x_height#*slant+.5hair#+.5u#,ic#); +penlabels(0,a,1,2,3,4,5,6,7,8,b,9); +x_height:=x_height_o; +currentpicture:=currentpicture shifted (.6u,.19x_height); +endchar; + + +%----letter s------------------------------------------------------------------ +cmchar "Italic letter s"; +%beginchar("s",5.25u#+max(1.75u#,flare#),x_height#,0); +beginchar("s",4.8u#,x_height#,0); +%italcorr x_height#*slant-.5u#; +italcorr 1/3x_height#*slant+.5hair#+.5u#; +adjust_fit(0,0); pickup fine.nib; +%numeric theta; theta=90-angle(40u,h); slope:=-h/40u; % angle at middle +numeric theta; theta=90-angle(16u,h); slope:=-h/16u; % angle at middle +pos2(vair,-90); pos0(max(fine.breadth,ess),theta); pos7(vair,-90); +%x2l=x0=x7=.5w; top y2l=h+oo; bot y7r=-oo; +%x2l+.08w=x0=x7-.08w=.5w; top y2l=h+oo-.1x_height; bot y7r=-oo+.1x_height; +x0=.5w; top y2l=h+oo-.1x_height; bot y7r=-oo+.1x_height; +x2=.4w; x7=.6w; +y0-.5ess=y7l+.55(y2r-y7l-ess); +%lft x3l=hround u-eps; rt x6r=hround(w-.5u)+eps; +%lft x3l=hround u-eps+.2u; rt x6r=hround(w-.5u)+eps-.2u; +lft x3l=0-.1u; rt x6r=w+.2u; +x3r-x3l=x6r-x6l=hround .5[vair,ess]-fine; +ellipse_set(2l,3l,4l,0l); ellipse_set(2r,3r,4r,0r); y3=y3r; +ellipse_set(7l,6l,5l,0l); ellipse_set(7r,6r,5r,0r); y6=y6r; +interim superness:=more_super; +filldraw stroke super_arc.e(2,3) & z3e{down} + ..z4e---z5e..z6e{down} & super_arc.e(6,7); % main stroke +pos1(hair,0); pos10(hround .75[hair,flare],0); +pos2'(vair,90); z2'=z2; +pos8(hair,-180); pos9(flare,-180); +%rt x10r=hround(w-u)+2eps; lft x9r=hround .5u-2eps; y10=.78h; y9=.25h; +%rt x10r=hround(w-u)+2eps-.5u; lft x9r=hround 1u-2eps+.5u; y10=.78h; y9=.25h; +lft x9r=+.35u; rt x10r=w-.55u; y9=.25h; y10=.75h; +bulb(2',1,10); bulb(7,8,9); % bulbs +math_fit(0,ic#); penlabels(0,1,2,3,4,5,6,7,8,9,10); +currentpicture:=currentpicture shifted (u,.09x_height); +endchar; + +%----letter z------------------------------------------------------------------ +cmchar "Italic letter z"; +%beginchar("z",5.5u#+max(1.5u#,stem#),x_height#,0); +beginchar("z",5.2u#,x_height#,0); +%italcorr x_height#*slant+.5hair#; +italcorr 1/3x_height#*slant+.5hair#+.5u#; +adjust_fit(if monospace:.5u#,.5u# else: 0,0 fi); pickup fine.nib; +%pos1(hair,0); pos2(stem,-90); pos3(vair,-90); pos4(hair,0); +%pos1(hair,0); pos2(ess,-90); pos3(vair,-90); pos4(hair,0); +pos1(hair,-0); pos2(.3[ess,stem],-80); pos3(.7[vair,ess],-90); pos4(hair,-30); +%lft x1l=hround(u-.5hair); x2=2.5u; x3=w-2u; rt x4r=hround(w-.5u); +%lft x1l=hround(.5u-.5hair); x2=2.2u; x3=w-2u; rt x4r=hround(w-.5u); +lft x1l=hround(.0u-.5hair); x2=1.2u; x3=2.9u; rt x4r=hround(1.1w-.6u)-.2u; +%top y1=.78h; top y2l=top y4=h+oo; y3=.825h; +%top y1=.78h-.1x_height; top y2l=top y4=h+oo-.1x_height; y3=.825h-.1x_height; +%top y1=.78h-.1x_height; top y2l=top y4=h+oo-.1x_height; y3=.825h-.04x_height; +top y1=.76h-.1x_height; top y2l=top h+oo-.1x_height; y4l=h-.1x_height; y3=.85h-.1x_height; +%pos5(hair,0); pos6(vair,-90); pos7(stem,-90); pos8(hair,0); +%pos5(hair,0); pos6(vair,-90); pos7(ess,-90); pos8(hair,0); +pos5(hair,-30); pos6(.7[vair,ess],-90); pos7(.5[ess,stem],-80); pos8(hair,-0); +%x5=x1; x6=2.5u; x7=w-2u; x8+.5hair=hround(w+.5hair-eps); +%x5=x1+u; x6=3.5u; x7=w-1u; x8+.5hair=hround(w+.5hair-eps)+u; +%x5=x1+.5u; x6=2.5u; x7=.87w; x8+.5hair=hround(1.1w+.5hair-eps); +x5=x1+.5u; x6=2.5u; x7=.95w; x8+.5hair=hround(1.1w+.5hair-eps); +%bot y5=bot y7r=-oo; y6=.175h; bot y8=.31h; +%bot y5=.1x_height; y7r=-oo; y6=.175h+.1x_height; bot y8=.31h; +bot y5=.1x_height; y7r=-oo; y6=.175h+.03x_height; bot y8=.31h; +pair p; p=(z4-z5) yscaled 2; +filldraw stroke z1e{up}...z2e{right}..z3e{right}...{p}z4e; % upper bar +filldraw stroke z5e{p}...z6e{right}..{right}z7e...{up}z8e; % lower bar +filldraw stroke z5e{p}..{p}z4e; % diagonal +math_fit(0,1/3x_height#*slant+.5hair#+.5u#); +penlabels(1,2,3,4,5,6,7,8); +currentpicture:=currentpicture shifted (.7u,.09x_height); +endchar; + + +%----font dimensions----------------------------------------------------------- +font_slant slant; font_x_height x_height#; +% font_normal_space 6u#+2letter_fit#; +font_normal_space 4u#+2letter_fit#; +font_normal_stretch 3u#; font_normal_shrink 2u#; +font_quad 18u#+4letter_fit#; +font_extra_space 2u#; + +ligtable "f": "f" kern -.7u#; +ligtable "p": "f" kern +.5u#; + +bye. + diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf11.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf11.tfm Binary files differnew file mode 100644 index 00000000000..3919b043500 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf11.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf13.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf13.tfm Binary files differnew file mode 100644 index 00000000000..905fe834728 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf13.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf16.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf16.tfm Binary files differnew file mode 100644 index 00000000000..90ba8ca50fa --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf16.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf20.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf20.tfm Binary files differnew file mode 100644 index 00000000000..766e5ad1b23 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf20.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf24.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf24.tfm Binary files differnew file mode 100644 index 00000000000..21a03fe8c7f --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf24.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf29.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf29.tfm Binary files differnew file mode 100644 index 00000000000..3d0fbafe4a9 --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xadf29.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xppff10.tfm b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xppff10.tfm Binary files differnew file mode 100644 index 00000000000..a76a51cb9de --- /dev/null +++ b/Master/texmf-dist/fonts/tfm/public/musixtex-fonts/xppff10.tfm diff --git a/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf11.pfb b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf11.pfb Binary files differnew file mode 100644 index 00000000000..8ce16e3bccd --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf11.pfb diff --git a/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf13.pfb b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf13.pfb Binary files differnew file mode 100644 index 00000000000..9982f83e176 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf13.pfb diff --git a/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf16.pfb b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf16.pfb Binary files differnew file mode 100644 index 00000000000..669c62a7355 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf16.pfb diff --git a/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf20.pfb b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf20.pfb Binary files differnew file mode 100644 index 00000000000..243438fc9ff --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf20.pfb diff --git a/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf24.pfb b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf24.pfb Binary files differnew file mode 100644 index 00000000000..5a8241ba89b --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf24.pfb diff --git a/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf29.pfb b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf29.pfb Binary files differnew file mode 100644 index 00000000000..f36f3979659 --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xadf29.pfb diff --git a/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xppff10.pfb b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xppff10.pfb Binary files differnew file mode 100644 index 00000000000..19286194b2a --- /dev/null +++ b/Master/texmf-dist/fonts/type1/public/musixtex-fonts/xppff10.pfb |