font-change-xetex (8apr16)

git-svn-id: svn://tug.org/texlive/trunk@40404 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 10 insertions, 3 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 5b421c39151..bb586509251 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -252,7 +252,7 @@ my @TLP_working = qw(
     fmp fmtcount
     fn2end fnbreak fncychap fncylab fnpara fnpct fntproof fnumprint
     foekfont foilhtml fonetika
-    fontawesome font-change fontaxes fontbook fontch fontinst
+    fontawesome font-change font-change-xetex fontaxes fontbook fontch fontinst
     fontmfizz fontools
     fonts-tlwg fontspec fonttable fontwrap
     footbib footmisc footnotebackref footnoterange footnpag
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 4e58670b3ed..2002a872e06 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -425,7 +425,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'fnlineno',    "die 'skipping, use lineno'",
  'foiltex',     "die 'skipping, nosell license'",
  'font-change', "&MAKEflatten",
- 'font-change-xetex', "&MAKEflatten",
  'fontawesome', "&MAKEflatten",
  'fontinst',    "&MAKEfontinst",
  'fontinstallationguide', "die 'skipping, use Type1fonts'",
@@ -1172,6 +1171,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'dynblocks'            => '&PREHOOK_flatten1',
  'enctex',		=> '&PREHOOK_flatten1',
  'fixme'                => '&PREHOOK_fixme',
+ 'font-change-xetex'    => '&PREHOOK_flatten1',
  'fontools'             => '&PREHOOK_fontools',
  'gothic'		=> '&PREHOOK_gothic',
  'grotesq'		=> '&PREHOOK_unzip',
@@ -1233,6 +1233,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'eplain'               => '&POSTeplain',
  'epspdf'               => '&POSTepspdf',
  'fixme'                => '&POSTfixme',
+ 'font-change-xetex'	=> '&POSTfont_change_xetex',
  'fpl'                  => '&POSTfpl',
  'frenchle'             => '&POST_rmsymlink',
  'ghsystem'             => '&POSTghsystem',
@@ -1518,7 +1519,6 @@ $standardtex='\.(.bx|code\.tex|cfg|sty|clo|ldf|cls|def|fd|fontspec|cmap|4ht)$';
  'fltpoint',    '\.sty|\.tex',
  'fntproof',    'fntproof.tex',
  'font-change', 'default-amssymbols.tex|font_.*\.tex',
- 'font-change-xetex', 'font.*\.tex',
  'fontawesome',	'fontawesomesymbols-.*\.tex|' . $standardtex,
  'fontch',      '\.tex',
  'footnpag',    'footnpag\.sty',
@@ -1869,6 +1869,7 @@ $standardtex='\.(.bx|code\.tex|cfg|sty|clo|ldf|cls|def|fd|fontspec|cmap|4ht)$';
  'fig4latex',           'support',
  'findhyph',            'support',
  'fltpoint',            'generic',
+ 'font-change-xetex',	'xetex',
  'fontch',              'plain',
  'fontools',            'support',
  'fourier',             'fonts',
@@ -5612,6 +5613,11 @@ sub POSTfontools {
   &tl_man_to_pdf ();
 }
 
+sub POSTfont_change_xetex {
+  print "POST$package - move .tex, collision with doc source\n";
+  &mv_with_mkdir ("macros/*", "$DEST/tex/xetex/$package/");
+}
+
 sub POSTfpl {
   print "POST$package - rename README.source\n";
   &SYSTEM ("$MV README.source $DEST/source/fonts/fpl/README");
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index b97e736754e..1a862476806 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -12,6 +12,7 @@ depend bidipagegrid
 depend bidishadowtext
 depend bidipresentation
 depend fixlatvian
+depend font-change-xetex
 depend fontbook
 depend fontwrap
 depend interchar
diff --git a/Master/tlpkg/tlpsrc/font-change-xetex.tlpsrc b/Master/tlpkg/tlpsrc/font-change-xetex.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/font-change-xetex.tlpsrc