summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds10
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/fontsetup.tlpsrc0
3 files changed, 11 insertions, 0 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index bc171c75b63..e607fc52147 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -488,6 +488,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'fontinstallationguide', "die 'skipping, use Type1fonts'",
'fontloader-luaotfload', "die 'skipping, obsolete 29sep18'",
'fontname', "die 'skipping, done through tl-update-auto'",
+ 'fontsetup', "&MAKEflatten",
'fontools', "&MAKEflatten",
'fonts-arundina', "die 'skipping, depends on uninstalled thailatex'",
'fonts-churchslavonic',"&MAKEflatten",
@@ -1476,6 +1477,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'epspdf' => '&POSTepspdf',
'fixme' => '&POSTfixme',
'font-change-xetex' => '&POSTfont_change_xetex',
+ 'fontsetup' => '&POSTfontsetup',
'formation-latex-ul' => '&POSTformation_latex_ul',
'fpl' => '&POSTfpl',
'frenchle' => '&POST_rmsymlink',
@@ -3002,6 +3004,7 @@ $standardofm='\.ofm';
$standardotf='\.(otf|woff2?)$';
%specialotf = (
'cm-unicode' => '^[^.]*\.otf', # not Fontmap.CMU.otf
+ 'fontsetup' => 'NULL', # intended for system installation
);
$standardotp='\.otp';
@@ -3309,6 +3312,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
'exceltex' => 'manpage.pdf', # no source
'facture' => 'issue7.pdf', # no source
'flacards' => 'flacards.pdf', # no source
+ 'fontsetup' => 'cambria|lucida|minion|msgaramond', # nonfree
'gfsartemisia' => 'A*Specimen.pdf', # no source
'gfsbaskerville'=> 'B*Specimen.pdf', # no source
'gfsbodoni' => 'B*Specimen.pdf', # no source
@@ -6207,6 +6211,12 @@ sub POSTfont_change_xetex {
&mv_with_mkdir ("macros/*", "$DEST/tex/xetex/$package/");
}
+sub POSTfontsetup {
+ print "POST$package - restore system-install-fonts dir\n";
+ # because we flattened it to get the doc files. Six of one ...
+ &mv_with_mkdir ("*.otf", "system-install-fonts");
+}
+
sub POSTformation_latex_ul {
print "POST$package - move source subdir, doc/* files\n";
&SYSTEM ("$MV source $DEST/source/latex/$package");
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 42c092d696b..2ab5c93f0c7 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -471,6 +471,7 @@ depend fnpct
depend fnumprint
depend foilhtml
depend fontaxes
+depend fontsetup
depend fonttable
depend footmisc
depend footmisx
diff --git a/Master/tlpkg/tlpsrc/fontsetup.tlpsrc b/Master/tlpkg/tlpsrc/fontsetup.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/fontsetup.tlpsrc