From 9fdac4f2d07b457ea0e9d036623028657fd34cc7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 Jun 2013 22:57:28 +0000 Subject: multibibliography (25jun13) git-svn-id: svn://tug.org/texlive/trunk@30939 c570f23f-e606-0410-a88d-b1316a301751 --- .../multibibliography/multibibliography.pl | 64 ++++++++++----------- .../doc/latex/multibibliography/Makefile | 4 +- .../texmf-dist/doc/latex/multibibliography/README | 7 ++- .../doc/latex/multibibliography/figure.PDF | Bin 33586 -> 0 bytes .../doc/latex/multibibliography/figure.pdf | Bin 0 -> 33730 bytes .../latex/multibibliography/multibibliography.pdf | Bin 234521 -> 235019 bytes .../doc/latex/multibibliography/tug-paper.pdf | Bin 212479 -> 212629 bytes .../doc/latex/multibibliography/tug-paper.tex | 2 +- .../scripts/multibibliography/multibibliography.pl | 64 ++++++++++----------- .../latex/multibibliography/multibibliography.dtx | 10 ++-- .../latex/multibibliography/multibibliography.sty | 5 +- 11 files changed, 80 insertions(+), 76 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/multibibliography/figure.PDF create mode 100644 Master/texmf-dist/doc/latex/multibibliography/figure.pdf diff --git a/Build/source/texk/texlive/linked_scripts/multibibliography/multibibliography.pl b/Build/source/texk/texlive/linked_scripts/multibibliography/multibibliography.pl index e1293f474d9..16374700359 100755 --- a/Build/source/texk/texlive/linked_scripts/multibibliography/multibibliography.pl +++ b/Build/source/texk/texlive/linked_scripts/multibibliography/multibibliography.pl @@ -1,9 +1,8 @@ #!/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 $ +# Changes by Boris Veytsman, $Revision: 1.6 $, $Date: 2013-06-25 03:37:30 $ # This perl script does the bibtexing part, generating 3 separate .bbl # files with descriptive names derived from source file name, so no @@ -42,16 +41,15 @@ if (-e $filename.".aux") { } } close IN; - open OUT, ">".$filename.".aux"; + open OUT, "> $filename-sequence.aux"; print OUT $BIG; close OUT; - system("bibtex $filename"); - system("mv $filename".".bbl $filename"."-sequence.bbl"); + system("bibtex $filename-sequence"); # Now, change "unsrt" in the aux file to "chronological" # and generate bbl file, renamed to "fn-timeline.bbl". - open IN, $filename.".aux"; + open IN, "$filename-sequence.aux"; $BIG=""; while () { if (m/\\bibstyle\{unsrt\}/) { @@ -61,16 +59,15 @@ if (-e $filename.".aux") { } } close IN; - open OUT, ">".$filename.".aux"; + open OUT, "> $filename-timeline.aux"; print OUT $BIG; close OUT; - system("bibtex $filename"); - system("mv $filename".".bbl $filename"."-timeline.bbl"); + system("bibtex $filename-timeline"); # Lastly, change "chronological" in the aux file to "apalike" # and generate bbl file, retaining name "fn.bbl". - - open IN, $filename.".aux"; + + open IN, "$filename-timeline.aux"; $BIG=""; while () { if (m/\\bibstyle\{chronological\}/) { @@ -80,16 +77,16 @@ if (-e $filename.".aux") { } } close IN; - open OUT, ">".$filename.".aux"; + open OUT, "> $filename.aux"; print OUT $BIG; close OUT; system("bibtex $filename"); - &cleanup($filename.".bbl"); - &cleanup($filename."-sequence.bbl"); - &cleanup($filename."-timeline.bbl"); + cleanup("$filename.bbl"); + cleanup("$filename-sequence.bbl"); + cleanup("$filename-timeline.bbl"); - open IN, $filename."-sequence.bbl"; + open IN, "$filename-sequence.bbl"; my $counter=1; my %UNSRT; my %DATE; @@ -106,48 +103,51 @@ if (-e $filename.".aux") { $counter=1; while () { if (m/\\bibitem\[([^\]]+)\]{([^}]+?)}/) { - my $longdesc=$1; - my $label=$2; - if ($longdesc =~ /^(.*),\s+(\S+)$/) { - $NAME{$label}=$1; - $DATE{$label}=$2; - } - } + 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"; + $BIG=""; while () { if (s/\\bibitem{(.+?)}/\\bibitem[\\MBlabel{$counter}{$NAME{$1}}{$DATE{$1}}]{$1}\n/) { $counter++; } - print OUT; + $BIG .= $_; } close IN; + open OUT, "> $filename-sequence.bbl"; + print OUT $BIG; close OUT; - system("mv tmp123456 $filename"."-sequence.bbl"); open IN, $filename.".bbl"; - open OUT, ">tmp123456"; + $BIG=""; while () { s/\\bibitem\[[^\]]+\]{(.+?)}/\\bibitem[\\MBlabel{$UNSRT{$1}}{$NAME{$1}}{$DATE{$1}}]{$1}/; - print OUT $_; + $BIG .= $_; } close IN; + open OUT, ">$filename.bbl"; + print OUT $BIG; close OUT; - system("mv tmp123456 $filename".".bbl"); open IN, $filename."-timeline.bbl"; - open OUT, ">tmp123456"; + $BIG=""; while () { s/\\bibitem\[[^\]]+\]{(.+?)}/\\bibitem[\\MBlabel{$UNSRT{$1}}{$NAME{$1}}{$DATE{$1}}]{$1}/; - print OUT $_; + $BIG .= $_; } close IN; + open OUT, ">$filename-timeline.bbl"; + print OUT $BIG; close OUT; - system("mv tmp123456 $filename"."-timeline.bbl"); } diff --git a/Master/texmf-dist/doc/latex/multibibliography/Makefile b/Master/texmf-dist/doc/latex/multibibliography/Makefile index f5f0c725dbc..005a8a0775a 100644 --- a/Master/texmf-dist/doc/latex/multibibliography/Makefile +++ b/Master/texmf-dist/doc/latex/multibibliography/Makefile @@ -3,7 +3,7 @@ # # This file is in public domain # -# $Id: Makefile,v 1.3 2013-03-26 22:58:39 boris Exp $ +# $Id: Makefile,v 1.4 2013-05-30 02:20:11 boris Exp $ # PACKAGE=multibibliography @@ -47,7 +47,7 @@ clean: *.dvi *.ps *.tgz *.zip *.brf veryclean: clean - $(RM) *.pdf + $(RM) $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf} distclean: veryclean diff --git a/Master/texmf-dist/doc/latex/multibibliography/README b/Master/texmf-dist/doc/latex/multibibliography/README index ce2467125f3..b728a0d4d61 100644 --- a/Master/texmf-dist/doc/latex/multibibliography/README +++ b/Master/texmf-dist/doc/latex/multibibliography/README @@ -1,8 +1,8 @@ The Multibibliography Package - Michael Cohen and Yannis Haralambous + Michael Cohen, Yannis Haralambous, & Boris Veytsman - 2013/02/03 v1.0 + 2013/05/29 v1.03 Conventional standards for bibliography styles entail a forced choice between index and name/year citations and corresponding references. @@ -11,3 +11,6 @@ comprising alphabetic, sequenced, and even chronological orderings of references. An extended inline citation format is also proposed to integrate such heterogeneous styles, and is usable and useful even without separate bibliographies. + + +Version 1.03: New multibibliography.pl script \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/multibibliography/figure.PDF b/Master/texmf-dist/doc/latex/multibibliography/figure.PDF deleted file mode 100644 index 315f2f03ef6..00000000000 Binary files a/Master/texmf-dist/doc/latex/multibibliography/figure.PDF and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/multibibliography/figure.pdf b/Master/texmf-dist/doc/latex/multibibliography/figure.pdf new file mode 100644 index 00000000000..022002eaef3 Binary files /dev/null and b/Master/texmf-dist/doc/latex/multibibliography/figure.pdf differ diff --git a/Master/texmf-dist/doc/latex/multibibliography/multibibliography.pdf b/Master/texmf-dist/doc/latex/multibibliography/multibibliography.pdf index 54e8af2f860..0e681b8ee55 100644 Binary files a/Master/texmf-dist/doc/latex/multibibliography/multibibliography.pdf and b/Master/texmf-dist/doc/latex/multibibliography/multibibliography.pdf differ diff --git a/Master/texmf-dist/doc/latex/multibibliography/tug-paper.pdf b/Master/texmf-dist/doc/latex/multibibliography/tug-paper.pdf index a2ce99df979..b5f7755de47 100644 Binary files a/Master/texmf-dist/doc/latex/multibibliography/tug-paper.pdf and b/Master/texmf-dist/doc/latex/multibibliography/tug-paper.pdf differ diff --git a/Master/texmf-dist/doc/latex/multibibliography/tug-paper.tex b/Master/texmf-dist/doc/latex/multibibliography/tug-paper.tex index 14368ee9930..1c1a5c2999a 100644 --- a/Master/texmf-dist/doc/latex/multibibliography/tug-paper.tex +++ b/Master/texmf-dist/doc/latex/multibibliography/tug-paper.tex @@ -195,7 +195,7 @@ may be elided.) \begin{figure*}[ht*] \begin{center} -\includegraphics[width=\textwidth]{figure.PDF} +\includegraphics[width=\textwidth]{figure.pdf} \caption{Hyperreferential links across document and among the multibibliographies: Each inline citation, exemplified by the block in the center, diff --git a/Master/texmf-dist/scripts/multibibliography/multibibliography.pl b/Master/texmf-dist/scripts/multibibliography/multibibliography.pl index e1293f474d9..16374700359 100755 --- a/Master/texmf-dist/scripts/multibibliography/multibibliography.pl +++ b/Master/texmf-dist/scripts/multibibliography/multibibliography.pl @@ -1,9 +1,8 @@ #!/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 $ +# Changes by Boris Veytsman, $Revision: 1.6 $, $Date: 2013-06-25 03:37:30 $ # This perl script does the bibtexing part, generating 3 separate .bbl # files with descriptive names derived from source file name, so no @@ -42,16 +41,15 @@ if (-e $filename.".aux") { } } close IN; - open OUT, ">".$filename.".aux"; + open OUT, "> $filename-sequence.aux"; print OUT $BIG; close OUT; - system("bibtex $filename"); - system("mv $filename".".bbl $filename"."-sequence.bbl"); + system("bibtex $filename-sequence"); # Now, change "unsrt" in the aux file to "chronological" # and generate bbl file, renamed to "fn-timeline.bbl". - open IN, $filename.".aux"; + open IN, "$filename-sequence.aux"; $BIG=""; while () { if (m/\\bibstyle\{unsrt\}/) { @@ -61,16 +59,15 @@ if (-e $filename.".aux") { } } close IN; - open OUT, ">".$filename.".aux"; + open OUT, "> $filename-timeline.aux"; print OUT $BIG; close OUT; - system("bibtex $filename"); - system("mv $filename".".bbl $filename"."-timeline.bbl"); + system("bibtex $filename-timeline"); # Lastly, change "chronological" in the aux file to "apalike" # and generate bbl file, retaining name "fn.bbl". - - open IN, $filename.".aux"; + + open IN, "$filename-timeline.aux"; $BIG=""; while () { if (m/\\bibstyle\{chronological\}/) { @@ -80,16 +77,16 @@ if (-e $filename.".aux") { } } close IN; - open OUT, ">".$filename.".aux"; + open OUT, "> $filename.aux"; print OUT $BIG; close OUT; system("bibtex $filename"); - &cleanup($filename.".bbl"); - &cleanup($filename."-sequence.bbl"); - &cleanup($filename."-timeline.bbl"); + cleanup("$filename.bbl"); + cleanup("$filename-sequence.bbl"); + cleanup("$filename-timeline.bbl"); - open IN, $filename."-sequence.bbl"; + open IN, "$filename-sequence.bbl"; my $counter=1; my %UNSRT; my %DATE; @@ -106,48 +103,51 @@ if (-e $filename.".aux") { $counter=1; while () { if (m/\\bibitem\[([^\]]+)\]{([^}]+?)}/) { - my $longdesc=$1; - my $label=$2; - if ($longdesc =~ /^(.*),\s+(\S+)$/) { - $NAME{$label}=$1; - $DATE{$label}=$2; - } - } + 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"; + $BIG=""; while () { if (s/\\bibitem{(.+?)}/\\bibitem[\\MBlabel{$counter}{$NAME{$1}}{$DATE{$1}}]{$1}\n/) { $counter++; } - print OUT; + $BIG .= $_; } close IN; + open OUT, "> $filename-sequence.bbl"; + print OUT $BIG; close OUT; - system("mv tmp123456 $filename"."-sequence.bbl"); open IN, $filename.".bbl"; - open OUT, ">tmp123456"; + $BIG=""; while () { s/\\bibitem\[[^\]]+\]{(.+?)}/\\bibitem[\\MBlabel{$UNSRT{$1}}{$NAME{$1}}{$DATE{$1}}]{$1}/; - print OUT $_; + $BIG .= $_; } close IN; + open OUT, ">$filename.bbl"; + print OUT $BIG; close OUT; - system("mv tmp123456 $filename".".bbl"); open IN, $filename."-timeline.bbl"; - open OUT, ">tmp123456"; + $BIG=""; while () { s/\\bibitem\[[^\]]+\]{(.+?)}/\\bibitem[\\MBlabel{$UNSRT{$1}}{$NAME{$1}}{$DATE{$1}}]{$1}/; - print OUT $_; + $BIG .= $_; } close IN; + open OUT, ">$filename-timeline.bbl"; + print OUT $BIG; close OUT; - system("mv tmp123456 $filename"."-timeline.bbl"); } diff --git a/Master/texmf-dist/source/latex/multibibliography/multibibliography.dtx b/Master/texmf-dist/source/latex/multibibliography/multibibliography.dtx index 6786a624a50..62928a272c6 100644 --- a/Master/texmf-dist/source/latex/multibibliography/multibibliography.dtx +++ b/Master/texmf-dist/source/latex/multibibliography/multibibliography.dtx @@ -1,9 +1,8 @@ % \iffalse -% $Id: multibibliography.dtx,v 1.8 2013-05-16 02:47:54 boris Exp $ +% $Id: multibibliography.dtx,v 1.10 2013-05-30 02:22:26 boris Exp $ % %% Copyright 2013, Michael Cohen -%% Yannis Haralambous -%% Boris Veytsman +%% and Yannis Haralambous, %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3 of this license or (at your option) any @@ -61,6 +60,9 @@ % \MakeShortVerb{|} % \GetFileInfo{multibibliography.sty} % +% \changes{v1.03}{2013/05/29}{Rewrote multibibliography.pl: no more +% temp files} +% % \title{The Multibibliography Package\thanks{\copyright 2013 Michael % Cohen and Yannis Haralambous}} % \author{Michael Cohen\thanks{mcohen@u-aizu.ac.jp} \and @@ -184,7 +186,7 @@ % %