cluttex (9oct18)

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

4 files changed, 34 insertions, 8 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 58854ceace7..8b44455c8d9 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -154,7 +154,7 @@ my @TLP_working = qw(
     cite citeall citeref cje cjhebrew cjk cjk-gs-integrate cjk-ko cjkpunct
     classics classpack classicthesis
     cleanthesis clearsans clefval cleveref clipboard
-    clock cloze clrdblpg clrscode clrscode3e clrstrip
+    clock cloze clrdblpg clrscode clrscode3e clrstrip cluttex
     cm cm-lgc cm-mf-extra-bold cm-super cm-unicode
     cmap cmarrows cmbright cmcyr
     cmdstring cmdtrack cmexb cmextra cmll cmpica cmpj cmsd cmsrb cmtiup
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 689f3d5d961..663daf84076 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1300,6 +1300,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'apa6'                 => '&PREHOOK_apa6',
  'cals'                 => '&PREHOOK_cals',
  'chess'                => '&PREHOOK_chess',
+ 'cluttex'		=> '&PREHOOK_cluttex',
  'cm'			=> '&PREHOOK_cm',
  'cm-super'             => '&PREHOOK_cm_super',
  'cmextra'              => '&PREHOOK_cmextra',
@@ -2933,6 +2934,7 @@ $standardttf = '\.ttf|\.TTC';
  'checkcites'           => '\.lua$',
  'checklistings'        => '\.sh$',
  'cjk-gs-integrate'     => '\.pl$',
+ 'cluttex'		=> 'cluttex\.lua$', # moved by prehook.
  'convbkmk'             => '\.rb$',
  'crossrefware'		=> '\.pl$',
  'ctan-o-mat'		=> 'ctan-o-mat$',
@@ -3812,9 +3814,14 @@ sub doscripts {
         # Scripts with special cases.
         # xx should merge with bin_links in
         # Build/source/texk/texlive/linked_scripts/Makefile.am, sigh.
+        &SYSTEM ("ln -s $linkname $platdir/cllualatex")
+          if $linkname eq "cluttex"; # cluttex->cllualatex
+        &SYSTEM ("ln -s $linkname $platdir/clxelatex")
+          if $linkname eq "cluttex"; # cluttex->clxelatex
+        #
         &SYSTEM ("ln -s $linkname $platdir/r$linkname")
           if $linkname =~ /^(pdfcrop|epstopdf)$/; # rpdfcrop ->pdfcrop, ...
-
+        #
         &SYSTEM ("ln -s $linkname $platdir/latexdef")
           if $linkname eq "texdef"; # latexdef->texdef
 
@@ -3840,20 +3847,30 @@ sub doscripts {
           &SYSTEM ("$MV $s.bat.noMiKTeX $scriptsdir");
           # best to have wrapper also, maybe?
 
-        } elsif ($s eq "lua2dox_filter"   # package lua2dox
-                 || $s eq "ctan-o-mat") { # package ctan-o-mat
-          # handwritten .bat
-          &SYSTEM ("$MV $s.bat $platdir/");
+        } elsif ($s eq "cluttex.lua") {
+          # provided .bat
+          &SYSTEM ("$MV bin/cluttex.bat $platdir/");
+          # can't use our wrapper, I think, maybe copies will work.
+          &SYSTEM ("$CP $platdir/cluttex.bat $platdir/cllualatex.bat");
+          &SYSTEM ("$CP $platdir/cluttex.bat $platdir/clxelatex.bat");
+          &SYSTEM ("rmdir bin");
           next; # no wrapper
 
         } elsif ($s eq "latexindent.pl") {
           # provided .exe (made with par::packer)
           &SYSTEM ("$MV latexindent.exe $platdir/");
           next; # no wrapper
+
+        } elsif ($s eq "lua2dox_filter"   # package lua2dox
+                 || $s eq "ctan-o-mat") { # package ctan-o-mat
+          # handwritten .bat
+          &SYSTEM ("$MV $s.bat $platdir/");
+          next; # no wrapper
         }
 
-        # xx here too should merge with bin_links in
-        # Build/source/texk/texlive/linked_scripts/Makefile.am, sigh.
+        # xx here too, should merge with bin_links in
+        # Build/source/texk/texlive/linked_scripts/Makefile.am,
+        # or at least with above duplicated code.
         my $w32_wrapper = "$Build/$build_tldir/w32_wrapper/runscript.exe";
         &SYSTEM ("$CP $w32_wrapper $platdir/$linkname.exe");
         &SYSTEM ("$CP $w32_wrapper $platdir/r$linkname.exe")
@@ -5316,6 +5333,11 @@ sub PREHOOK_chess {
   &SYSTEM ("$RM -rf inputs pkfonts.zip");
 }
 
+sub PREHOOK_cluttex {
+  print "PREHOOK_$package - mv */cluttex for specialscripts\n";
+  &SYSTEM ("$MV bin/cluttex cluttex.lua");
+}
+
 sub PREHOOK_cm {
   print "PREHOOK_$package - remove cmex9.mf\n";
   &SYSTEM ("$RM cmex9.mf"); # because it's really an amsfonts file
diff --git a/Master/tlpkg/tlpsrc/cluttex.tlpsrc b/Master/tlpkg/tlpsrc/cluttex.tlpsrc
new file mode 100644
index 00000000000..e3b8d60755c
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/cluttex.tlpsrc
@@ -0,0 +1,3 @@
+binpattern f bin/${ARCH}/${PKGNAME}
+binpattern f bin/${ARCH}/cllualatex
+binpattern f bin/${ARCH}/clxelatex
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index 2f65fc52adb..be53753ceae 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -15,6 +15,7 @@ depend bibtexu
 depend bundledoc
 depend checklistings
 depend chktex
+depend cluttex
 depend ctan-o-mat
 depend ctan_chk
 depend ctanbib