multibibliography fix script location, bin links

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

22 files changed, 20 insertions, 155 deletions

diff --git a/Master/bin/alpha-linux/multibibliography b/Master/bin/alpha-linux/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/alpha-linux/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/multibibliography b/Master/bin/amd64-freebsd/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/amd64-freebsd/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/multibibliography b/Master/bin/amd64-kfreebsd/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/amd64-kfreebsd/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/multibibliography b/Master/bin/amd64-netbsd/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/amd64-netbsd/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/armel-linux/multibibliography b/Master/bin/armel-linux/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/armel-linux/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/armhf-linux/multibibliography b/Master/bin/armhf-linux/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/armhf-linux/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/multibibliography b/Master/bin/i386-freebsd/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/i386-freebsd/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/multibibliography b/Master/bin/i386-kfreebsd/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/i386-kfreebsd/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/multibibliography b/Master/bin/i386-linux/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/i386-linux/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/multibibliography b/Master/bin/i386-netbsd/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/i386-netbsd/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/multibibliography b/Master/bin/i386-solaris/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/i386-solaris/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/mips-irix/multibibliography b/Master/bin/mips-irix/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/mips-irix/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/multibibliography b/Master/bin/mipsel-linux/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/mipsel-linux/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/multibibliography b/Master/bin/powerpc-linux/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/powerpc-linux/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/multibibliography b/Master/bin/sparc-solaris/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/sparc-solaris/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/multibibliography b/Master/bin/universal-darwin/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/universal-darwin/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/win32/multibibliography.exe b/Master/bin/win32/multibibliography.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/multibibliography.exe
diff --git a/Master/bin/x86_64-darwin/multibibliography b/Master/bin/x86_64-darwin/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/x86_64-darwin/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/multibibliography b/Master/bin/x86_64-linux/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/x86_64-linux/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/multibibliography b/Master/bin/x86_64-solaris/multibibliography
new file mode 120000
index 00000000000..115426a16c6
--- /dev/null
+++ b/Master/bin/x86_64-solaris/multibibliography
@@ -0,0 +1 @@
+../../texmf-dist/scripts/multibibliography/multibibliography.pl
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/multibibliography/multibibliography.pl b/Master/texmf-dist/doc/latex/multibibliography/multibibliography.pl
deleted file mode 100755
index e1293f474d9..00000000000
--- a/Master/texmf-dist/doc/latex/multibibliography/multibibliography.pl
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/perl
-# Usage: perl multibibliography.pl jobname
-# Version: 2011-04-11T10:18Z
-# By Yannis Haralambous and Michael Cohen
-
-# Changes by Boris Veytsman, $Revision: 1.4 $, $Date: 2013-03-26 20:56:02 $
-
-# This perl script does the bibtexing part, generating 3 separate .bbl
-# files with descriptive names derived from source file name, so no
-# need to separately invoke.
-
-use strict;
-
-sub cleanup {
-    local $/=undef;
-    my $file = shift;
-    open IN, $file;
-    my $BIG=<IN>;
-    close IN;
-    $BIG=~s/(\r\n|\r|\n)/ /g;
-    $BIG=~s/\\bibitem/\n\n\\bibitem/g;
-    $BIG=~s/\\newblock/\n\\newblock/g;
-    $BIG=~s/\\end\{thebibliography\}/\n\n\\end{thebibliography}/g;
-    $BIG=~s/[ ]+/ /g;
-    open OUT, ">$file";
-    print OUT $BIG;
-    close OUT;
-}
-
-# First, change "apalike" in the aux file to "unsrt" and generate bbl
-# file, renamed to "fn-sequence.bbl".
-my $filename=$ARGV[0];
-$filename=~s/\.(tex|bib|bbl|aux|log)$//;
-if (-e $filename.".aux") {
-    open IN, $filename.".aux";
-    my $BIG="";
-    while (<IN>) {
-	if (m/\\bibstyle\{apalike\}/) {
-	    $BIG .= "\\bibstyle{unsrt}\n";
-	} else {
-	    $BIG .= $_;
-	}
-    }
-    close IN;
-    open OUT, ">".$filename.".aux";
-    print OUT $BIG;
-    close OUT;
-    system("bibtex $filename");
-    system("mv $filename".".bbl $filename"."-sequence.bbl");
-   
-    # Now, change "unsrt" in the aux file to "chronological" 
-    # and generate bbl file, renamed to "fn-timeline.bbl".
-
-    open IN, $filename.".aux";
-    $BIG="";
-    while (<IN>) {
-	if (m/\\bibstyle\{unsrt\}/) {
-	    $BIG .= "\\bibstyle{chronological}\n";
-	} else {
-	    $BIG .= $_;
-	}
-    }
-    close IN;
-    open OUT, ">".$filename.".aux";
-    print OUT $BIG;
-    close OUT;
-    system("bibtex $filename");
-    system("mv $filename".".bbl $filename"."-timeline.bbl");
-    
-    # Lastly, change "chronological" in the aux file to "apalike" 
-    # and generate bbl file, retaining name "fn.bbl".
-
-    open IN, $filename.".aux";
-    $BIG="";
-    while (<IN>) {
-	if (m/\\bibstyle\{chronological\}/) {
-	    $BIG .= "\\bibstyle{apalike}\n";
-	} else {
-	    $BIG .= $_;
-	}
-    }
-    close IN;
-    open OUT, ">".$filename.".aux";
-    print OUT $BIG;
-    close OUT;
-    system("bibtex $filename");
-    
-    &cleanup($filename.".bbl");
-    &cleanup($filename."-sequence.bbl");
-    &cleanup($filename."-timeline.bbl");
-    
-    open IN, $filename."-sequence.bbl";
-    my $counter=1;
-    my %UNSRT;
-    my %DATE;
-    my %NAME;
-    while (<IN>) {
-	if (m/\\bibitem{([^\}]+?)}/) {
-	    $UNSRT{$1}=$counter;
-	    $counter++;
-	}
-    }
-    close IN;
-    
-    open IN, $filename.".bbl";
-    $counter=1;
-    while (<IN>) {
-	if (m/\\bibitem\[([^\]]+)\]{([^}]+?)}/) {
-	    my $longdesc=$1;
-	    my $label=$2;
-	    if ($longdesc =~ /^(.*),\s+(\S+)$/) {
-		$NAME{$label}=$1;
-	        $DATE{$label}=$2;
-	    }
-        }
-    }
-    close IN;
-    
-    open IN, $filename."-sequence.bbl";
-    $counter=1;
-    open OUT, ">tmp123456";
-    while (<IN>) {
-	if (s/\\bibitem{(.+?)}/\\bibitem[\\MBlabel{$counter}{$NAME{$1}}{$DATE{$1}}]{$1}\n/) {
-	    $counter++;
-	}
-	print OUT;
-    }
-    close IN;
-    close OUT;
-    system("mv tmp123456 $filename"."-sequence.bbl");
-    
-    open IN, $filename.".bbl";
-    open OUT, ">tmp123456";
-    while (<IN>) {
-	s/\\bibitem\[[^\]]+\]{(.+?)}/\\bibitem[\\MBlabel{$UNSRT{$1}}{$NAME{$1}}{$DATE{$1}}]{$1}/;
-	print OUT $_;
-    }
-    close IN;
-    close OUT;
-    system("mv tmp123456 $filename".".bbl");
-    
-    open IN, $filename."-timeline.bbl";
-    open OUT, ">tmp123456";
-    while (<IN>) {
-		s/\\bibitem\[[^\]]+\]{(.+?)}/\\bibitem[\\MBlabel{$UNSRT{$1}}{$NAME{$1}}{$DATE{$1}}]{$1}/;
-	print OUT $_;
-    }
-    close IN;
-    close OUT;
-    system("mv tmp123456 $filename"."-timeline.bbl");
-}
-
-
-
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 95564d1cb76..6b6d8e45d1f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2372,7 +2372,7 @@ $standardxmt='\.xmt';
  'luaotfload'		=> 'luaotfload-tool',	# doscripts() does mklua*db
  'match_parens'		=> '^match_parens$',
  'mathspic'		=> '^mathspic\.pl$',
- 'multibibiography'	=> '\.pl$',
+ 'multibibliography'	=> '\.pl$',
  'mf2pt1'		=> '\.pl$',
  'mkgrkindex'		=> 'mkgrkindex$',
  'mkjobtexmf'		=> 'mkjobtexmf\.pl$',