diff options
Diffstat (limited to 'Master/tlpkg/libexec')
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 612a1460e66..93e40490316 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1741,7 +1741,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'musixtex' => '&POSTmusixtex', 'musixtnt' => '&POSTmusixtnt', 'niceframe' => '&POST_rmsymlink', - 'novel' => '&POSTnovel', + 'novel' => '&POST_onelevel', 'numericplots' => '&POSTnumericplots', 'nwejm' => '&POSTnwejm', 'optex' => '&POSToptex', @@ -7239,21 +7239,6 @@ sub POSTmusixtnt { &SYSTEM ("$RM -rf windows"); } -sub POSTnovel { - print "POST$package - mv subdirs\n"; - # similar to onelevel, but the main tree has deep subdirs, - # so have to handle it separately. don't bother trying to generalize. - - my $srcdir = "fonts/opentype/$package"; - &rename_with_mkdir ($srcdir, "$DEST/$srcdir"); - - $srcdir = "tex/lualatex/$package"; - &rename_with_mkdir ($srcdir, "$DEST/$srcdir"); - - # move files in doc/ up to cwd. If there are clashes, will error out. - &xsystem ("$MV doc/* .") if -d "doc"; -} - sub POSTnumericplots { print "POST$package - mv latex subdir\n"; &SYSTEM ("$MV latex $DEST/tex/latex/$package"); @@ -7593,12 +7578,19 @@ sub POSTzhmetrics { # sub POST_onelevel { print "POST_onelevel ($package) - handle doc/source/tex directories\n"; - for my $dir ("source", "tex", "luatex") { + for my $dir ("opentype", "source", "tex", "lualatex", "luatex") { next unless -d $dir; # theoretically we should use $whichformat, $sourceformat, # but in practice they are always the same. - my $destdir = $dir eq "luatex" ? "tex" : $dir; - &rename_with_mkdir ($dir, "$DEST/$destdir/$whichdocformat/$package"); + my $format = $whichdocformat; + my $destdir = $dir; + if ($dir =~ /lua(la)?tex/) { + $destdir = "tex/$which"; + } elsif ($dir =~ /opentype/) { + $destdir = "fonts"; + $format = $dir; # but fonts tree is structured differently + } + &rename_with_mkdir ($dir, "$DEST/$destdir/$format/$package"); } # move files in doc/ up to cwd. If there are clashes, will error out. &xsystem ("$MV doc/* .") if -d "doc"; |