summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-28 22:28:57 +0000
committerKarl Berry <karl@freefriends.org>2018-05-28 22:28:57 +0000
commita81108bdb8e6c45d62a0e53488c078eeda74767b (patch)
tree2b4c634048e05287cd32172f599a85bb479c4cb7
parent137220c3442927290385d230913b8cb7d6eff71b (diff)
crossrefware (28may18)
git-svn-id: svn://tug.org/texlive/trunk@47861 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl21
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/crossrefware/bibzbladd.pl2
-rw-r--r--Master/texmf-dist/doc/man/man1/bbl2bib.12
-rw-r--r--Master/texmf-dist/doc/man/man1/bbl2bib.man1.pdfbin22059 -> 22316 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/bibzbladd.12
-rw-r--r--Master/texmf-dist/doc/man/man1/bibzbladd.man1.pdfbin19057 -> 19265 bytes
-rw-r--r--Master/texmf-dist/doc/support/crossrefware/README3
-rw-r--r--Master/texmf-dist/doc/support/crossrefware/crossrefware.pdfbin136405 -> 136411 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/crossrefware/bbl2bib.pl21
-rwxr-xr-xMaster/texmf-dist/scripts/crossrefware/bibzbladd.pl2
10 files changed, 47 insertions, 6 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl b/Build/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl
index 3f66a6f061b..397e52a6af8 100755
--- a/Build/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl
+++ b/Build/source/texk/texlive/linked_scripts/crossrefware/bbl2bib.pl
@@ -172,7 +172,7 @@ while (<$input>) {
/\\begin\{thebibliography\}/ || /\\end\{thebibliography\}/) {
next;
}
- if (/\\bibitem(\[[^\]]*\])?\{([^\}]*)\}/) {
+ if (/\\bibitem\s*(\[[^\]]*\])?\{([^\}]*)\}/) {
ProcessBibitem($bibitem);
$bibitem = undef;
$bibitem->{key}=$2;
@@ -266,6 +266,13 @@ sub SearchMref {
}
if ($response =~ /<pre>(.*)<\/pre>/s) {
my $bib= $1;
+ # Looks like Mathscinet sometimes fails to unaccent text.
+ # For the time being we just delete the offending characters.
+ # Should probably write LaTeX::FromUnicode instead
+ $bib =~ s/[^\x00-\x7f]//g;
+ if ($debug) {
+ print STDOUT "DEBUG: got $bib\n";
+ }
my $fh = new FileHandle;
open $fh, "<", \$bib;
my $parser = new BibTeX::Parser($fh);
@@ -273,6 +280,18 @@ sub SearchMref {
if (ref($entry) && $entry->parse_ok()) {
$entry->key($bibitem->{key});
return ($entry);
+ } else {
+ if ($debug) {
+ if (!ref($entry)) {
+ print STDERR "DEBUG: not a reference\n";
+ } else{
+ print STDERR "DEBUG: parsing $entry->parse_ok\n";
+ }
+ }
+ }
+ } else {
+ if ($debug) {
+ print STDOUT "DEBUG: did not get an entry\n";
}
}
}
diff --git a/Build/source/texk/texlive/linked_scripts/crossrefware/bibzbladd.pl b/Build/source/texk/texlive/linked_scripts/crossrefware/bibzbladd.pl
index 2dba99eeedc..7516862bafe 100755
--- a/Build/source/texk/texlive/linked_scripts/crossrefware/bibzbladd.pl
+++ b/Build/source/texk/texlive/linked_scripts/crossrefware/bibzbladd.pl
@@ -189,7 +189,7 @@ sub GetZbl {
$response->decoded_content, "\n";
}
- if ($response->decoded_content =~ /^\s*"zbl_id":\s*"(.*)",\s*$/m) {
+ if ($response->decoded_content =~ /^\s*"zbl_id":\s*"(.*)",?\s*$/m) {
if ($debug) {
print STDERR "DEBUG: got zbl: $1\n",
}
diff --git a/Master/texmf-dist/doc/man/man1/bbl2bib.1 b/Master/texmf-dist/doc/man/man1/bbl2bib.1
index d09b405a668..e41fb401cd1 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-11-26" "" "CROSSREF LIBRARY"
+.TH bbl2bib 1 "2018-04-29" "" "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 9ee1cb5bde2..310326c188b 100644
--- a/Master/texmf-dist/doc/man/man1/bbl2bib.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/bbl2bib.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/bibzbladd.1 b/Master/texmf-dist/doc/man/man1/bibzbladd.1
index 30e04b452da..67c4bcc17d6 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-11-18" "" "CROSSREF LIBRARY"
+.TH bibzbladd 1 "2018-04-15" "" "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.man1.pdf b/Master/texmf-dist/doc/man/man1/bibzbladd.man1.pdf
index 54b61ef361d..bb7d03ceb37 100644
--- a/Master/texmf-dist/doc/man/man1/bibzbladd.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/bibzbladd.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/crossrefware/README b/Master/texmf-dist/doc/support/crossrefware/README
index 06d9c4bc731..882bdb31e0b 100644
--- a/Master/texmf-dist/doc/support/crossrefware/README
+++ b/Master/texmf-dist/doc/support/crossrefware/README
@@ -27,6 +27,9 @@ Installation:
Changes:
+ 2018/04/15 - Fixed a bug in bibzbladd
+ - Work around a bug in mathscinet
+
2017/11/26: - Switched to date-based versioning for the
bundle.
- bbl2bib now converts urls starting with
diff --git a/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf b/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
index 7acbb55e2e9..87d5bac969e 100644
--- a/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
+++ b/Master/texmf-dist/doc/support/crossrefware/crossrefware.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/crossrefware/bbl2bib.pl b/Master/texmf-dist/scripts/crossrefware/bbl2bib.pl
index 3f66a6f061b..397e52a6af8 100755
--- a/Master/texmf-dist/scripts/crossrefware/bbl2bib.pl
+++ b/Master/texmf-dist/scripts/crossrefware/bbl2bib.pl
@@ -172,7 +172,7 @@ while (<$input>) {
/\\begin\{thebibliography\}/ || /\\end\{thebibliography\}/) {
next;
}
- if (/\\bibitem(\[[^\]]*\])?\{([^\}]*)\}/) {
+ if (/\\bibitem\s*(\[[^\]]*\])?\{([^\}]*)\}/) {
ProcessBibitem($bibitem);
$bibitem = undef;
$bibitem->{key}=$2;
@@ -266,6 +266,13 @@ sub SearchMref {
}
if ($response =~ /<pre>(.*)<\/pre>/s) {
my $bib= $1;
+ # Looks like Mathscinet sometimes fails to unaccent text.
+ # For the time being we just delete the offending characters.
+ # Should probably write LaTeX::FromUnicode instead
+ $bib =~ s/[^\x00-\x7f]//g;
+ if ($debug) {
+ print STDOUT "DEBUG: got $bib\n";
+ }
my $fh = new FileHandle;
open $fh, "<", \$bib;
my $parser = new BibTeX::Parser($fh);
@@ -273,6 +280,18 @@ sub SearchMref {
if (ref($entry) && $entry->parse_ok()) {
$entry->key($bibitem->{key});
return ($entry);
+ } else {
+ if ($debug) {
+ if (!ref($entry)) {
+ print STDERR "DEBUG: not a reference\n";
+ } else{
+ print STDERR "DEBUG: parsing $entry->parse_ok\n";
+ }
+ }
+ }
+ } else {
+ if ($debug) {
+ print STDOUT "DEBUG: did not get an entry\n";
}
}
}
diff --git a/Master/texmf-dist/scripts/crossrefware/bibzbladd.pl b/Master/texmf-dist/scripts/crossrefware/bibzbladd.pl
index 2dba99eeedc..7516862bafe 100755
--- a/Master/texmf-dist/scripts/crossrefware/bibzbladd.pl
+++ b/Master/texmf-dist/scripts/crossrefware/bibzbladd.pl
@@ -189,7 +189,7 @@ sub GetZbl {
$response->decoded_content, "\n";
}
- if ($response->decoded_content =~ /^\s*"zbl_id":\s*"(.*)",\s*$/m) {
+ if ($response->decoded_content =~ /^\s*"zbl_id":\s*"(.*)",?\s*$/m) {
if ($debug) {
print STDERR "DEBUG: got zbl: $1\n",
}