summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/latex-fonts/README11
-rw-r--r--Master/texmf-dist/doc/fonts/latex-fonts/legal.txt (renamed from Master/texmf-dist/fonts/source/public/latex-fonts/legal.txt)14
-rw-r--r--Master/texmf-dist/fonts/source/public/latex-fonts/lcircle.mf550
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check3
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
5 files changed, 15 insertions, 564 deletions
diff --git a/Master/texmf-dist/doc/fonts/latex-fonts/README b/Master/texmf-dist/doc/fonts/latex-fonts/README
new file mode 100644
index 00000000000..e6809b41e90
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/latex-fonts/README
@@ -0,0 +1,11 @@
+This is a bundle of miscellaneous fonts, provided (as MetaFont source
+and as TeX font metrics) for users of LaTeX.
+
+Additional fonts, which used to be distributed here, are now part of
+the amsfonts distribution -- see directory CTAN:/fonts/amsfonts
+
+The amsfonts distribution also contains Adobe Type 1 versions of the
+fonts in this distribution.
+
+Robin Fairbairns
+For the LaTeX and CTAN teams
diff --git a/Master/texmf-dist/fonts/source/public/latex-fonts/legal.txt b/Master/texmf-dist/doc/fonts/latex-fonts/legal.txt
index bc50ae84058..64ada224e3a 100644
--- a/Master/texmf-dist/fonts/source/public/latex-fonts/legal.txt
+++ b/Master/texmf-dist/doc/fonts/latex-fonts/legal.txt
@@ -19,19 +19,7 @@ limited to) TFM, AFM, GF, PK, PFA, PFB and TTF, is also granted. The
copyright holder applies no restrictions to the use of these fonts in
documents, however published.
-(For other fonts, distributed via this directory, please refer to the
-licence statement of the copyright holder, the American Mathematical
-Society. These fonts are:
-
- cmbsy5.mf cmbsy8.mf cmcsc9.mf cmex9.mf cmmib7.mf
- cmbsy6.mf cmbsy9.mf cmex7.mf cmmib5.mf cmmib8.mf
- cmbsy7.mf cmcsc8.mf cmex8.mf cmmib6.mf cmmib9.mf
-
-They are part of the AMSfonts collections, see
-
- http://www.ams.org/tex/amsfonts.html
-)
-
May 2002, Robin Fairbairns, for the LaTeX Team.
+(Edited Jun 2009, Robin Fairbairns)
latex-team@latex-project.org
diff --git a/Master/texmf-dist/fonts/source/public/latex-fonts/lcircle.mf b/Master/texmf-dist/fonts/source/public/latex-fonts/lcircle.mf
deleted file mode 100644
index 1d0fa48c076..00000000000
--- a/Master/texmf-dist/fonts/source/public/latex-fonts/lcircle.mf
+++ /dev/null
@@ -1,550 +0,0 @@
-fontdimen 1: 0,0,0,0,0,0,0,thickness#;
-font_coding_scheme:="LaTeX circle";
-
-let cmchar=\; % cmchar should precede each character, for testing purposes
-
-thickness:=ceiling(thickness#*hppp); % the way rules thicknesses are done
-% thickness#:=thickness/hppp; % and let thickness# round to right value
-% NO, I deleted this BAD line! --- DEK, 9 Jul 87
-pickup pencircle scaled thickness; nib:=savepen;
-
-% arcs sets up the points 1, 2, ..., 8 as follows:
-%
-% |1
-% |*
-% * *
-% 8| 2
-% * | *
-% 7* | *3
-% --*-----*--
-% 6| 4
-% * *
-% |5
-%
-% <----w---->
-
-pair upleft,upright,downleft,downright;
-upright=-downleft=(1,1); downright=-upleft=(1,-1);
-
-% a quarter-circle has width, height and depth set as explained on
-% page 389 of the TeXbook, not the real width, height, and depth
-
-def qbeginchar (expr c, diam_sharp) =
-numeric hh, dd; hh:=.5*(diam_sharp+thickness#);
-dd:=.5*(diam_sharp-thickness#);
-beginchar(c,diam_sharp,hh,dd);
-enddef;
-
-def arcs =
-numeric delta;
-delta:=.5 round((1-sqrt.5)*w); % distance from axis to arc's 45 degree points
-bot y3=0; y7=y3=.5[y5,y1]; y1-y5=w;
-lft x1=0; x5=x1=.5[x7,x3]; x3-x7=w;
-x2-x1=delta; x1-x8=delta; x8=x6; x2=x4;
-y8-y7=delta; y7-y6=delta; y8=y2; y6=y4;
-enddef;
-
-cmchar "2pt, top right";
-qbeginchar(0,4pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "2pt, bottom right";
-qbeginchar(1,4pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "2pt, bottom left";
-qbeginchar(2,4pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "2pt, top left";
-qbeginchar(3,4pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "4pt, top right";
-qbeginchar(4,8pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "4pt, bottom right";
-qbeginchar(5,8pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "4pt, bottom left";
-qbeginchar(6,8pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "4pt, top left";
-qbeginchar(7,8pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "6pt, top right";
-qbeginchar(8,12pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "6pt, bottom right";
-qbeginchar(9,12pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "6pt, bottom left";
-qbeginchar(10,12pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "6pt, top left";
-qbeginchar(11,12pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "8pt, top right";
-qbeginchar(12,16pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "8pt, bottom right";
-qbeginchar(13,16pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "8pt, bottom left";
-qbeginchar(14,16pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "8pt, top left";
-qbeginchar(15,16pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "10pt, top right";
-qbeginchar(16,20pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "10pt, bottom right";
-qbeginchar(17,20pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "10pt, bottom left";
-qbeginchar(18,20pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "10pt, top left";
-qbeginchar(19,20pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "12pt, top right";
-qbeginchar(20,24pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "12pt, bottom right";
-qbeginchar(21,24pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "12pt, bottom left";
-qbeginchar(22,24pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "12pt, top left";
-qbeginchar(23,24pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "14pt, top right";
-qbeginchar(24,28pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "14pt, bottom right";
-qbeginchar(25,28pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "14pt, bottom left";
-qbeginchar(26,28pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "14pt, top left";
-qbeginchar(27,28pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "16pt, top right";
-qbeginchar(28,32pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "16pt, bottom right";
-qbeginchar(29,32pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "16pt, bottom left";
-qbeginchar(30,32pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "16pt, top left";
-qbeginchar(31,32pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "18pt, top right";
-qbeginchar(32,36pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "18pt, bottom right";
-qbeginchar(33,36pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "18pt, bottom left";
-qbeginchar(34,36pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "18pt, top left";
-qbeginchar(35,36pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-cmchar "20pt, top right";
-qbeginchar(36,40pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z7{right}..z6{downright}..z5{down};
-endchar;
-
-cmchar "20pt, bottom right";
-qbeginchar(37,40pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z1{down}..z8{downleft}..z7{left};
-endchar;
-
-cmchar "20pt, bottom left";
-qbeginchar(38,40pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z3{left}..z2{upleft}..z1{up};
-endchar;
-
-cmchar "20pt, top left";
-qbeginchar(39,40pt#);
-numeric delta;
-pickup nib;
-arcs;
-draw z5{up}..z4{upright}..z3{right};
-endchar;
-
-% The full circles have height and depth 0pt because otherwise there
-% are too many heights and depths for the TFM files
-
-cmchar "1pt, circle";
-beginchar(96,1pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "2pt, circle";
-beginchar(97,2pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "3pt, circle";
-beginchar(98,3pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "4pt, circle";
-beginchar(99,4pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "5pt, circle";
-beginchar(100,5pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "6pt, circle";
-beginchar(101,6pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "7pt, circle";
-beginchar(102,7pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "8pt, circle";
-beginchar(103,8pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "9pt, circle";
-beginchar(104,9pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "10pt, circle";
-beginchar(105,10pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "11pt, circle";
-beginchar(106,11pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "12pt, circle";
-beginchar(107,12pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "13pt, circle";
-beginchar(108,13pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "14pt, circle";
-beginchar(109,14pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "15pt, circle";
-beginchar(110,15pt#,0pt#,0pt#);
-pickup nib;
-draw fullcircle scaled w;
-endchar;
-
-cmchar "1pt, blob";
-beginchar(112,1pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "2pt, blob";
-beginchar(113,2pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "3pt, blob";
-beginchar(114,3pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "4pt, blob";
-beginchar(115,4pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "5pt, blob";
-beginchar(116,5pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "6pt, blob";
-beginchar(117,6pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "7pt, blob";
-beginchar(118,7pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "8pt, blob";
-beginchar(119,8pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "9pt, blob";
-beginchar(120,9pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "10pt, blob";
-beginchar(121,10pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "11pt, blob";
-beginchar(122,11pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "12pt, blob";
-beginchar(123,12pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "13pt, blob";
-beginchar(124,13pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "14pt, blob";
-beginchar(125,14pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-cmchar "15pt, blob";
-beginchar(126,15pt#,0pt#,0pt#);
-pickup pencircle scaled w;
-drawdot origin;
-endchar;
-
-bye
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index b520af2dc82..e840846420c 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -232,7 +232,7 @@ my @TLP_working = qw(
l2picfaq l2tabu l2tabu-english l2tabu-french l2tabu-italian l2tabu-spanish
l3kernel l3packages l3experimental
labbook labelcas labels langcode lapdf lastpage
- latex latex-bib-ex latex-course latex-doc-ptr
+ latex latex-bib-ex latex-course latex-doc-ptr latex-fonts
latex-graphics-companion latex-web-companion latex-notes-zh-cn
latex-referenz latex-tabellen
latex-tds latex-veryshortguide
@@ -539,6 +539,7 @@ my @TLP_no_check = (
"patgen", # binary
"pdftex", # binary
"pdftools", # binary
+ "pdfwin", # not on CTAN, too old to worry about
"powerdot", # stale generated files on CTAN
"ps2pkm", # binary
"pst-ghsb", # not on CTAN, replaced by pst-slpe, keep for compat
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 55d1981180d..4dfe0b69ffa 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -511,6 +511,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'labtable', "die 'skipping, nonfree w32 application'",
'lastbib', "die 'skipping, nonfree'",
'latex_maker', "die 'skipping, ruby'",
+ 'latex-fonts', "&MAKEflatten",
'latex-help-texinfo', "die 'skipping, use latex2e-help-texinfo'",
'latex-make', "die 'skipping, subprograms seem problematic'",
'latex-pro-pragmatiky', "die 'skipping, no source'",