musixtex-fonts 10-26-2011 (27oct11)

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

5 files changed, 18 insertions, 15 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 1a851ff1336..21456dfa831 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -264,7 +264,8 @@ my @TLP_working = qw(
     moreverb morewrites movie15 mp3d mparhack mpcolornames mpgraphics
     mpman-ru ms msc msg mslapa msu-thesis mtgreek
     multenum multibbl multibib multicap multirow
-    multido multiobjective munich musixguit musixtex musuos muthesis
+    multido multiobjective munich musixguit
+    musixtex musixtex-fonts musuos muthesis
     mversion mwcls mxedruli
     mychemistry mylatexformat
   nag namespc natbib nath nature navigator ncclatex ncctools
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2b6ab85de75..8f0c24f458b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -932,6 +932,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'ibygrk'		=> '&PREHOOK_ibygrk',
  'mathspic'		=> '&PREHOOK_mathspic',
  'musixtex'		=> '&PREHOOK_musixtex',
+ 'musixtex-fonts'	=> '&PREHOOK_unzip',
  'mp3d'			=> '&PREHOOK_mp3d',
  'pictex'		=> '&PREHOOK_pictex',
  'skb'			=> '&PREHOOK_flatten1',
@@ -1208,6 +1209,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'msg',		'-msg\.tex|' . $standardtex,
  'msu-thesis',	'gb4e-compat\.tex|' . $standardtex,
  'multirow',	'^..[^s].*\.sty', # not miscdoc.sty
+ 'musixtex',	'NULL',		  # leave musixdoc.sty
  'mylatexformat',	'.*\.ltx',
  'nag',		'\.nag|' . $standardtex,
  'navigator',	'(t-)?navigator.tex|' . $standardtex,
@@ -3024,8 +3026,7 @@ sub MAKEunzipandflatten {
  &donormal;
 }
 
-sub MAKEnosymlinks
-{
+sub MAKEnosymlinks {
   &setup;
   &xchdir ("$DEST/doc/$whichdocformat/$package");
 
@@ -3053,8 +3054,7 @@ sub MAKEnosymlinks
 # add in: tlpkg/tlpsrc/collection-langwhatever.tlpsrc
 #   (must be done by hand)
 # 
-sub GENMAKEhyphenation
-{
+sub GENMAKEhyphenation {
  my ($langname,$langabbrev,$hyphfile) = @_;
  &setup;
  &buildfilelist;
@@ -3076,13 +3076,11 @@ sub GENMAKEhyphenation
  print "YOU-MUST-DO! $package: add to collection-langwhatever.tpm\n";
 }
 
-sub MAKEcbcoptic
-{
+sub MAKEcbcoptic {
   &GENMAKEhyphenation ("coptic", "cop", "copthyph.tex");
 }
 
-sub MAKEibycusbabel
-{
+sub MAKEibycusbabel {
   &GENMAKEhyphenation ("ibycus", "iby", "ibyhyph.tex");
 }
 
@@ -3260,8 +3258,7 @@ sub MAKEgermbib {
   &MAKEflatten ();
 }
 
-sub MAKEgnu_freefont
-{
+sub MAKEgnu_freefont {
   &xchdir ($packagedir);
   # two tarballs and one zip file with a common top-level dir name.
   # do the zip first to avoid overwrite questions.
@@ -4274,9 +4271,7 @@ sub PREHOOK_mp3d {
 
 sub PREHOOK_musixtex {
   # must unzip first so we can find the scripts.
-  print "PREHOOK_$package - unzip, man\n";
-  &xchdir ($DEST);
-  &SYSTEM ("unzip -q doc/generic/$package/$package-texmf.zip");
+  &PREHOOK_unzip ();
   #
   my $mandest = "$TOPDEST/texmf/doc/man/man1/";
   &xmkdir ($mandest);
@@ -4295,6 +4290,12 @@ sub PREHOOK_suftesi {
   &SYSTEM ("$MV doc/* latex/* .");
 }
 
+sub PREHOOK_unzip {
+  # for musixtex-fonts - could be a post hook, but keep them together.
+  print "PREHOOK_unzip - $package\n";
+  &SYSTEM ("unzip -q -d $DEST *.zip && $RM *.zip");
+}
+
 sub PREHOOK_vhistory {
   print "PREHOOK_$package - rm dup file\n";
   &SYSTEM ("$RM doc/sets.sty");
diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
index 11f7d41326e..351c756fe5e 100644
--- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
@@ -8,5 +8,6 @@ depend guitar
 depend harmony
 depend musixguit
 depend musixtex
+depend musixtex-fonts
 depend songbook
 depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/musixtex-fonts.tlpsrc b/Master/tlpkg/tlpsrc/musixtex-fonts.tlpsrc
new file mode 100644
index 00000000000..0b1082790aa
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/musixtex-fonts.tlpsrc
@@ -0,0 +1 @@
+execute addMixedMap musix.map
diff --git a/Master/tlpkg/tlpsrc/musixtex.tlpsrc b/Master/tlpkg/tlpsrc/musixtex.tlpsrc
index f887de5ebff..11064560623 100644
--- a/Master/tlpkg/tlpsrc/musixtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/musixtex.tlpsrc
@@ -1,4 +1,3 @@
-execute addMixedMap musix.map
 binpattern f bin/${ARCH}/musixflx
 binpattern f bin/${ARCH}/musixtex
 docpattern +f texmf/doc/man/man1/musix*