crossrefware (23apr17)

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

10 files changed, 25 insertions, 32 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl b/Build/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl
index 7a05297a0fd..a2df920382d 100755
--- a/Build/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl
+++ b/Build/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl
@@ -101,7 +101,7 @@ use LWP::Simple;
 
 my $USAGE="USAGE: $0 [-o output] file\n";
 my $VERSION = <<END;
-bbl2bib v2.1
+bbl2bib v2.1a
 This is free software.  You may redistribute copies of it under the
 terms of the GNU General Public License
 http://www.gnu.org/licenses/gpl.html.  There is NO WARRANTY, to the
@@ -216,7 +216,7 @@ sub SearchMref {
 	open $fh, "<", \$bib;
 	my $parser = new BibTeX::Parser($fh);
 	my $entry = $parser->next;
-	if ($entry->parse_ok()) {
+	if (ref($entry) && $entry->parse_ok()) {
 	    $entry->key($bibitem->{key});
 	    return ($entry);
 	}
@@ -227,7 +227,7 @@ sub SearchMref {
 
 
 sub PrintBibitem {
-    print "\n";
+    print $output "\n";
     my $bibitem = shift;
     if (!ref($bibitem->{bib})) {
 	return;
@@ -253,7 +253,7 @@ sub PrintBibitem {
 	$entry->field('arxiv', $bibitem->{arxiv});
     }
 	
-    print $entry->to_string(), "\n\n";
+    print $output $entry->to_string(), "\n\n";
 }
 
 
diff --git a/Master/texmf-dist/doc/man/man1/bbl2bib.1 b/Master/texmf-dist/doc/man/man1/bbl2bib.1
index 09596a64519..0c34cdfb451 100644
--- a/Master/texmf-dist/doc/man/man1/bbl2bib.1
+++ b/Master/texmf-dist/doc/man/man1/bbl2bib.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "bbl2bib 1"
-.TH bbl2bib 1 "2017-04-10" "" "CROSSREF LIBRARY"
+.TH bbl2bib 1 "2017-04-23" "" "CROSSREF LIBRARY"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/Master/texmf-dist/doc/man/man1/bbl2bib.man1.pdf b/Master/texmf-dist/doc/man/man1/bbl2bib.man1.pdf
index 54bfe817b71..10f95f1dcca 100644
--- a/Master/texmf-dist/doc/man/man1/bbl2bib.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/bbl2bib.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/bibdoiadd.1 b/Master/texmf-dist/doc/man/man1/bibdoiadd.1
index 6e22fc30c70..dad91619d0c 100644
--- a/Master/texmf-dist/doc/man/man1/bibdoiadd.1
+++ b/Master/texmf-dist/doc/man/man1/bibdoiadd.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "bibdoiadd 1"
-.TH bibdoiadd 1 "2017-04-12" "" "CROSSREF LIBRARY"
+.TH bibdoiadd 1 "2017-04-09" "" "CROSSREF LIBRARY"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/Master/texmf-dist/doc/man/man1/bibzbladd.1 b/Master/texmf-dist/doc/man/man1/bibzbladd.1
index 2c95365d6a4..928ff084e75 100644
--- a/Master/texmf-dist/doc/man/man1/bibzbladd.1
+++ b/Master/texmf-dist/doc/man/man1/bibzbladd.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "bibzbladd 1"
-.TH bibzbladd 1 "2017-04-12" "" "CROSSREF LIBRARY"
+.TH bibzbladd 1 "2017-04-02" "" "CROSSREF LIBRARY"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.1 b/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.1
index 74fc82f69d4..f1d5afcf43e 100644
--- a/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.1
+++ b/Master/texmf-dist/doc/man/man1/ltx2crossrefxml.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -38,8 +38,6 @@
 .    ds PI \(*p
 .    ds L" ``
 .    ds R" ''
-.    ds C`
-.    ds C'
 'br\}
 .\"
 .\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -50,24 +48,17 @@
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
-.\"
-.\" Avoid warning from groff about undefined register 'F'.
-.de IX
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
-.    \}
 .\}
-.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -133,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ltx2crossrefxml 1"
-.TH ltx2crossrefxml 1 "2017-03-28" "" "CROSSREF LIBRARY"
+.TH ltx2crossrefxml 1 "2016-02-14" "" "CROSSREF LIBRARY"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -185,5 +176,5 @@ Copyright (C) 2012\-2016  Boris Veytsman
 .PP
 This is free software.  You may redistribute copies of it under the
 terms of the \s-1GNU\s0 General Public License
-<http://www.gnu.org/licenses/gpl.html>.  There is \s-1NO WARRANTY,\s0 to the
+<http://www.gnu.org/licenses/gpl.html>.  There is \s-1NO\s0 \s-1WARRANTY\s0, to the
 extent permitted by law.
diff --git a/Master/texmf-dist/doc/support/crossrefware/README b/Master/texmf-dist/doc/support/crossrefware/README
index 4888089775d..d4961cd1a0d 100644
--- a/Master/texmf-dist/doc/support/crossrefware/README
+++ b/Master/texmf-dist/doc/support/crossrefware/README
@@ -1,5 +1,5 @@
 			 Crossrefware Bundle
-			     version 2.1
+			     version 2.1a
 
 
 Scripts useful for working with Crossref, MathSciNet and Zentralblatt MATH.
@@ -26,6 +26,8 @@ Installation:
 
 Changes:
 
+        Version 2.1a: Bug in bbl2bib corrected
+
         Version 2.1:  New options to add empty doi and zbl when doi or zbl
 		      are not found to prevent repeated searches.
 		      Added bibmradd.pl
diff --git a/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf b/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
index 6cc43be3264..bb7ea792fb3 100644
--- a/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
+++ b/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
diff --git a/Master/texmf-dist/doc/support/crossrefware/ltx2crossrefxml.exe b/Master/texmf-dist/doc/support/crossrefware/ltx2crossrefxml.exe
deleted file mode 100755
index 1e8a872b845..00000000000
--- a/Master/texmf-dist/doc/support/crossrefware/ltx2crossrefxml.exe
+++ /dev/null
diff --git a/Master/texmf-dist/scripts/crossrefware/bbl2bib.pl b/Master/texmf-dist/scripts/crossrefware/bbl2bib.pl
index 7a05297a0fd..a2df920382d 100755
--- a/Master/texmf-dist/scripts/crossrefware/bbl2bib.pl
+++ b/Master/texmf-dist/scripts/crossrefware/bbl2bib.pl
@@ -101,7 +101,7 @@ use LWP::Simple;
 
 my $USAGE="USAGE: $0 [-o output] file\n";
 my $VERSION = <<END;
-bbl2bib v2.1
+bbl2bib v2.1a
 This is free software.  You may redistribute copies of it under the
 terms of the GNU General Public License
 http://www.gnu.org/licenses/gpl.html.  There is NO WARRANTY, to the
@@ -216,7 +216,7 @@ sub SearchMref {
 	open $fh, "<", \$bib;
 	my $parser = new BibTeX::Parser($fh);
 	my $entry = $parser->next;
-	if ($entry->parse_ok()) {
+	if (ref($entry) && $entry->parse_ok()) {
 	    $entry->key($bibitem->{key});
 	    return ($entry);
 	}
@@ -227,7 +227,7 @@ sub SearchMref {
 
 
 sub PrintBibitem {
-    print "\n";
+    print $output "\n";
     my $bibitem = shift;
     if (!ref($bibitem->{bib})) {
 	return;
@@ -253,7 +253,7 @@ sub PrintBibitem {
 	$entry->field('arxiv', $bibitem->{arxiv});
     }
 	
-    print $entry->to_string(), "\n\n";
+    print $output $entry->to_string(), "\n\n";
 }