From e936c3afb71edd4441dc0b3de298084d6a24db4d Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 16 May 2016 21:32:32 +0000
Subject: ptex-fonts (16may16), and more general (u)ptex(-fonts) exclusions

git-svn-id: svn://tug.org/texlive/trunk@41207 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/bin/check-files-by-format | 9 +--------
 Master/tlpkg/tlpsrc/fontspec.tlpsrc    | 2 +-
 Master/tlpkg/tlpsrc/ptex-fonts.tlpsrc  | 8 --------
 3 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'Master/tlpkg')

diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index 8a352d97405..3100a132a28 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -179,17 +179,13 @@ my $exclude_tfm = { '*base*' => 'texmf-dist/fonts/tfm',
   'public/cmcyr/' => 1,
   'public/dozenal/' => 1,	# wrote author 31oct12
   'public/gfsbodoni/' => 1,	# wrote author 12dec12
-  'public/japanese-otf-uptex/' => 1, # japanese tfm's
   'public/japanese-otf/' => 1,	# japanese tfm's
   'public/malayalam/' => 1,
   'public/mathdesign/mdici/' => 1,# 3jan16 author informed long ago, no release
   'public/mathdesign/mdpgd/' => 1,
   'public/mathdesign/mdpus/' => 1,
-  'uptex-fonts/jis/' => 1,
-  'uptex-fonts/min/' => 1,
   'public/wnri/' => 1,
   'public/wsuipa/' => 1,
-  'public/zhmetrics-uptex/' => 1, # 25apr16 jfm files
 };
 
 
@@ -218,9 +214,6 @@ my $exclude_vf = { '*base*' => 'texmf-dist/fonts/vf',
   'public/sansmathfonts/' => 2,	# 20may13 ok with cmssbx12.tfm from sauter
   'public/txfontsb/' => 1,
   'public/zefonts/' => 1,
-  'public/zhmetrics-uptex/' => 1, # 25apr16 jvf files
-  'uptex-fonts/jis/' => 1,	  # 16may16 japanese fonts, presumably
-  'uptex-fonts/min/' => 1,
   'vntex/comicsansvn/' => 1,
 };
 
@@ -272,7 +265,7 @@ sub get_file_list {
 
   # [u]ptex font files use their own formats; don't bother checking,
   # or adding lots of individual entries to the exclude lists.
-  @files = grep ($_ !~ m!/u?ptex/!, @files);
+  @files = grep ($_ !~ m![-/]u?ptex(-fonts)?/!, @files);
 
   # It takes a long time (about an hour) to check every file.  And there
   # is no value in checking unchanged files every day.  So we filter the
diff --git a/Master/tlpkg/tlpsrc/fontspec.tlpsrc b/Master/tlpkg/tlpsrc/fontspec.tlpsrc
index 10119ea0320..f5f8de25355 100644
--- a/Master/tlpkg/tlpsrc/fontspec.tlpsrc
+++ b/Master/tlpkg/tlpsrc/fontspec.tlpsrc
@@ -2,4 +2,4 @@ depend iftex
 depend kastrup
 depend l3kernel
 depend l3packages
-depend lm
+depend xunicode
diff --git a/Master/tlpkg/tlpsrc/ptex-fonts.tlpsrc b/Master/tlpkg/tlpsrc/ptex-fonts.tlpsrc
index 809c031ffa4..ca9b8e6f191 100644
--- a/Master/tlpkg/tlpsrc/ptex-fonts.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ptex-fonts.tlpsrc
@@ -1,10 +1,2 @@
 execute addKanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map
 execute addKanjiMap morisawa.map
-
-runpattern d texmf-dist/fonts/tfm/ptex
-runpattern d texmf-dist/fonts/vf/ptex
-runpattern d texmf-dist/fonts/source/ptex
-runpattern d texmf-dist/fonts/type1/ptex
-#
-docpattern d texmf-dist/doc/fonts/ptex
-docpattern d texmf-dist/doc/ptex/jvf
-- 
cgit v1.2.3