diff options
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/fonts/source/public/cm/calu.mf | 5 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/public/cm/greekl.mf | 10 | ||||
-rw-r--r-- | Master/texmf-dist/fonts/source/public/cm/symbol.mf | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/plain/base/gkpmac.tex | 43 | ||||
-rw-r--r-- | Master/texmf-dist/tex/plain/base/manmac.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/plain/base/plain.tex | 4 |
6 files changed, 50 insertions, 18 deletions
diff --git a/Master/texmf-dist/fonts/source/public/cm/calu.mf b/Master/texmf-dist/fonts/source/public/cm/calu.mf index 06657b8874c..da27f63f17e 100644 --- a/Master/texmf-dist/fonts/source/public/cm/calu.mf +++ b/Master/texmf-dist/fonts/source/public/cm/calu.mf @@ -79,10 +79,11 @@ beginchar("F",13.5u#,cap_height#,0); italcorr h#*slant+.5u#; adjust_fit(-.1w#,-u#); pickup cal.nib; x1=.5w; x3=.4w; lft x4=.1w; x5=x2+.35w; x6=.7[x1,x7]; rt x7=w; -top y1=top y6=h; z2=.5[z3,z1]+1.2bend; +top y1=top y6=h; z2=.5[z3,z1]+bend; bot y3=-o; y4=.1h; y5=y2; y7=.9h; draw flex(z1,z2,z3) softjoin (z3...{x4-x3,5(y4-y3)}z4); % stem -draw z1-flourish_change{up}...(z1-(u,0))---z6...{down}z7; % upper bar +draw z1-flourish_change+(0,.15asc_height){up}...{right}(z1-(2u,0)) + ---z6...{down}z7; % upper bar draw z2--z5--z5-(0,.1cap_curve); % middle bar math_fit(0,.5ic#); labels(1,2,3,4,5,6,7); endchar; diff --git a/Master/texmf-dist/fonts/source/public/cm/greekl.mf b/Master/texmf-dist/fonts/source/public/cm/greekl.mf index c8c11585ac5..823099f2aea 100644 --- a/Master/texmf-dist/fonts/source/public/cm/greekl.mf +++ b/Master/texmf-dist/fonts/source/public/cm/greekl.mf @@ -33,10 +33,10 @@ adjust_fit(0,0); pickup fine.nib; pos0(hair,180); pos1(hair,180); pos2(vair,90); pos3(.8[hair,stem],0); pos4(vair,-90); pos5(hair,-180); pos6(vair,-270); pos7(stem,-360); pos8(vair,-450); pos9(hair,-540); -x0=x1=x9; lft x0l=hround(1.5u-.5hair); x2=x4=x6=x8=.5w-.25u; +x0=x1=x9; lft x0r=hround(1.5u-.5hair); x2=x4=x6=x8=.5w-.25u; rt x3r=hround(w-1.75u); rt x7r=hround(w-u); rt x5l=hround(x4-u); bot y0=-d; y1=top y6r=x_height; top y2r=h+oo; y3=.5[y2,y4]; -y5=.5[y4,y6]; top y6r-bot y4r=vstem+eps; bot y8=-oo; y7=y9=.55[y6,y8]; +y5=.5[y4,y6]; top y6r-bot y4r=vstem+eps; bot y8r=-oo; y7=y9=.55[y6,y8]; if y6l<y4l: y6l:=y4l:=y5; fi filldraw stroke z0e---z1e...pulled_arc.e(2,3) & pulled_arc.e(3,4)...{up}z5e; % stem and upper bowl @@ -77,7 +77,7 @@ x4=x6=.5w+.5u; top y8r=x_height+oo; z4=z8; pos6(vair,-90); pos7(stem,-180); pos8(vair,-270); pos4(stem,angle(z4-z0)+90); pos5(stem,30); z3=.5[.5[z1,z4],z0]; -y5+.1x_height=y7=.5[y6,y8]; bot y6=-oo; +y5+.1x_height=y7=.5[y6,y8]; bot y6r=-oo; lft x7r=hround(1.4u-.5stem); rt x5r=hround(w-u); filldraw stroke z1e{z0-z1e}....z2e....z3e{(z0-z1)rotated 90} ...z4e{z4e-.8[z4,z0]} @@ -221,7 +221,7 @@ filldraw circ_stroke z4e{down}...{-36u,-h}z3e; % diagonal pickup tiny.nib; pos1(stem,0); pos2(stem,0); top y1=h+min(oo,serif_drop); bot y2=0; x1=x2=x3; z=((z4{down}...{-36u,-h}z3)intersectionpoint((x2r,0)--(x2r,h))); -filldraw z1l--z2l--z--z1r--cycle; % stem +filldraw z1l--z2l...(x3,y2l)...z--z1r--cycle; % stem sloped_serif.l(1,2,a,1/3,jut,serif_drop); % upper left serif math_fit(0,ic#-1/3x_height#*slant-.5u#); penlabels(1,2,3,4); endchar; @@ -323,7 +323,7 @@ adjust_fit(0,0); pickup fine.nib; numeric light_curve; light_curve=hround(.5[stem,curve]-2stem_corr); pos1(vair,90); pos2(light_curve,180); pos3(vair,270); pos4(light_curve,360); x1=x3=.5w; lft x2r=hround(1.5u-.5light_curve); x4=w-x2; -top y1=x_height+oo; y2=y4=.5[y1,y3]; bot y3=-oo; +top y1r=x_height+oo; y2=y4=.5[y1,y3]; bot y3r=-oo; filldraw stroke pulled_arc.e(1,2) & pulled_arc.e(2,3) & pulled_arc.e(3,4) & pulled_arc.e(4,1); % bowl pos5(hair,0); pos6(hair,0); x5=x6=.5w; top y5=h; bot y6=-d-oo; diff --git a/Master/texmf-dist/fonts/source/public/cm/symbol.mf b/Master/texmf-dist/fonts/source/public/cm/symbol.mf index 7a778624069..fd59d46546d 100644 --- a/Master/texmf-dist/fonts/source/public/cm/symbol.mf +++ b/Master/texmf-dist/fonts/source/public/cm/symbol.mf @@ -119,7 +119,7 @@ y1=y2=good.y h; y3=y4; .5[y1,y3]=.5[y5,y6]=math_axis; y5=good.y .3[y1,y3]; draw z1{x5-x1,2(y5-y1)}...z5{right}...z2{x2-x5,2(y2-y5)}; % upper bar draw z3{x6-x3,2(y6-y3)}...z6{right}...z4{x4-x6,2(y4-y6)}; % lower bar -labels(1,2,3,4); endchar; +labels(1,2,3,4,5,6); endchar; cmchar "Subset or equal to sign"; compute_spread(.45x_height#,.55x_height#); diff --git a/Master/texmf-dist/tex/plain/base/gkpmac.tex b/Master/texmf-dist/tex/plain/base/gkpmac.tex index cdcd7b9c087..1ae0f1a7a68 100644 --- a/Master/texmf-dist/tex/plain/base/gkpmac.tex +++ b/Master/texmf-dist/tex/plain/base/gkpmac.tex @@ -10,6 +10,7 @@ \font\textbf=cmbx10 % bold \font\textcsc=cccsc10 % caps and small caps \font\oldsty=ccmi10 % equation numbers +\font\twelvett=cmtt12 % Fonts for regular math % I'm setting \fontdimen2 to zero because AMS forgot to do it; @@ -405,15 +406,37 @@ \iftitle\hfil\copyrite\else\runhead\uppercase\expandafter{\chaptitle}\hfil\fi}} \def\rightheadline{\hbox to35pc{\iftitle\copyrite\fi\hfil \vbox to 10pt{}% strut to position the baseline - \runhead\uppercase\expandafter{\topmark}% + \iftitle\else\runhead\uppercase\expandafter{\topmark}\fi \rlap{\hfil\iftitle\rightcorner\else\foliofont\folio\fi\kern-2pc}}} -\def\leftcorner{\vrule\vbox to\folioht{\hrule width9pt\vfil}} -\def\rightcorner{\vbox to\folioht{\hrule width9pt\vfil}\vrule} +\def\leftcorner{\iffinal\else\vrule\vbox to\folioht{\hrule width9pt\vfil}\fi} +\def\rightcorner{\iffinal\else\vbox to\folioht{\hrule width9pt\vfil}\vrule\fi} \def\copyrite{\ifpreprint{\textfont2=\sevensy\sevenrm\copyright\ 1988 Addison-Wesley Publishing Company; all rights reserved}\fi} +\newdimen\htrimsize \htrimsize=7.5in +\newdimen\vtrimsize \vtrimsize=9.1875in +\newdimen\outermargin \outermargin=23mm +\newdimen\topmargin \topmargin=10mm % plus height of the headline box +\newbox\htrim \newbox\vtrim \newbox\trimmarks +\setbox\htrim=\hbox to\htrimsize{\kern-.65in + \vrule height .2pt depth .2pt width .4in\hfil\vrule width.4in\kern-.65in} + \wd\htrim=0pt +\setbox\vtrim=\vbox to\vtrimsize{\kern-.65in + \moveleft.2pt\hbox{\vrule height .4in}\vfil + \moveleft.2pt\hbox{\vrule height .4in}\kern-.65in} + \wd\vtrim=0pt +\setbox\trimmarks=\hbox to0pt{\raise\vtrimsize\copy\htrim \copy\htrim + \copy\vtrim \kern\htrimsize \copy\vtrim\hss} + \ht\trimmarks=0pt \dp\trimmarks=0pt + +\newif\iffinal % are we making the final copy? (pages.tex says "999") \def\onepageout#1{\escapechar=-1 % for writing \tabrefs - \shipout\vbox to\totheight{ % here we define one page of output + \shipout % here we define one page of output + \iffinal % add the trim marks + \hbox to\htrimsize{\copy\trimmarks + \ifodd\pageno\hss\else \hskip\outermargin\fi + \vbox to\vtrimsize{\kern\topmargin\fi + \vbox to\totheight{ \offinterlineskip % butt the boxes together \vbox to 2pc{ % this part goes on top of the regular pages \ifodd\pageno \rightheadline\else\leftheadline\fi @@ -424,6 +447,9 @@ \ifodd\pageno \hbox to35pc{\hfil\foliofont\folio} \else\hbox{\foliofont\folio}\fi\fi \ifpreprint\ifinxmode\makeinxfooter\fi\fi + \iffinal % finish the trimmed page + }\vfill}\ifodd\pageno\hskip\outermargin\else\hss\fi + \rlap{\smash{\lower30pt\hbox to.35in{\hss\twelvett\number\pageno}}}\fi } \advancepageno} @@ -851,8 +877,13 @@ {\endlinechar=-1\read\pages to\next \ifx\next\empty % in this case we should have eof now \else\global\nxtpg=\next\fi}\fi} -\ifeof\pages\else\message{OK, I'll ship only the requested pages!} - \getnxtpg\fi +\ifeof\pages\finalfalse\else\finaltrue + \getnxtpg +\ifnum\nxtpg=999 + \message{OK, I'm making final copy with trim marks!} + \hoffset=-.5in + \getnxtpg % this should ensure eof on the \pages file +\else\message{OK, I'll ship only the requested pages!}\fi\fi \def\shipout{\ifeof\pages\let\next=\Shipout \else\ifnum\pageno=\nxtpg\getnxtpg\let\next=\Shipout \else\let\next=\Tosspage\fi\fi \next} diff --git a/Master/texmf-dist/tex/plain/base/manmac.tex b/Master/texmf-dist/tex/plain/base/manmac.tex index d8678ab5070..63c064d1290 100644 --- a/Master/texmf-dist/tex/plain/base/manmac.tex +++ b/Master/texmf-dist/tex/plain/base/manmac.tex @@ -149,12 +149,12 @@ \def\titlepage{\global\titletrue} % for pages without headlines \def\rhead{} % \rhead contains the running headline -\def\leftheadline{\hbox to \pagewidth{% +\def\leftheadline{\hbox to \pagewidth{\spaceskip=0pt \vbox to 10pt{}% strut to position the baseline \llap{\tenbf\folio\kern1pc}% folio to left of text \tenit\rhead\hfil% running head flush left }} -\def\rightheadline{\hbox to \pagewidth{% +\def\rightheadline{\hbox to \pagewidth{\spaceskip=0pt \vbox to 10pt{}% strut to position the baseline \hfil\tenit\rhead\/% running head flush right \rlap{\kern1pc\tenbf\folio}% folio to right of text diff --git a/Master/texmf-dist/tex/plain/base/plain.tex b/Master/texmf-dist/tex/plain/base/plain.tex index 02d0523dd55..2b72027dff8 100644 --- a/Master/texmf-dist/tex/plain/base/plain.tex +++ b/Master/texmf-dist/tex/plain/base/plain.tex @@ -1228,7 +1228,7 @@ \def\loggingall{\tracingcommands\tw@\tracingstats\tw@ \tracingpages\@ne\tracingoutput\@ne\tracinglostchars\@ne \tracingmacros\tw@\tracingparagraphs\@ne\tracingrestores\@ne - \showboxbreadth\maxdimen\showboxdepth\maxdimen\errorstopmode} + \showboxbreadth\maxdimen\showboxdepth\maxdimen} \def\tracingall{\tracingonline\@ne\loggingall} \def\showhyphens#1{\setbox0\vbox{\parfillskip\z@skip\hsize\maxdimen\tenrm @@ -1238,4 +1238,4 @@ \nonfrenchspacing % punctuation affects the spacing \catcode`@=12 % at signs are no longer letters -\def\fmtname{plain}\def\fmtversion{3.14159265} % identifies the current format +\def\fmtname{plain}\def\fmtversion{3.141592653} % identifies the current format |