xindex (2dec18)

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

4 files changed, 9 insertions, 2 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 5a19d4e5425..8f388b4bf55 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -720,7 +720,7 @@ my @TLP_working = qw(
     xetex-devanagari xetex-itrans xetex-pstricks xetex-tibetan
     xetexfontinfo xetexko
     xetexref xevlna xfakebold xfor xgreek xhfill
-    xifthen xii xii-lat xint xits
+    xifthen xii xii-lat xindex xint xits
     xkeyval xlop xltabular xltxtra xmltex xmpincl xnewcommand
     xoptarg xpatch xpeek xpiano xpicture xpinyin xprintlen xpunctuate
     xq xsavebox xsim xskak xstring xtab xtuthesis xunicode xurl
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 84b43132491..131250a177b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1268,7 +1268,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'xetex-pstricks',"&MAKEcopy",
  'xfakebold',	"&MAKEflatten",
  'xfrac',       "die 'skipping, use mh (I think)'",
- 'xindex',	"&MAKEflatten",
  'xindy-persian',"die 'skipping, do by hand in /texmf-dist/xindy/modules/lang/persian: too painful to preserve rest of xindy'",
  'xinitials',   "die 'skipping, will be in xpackages when ready (Morten says)'",
  'xits',        "&MAKEflatten",
@@ -1356,6 +1355,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'wsuipa'               => '&PREHOOK_wsuipa',
  'yathesis'		=> '&PREHOOK_flatten1',
  'xepersian'            => '&PREHOOK_flatten1',
+ 'xindex'               => '&PREHOOK_flatten1',
  'xsim'                 => '&PREHOOK_xsim',
 );
 
@@ -1577,6 +1577,7 @@ $standarddest = "texmf-dist";
  'xetexfontinfo',       'xetex',
  'xetexko',             'xetex',
  'xevlna',              'xelatex',
+ 'xindex',              'lualatex',
  'xint',                'generic',
  'xltxtra',             'xelatex',
  'xstring',             'generic',
@@ -1994,6 +1995,7 @@ $standardtex
  'xetexfontinfo','\.tex',
  'xetexko',     '\.tab$|' . $standardtex,
  'xwatermark',  '\.sty',                # no .cfg
+ 'xindex',      'xindex-.*\.lua$|' . $standardtex,
  'xlop',        'xlop\.(tex|sty)',      # no manual.sty
  'xstring',     'xstring\.tex|' . $standardtex,
  'yathesis',    '\.(sty|cls)$',         # no .cfg
@@ -2252,6 +2254,7 @@ $standardtex
  'xetexko',             'xetex',
  'xetexref',            'xetex',
  'xevlna',              'xelatex',
+ 'xindex',		'lualatex',
  'xint',                'generic',
  'xltxtra',             'xelatex',
  'xq',                  'fonts',
@@ -2455,6 +2458,7 @@ $standardsource = '(\.(bat|c|drv|dtx|fea|fdd|ins|sfd)'
  'translation-tabbing-fr',      'NULL',         # doc
  'tkz-orm',             'NULL',                 # no gain ...
  'velthuis',		'NULL',
+ 'xindex',		'NULL',
  'xlop',                'manual.sty|' . $standardsource,
 );
 
@@ -3042,6 +3046,7 @@ $standardttf = '\.ttf|\.TTC';
  'vpe'                  => '\.pl$',
  'wordcount'		=> '\.sh$',
  'wheretotrim'          => '\.pl$',
+ 'xindex'		=> 'xindex\.lua$',
  'yplan'                => 'yplan$',
 );
 
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index ece04c68cab..d60a6a17bab 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -94,4 +94,5 @@ depend tlshell
 depend tpic2pdftex
 depend typeoutfileinfo
 depend web
+depend xindex
 depend xindy
diff --git a/Master/tlpkg/tlpsrc/xindex.tlpsrc b/Master/tlpkg/tlpsrc/xindex.tlpsrc
new file mode 100644
index 00000000000..dca338c719c
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/xindex.tlpsrc
@@ -0,0 +1 @@
+binpattern f bin/${ARCH}/${PKGNAME}