summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/fontinstallationguide/README (renamed from Master/texmf-dist/doc/fonts/Type1fonts/README)0
-rw-r--r--Master/texmf-dist/doc/fonts/fontinstallationguide/examples.zip (renamed from Master/texmf-dist/doc/fonts/Type1fonts/examples.zip)bin17208 -> 17208 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/fontinstallationguide/fontinstallationguide.pdf (renamed from Master/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.pdf)0
-rw-r--r--Master/texmf-dist/doc/fonts/fontinstallationguide/fontinstallationguide.tex (renamed from Master/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.tex)0
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check3
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds8
-rw-r--r--Master/tlpkg/tlpsrc/Type1fonts.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/fontinstallationguide.tlpsrc0
-rw-r--r--Master/tlpkg/tlpsrc/scheme-gust.tlpsrc2
10 files changed, 6 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/fonts/Type1fonts/README b/Master/texmf-dist/doc/fonts/fontinstallationguide/README
index 2d454f7dd97..2d454f7dd97 100644
--- a/Master/texmf-dist/doc/fonts/Type1fonts/README
+++ b/Master/texmf-dist/doc/fonts/fontinstallationguide/README
diff --git a/Master/texmf-dist/doc/fonts/Type1fonts/examples.zip b/Master/texmf-dist/doc/fonts/fontinstallationguide/examples.zip
index e8231626eb7..e8231626eb7 100644
--- a/Master/texmf-dist/doc/fonts/Type1fonts/examples.zip
+++ b/Master/texmf-dist/doc/fonts/fontinstallationguide/examples.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.pdf b/Master/texmf-dist/doc/fonts/fontinstallationguide/fontinstallationguide.pdf
index 9285bbd9d09..9285bbd9d09 100644
--- a/Master/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.pdf
+++ b/Master/texmf-dist/doc/fonts/fontinstallationguide/fontinstallationguide.pdf
diff --git a/Master/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.tex b/Master/texmf-dist/doc/fonts/fontinstallationguide/fontinstallationguide.tex
index fe9cb0f6af9..fe9cb0f6af9 100644
--- a/Master/texmf-dist/doc/fonts/Type1fonts/fontinstallationguide.tex
+++ b/Master/texmf-dist/doc/fonts/fontinstallationguide/fontinstallationguide.tex
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 5b3eec2d226..bf4d976966c 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -20,7 +20,6 @@ our %OPT;
my @TLP_working = qw(
12many 2up
- Type1fonts
a0poster a2ping a4wide a5comb
aaai-named aalok aastex abbr abc abnt abntex2 abraces abstract abstyles
academicons accanthis accents accessibility accfonts accsupp achemso
@@ -326,7 +325,7 @@ my @TLP_working = qw(
foekfont foilhtml foliono fonetika
font-change font-change-xetex
fontawesome fontawesome5 fontaxes fontbook fontch fontinst
- fontmfizz fontools
+ fontinstallationguide fontmfizz fontools
fonts-churchslavonic fonts-tlwg
fontsetup fontsize fontspec fonttable fontwrap
footbib footmisc footmisx footnotebackref footnotehyper
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f468b7bc9e5..a690ed6f974 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -75,10 +75,11 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'TOPtesi', "die 'skipping, use toptesi'",
'TeXemplar', "die 'skipping, use texemplar'",
'TeXmacs', "die 'skipping, binary'",
+ 'Type1fonts', "die 'skipping, use fontinstallationguide'",
'2up', "&MAKEflatten",
'a4', "die 'skipping, just a pointer to ntgclass'",
'aastex', "&MAKEflatten",
- 'accenti', "die 'skipping, use bosisio instead'",
+ 'accenti', "die 'skipping, use bosisio'",
'acmtrans', "die 'skipping, nonfree (nosell) license'",
'acroflex', "die 'skipping, per author (dps) request'",
'acromake', "die 'skipping, nonfree (nomodify) license'",
@@ -523,7 +524,6 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'fontawesome', "&MAKEflatten",
'fontawesome5', "&MAKEflatten",
'fontinst', "&MAKEfontinst",
- 'fontinstallationguide', "die 'skipping, use Type1fonts'",
'fontloader-luaotfload', "die 'skipping, obsolete 29sep18'",
'fontname', "die 'skipping, done through tl-update-auto'",
'fontsetup', "&MAKEflatten",
@@ -2324,9 +2324,6 @@ $standardtex
%specialdocfmt = (
-# 'Asana-Math', 'fonts',
- 'FAQ-en', 'generic',
- 'Type1fonts', 'fonts',
'a2ping', 'support',
'abbr', 'generic',
'abstyles', 'bibtex',
@@ -2421,6 +2418,7 @@ $standardtex
'fltpoint', 'generic',
'font-change-xetex', 'xetex',
'fontch', 'plain',
+ 'fontinstallationguide','fonts',
'fontools', 'support',
'fourier', 'fonts',
'fouriernc', 'fonts',
diff --git a/Master/tlpkg/tlpsrc/Type1fonts.tlpsrc b/Master/tlpkg/tlpsrc/Type1fonts.tlpsrc
deleted file mode 100644
index 91a60b3a5a6..00000000000
--- a/Master/tlpkg/tlpsrc/Type1fonts.tlpsrc
+++ /dev/null
@@ -1 +0,0 @@
-catalogue fontinstallationguide
diff --git a/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
index 3cf8166d2d1..8565df74c7c 100644
--- a/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
@@ -7,7 +7,6 @@ depend collection-basic
depend hyphen-english
#
depend MemoirChapStyles
-depend Type1fonts
depend amiweb2c-guide
depend amscls-doc
depend amslatex-primer
@@ -20,6 +19,7 @@ depend dickimaw
depend docsurvey
depend dtxtut
depend first-latex-doc
+depend fontinstallationguide
depend forest-quickstart
depend gentle
depend guide-to-latex
diff --git a/Master/tlpkg/tlpsrc/fontinstallationguide.tlpsrc b/Master/tlpkg/tlpsrc/fontinstallationguide.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/fontinstallationguide.tlpsrc
diff --git a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
index f17e9a2d6e4..7b0973cf1fa 100644
--- a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
@@ -3,7 +3,6 @@ shortdesc GUST TeX Live scheme
longdesc This is the GUST TeX Live scheme: it is a set of files sufficient
longdesc to typeset Polish plain TeX, LaTeX and ConTeXt documents in
longdesc PostScript or PDF.
-depend Type1fonts
depend amslatex-primer
depend amstex
depend antt
@@ -14,6 +13,7 @@ depend concrete
depend cyklop
depend dvidvi
depend dviljk
+depend fontinstallationguide
depend gustprog
depend impatient
depend iwona