bibtexperllibs (24nov16)

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

5 files changed, 17 insertions, 17 deletions

diff --git a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser.pm b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser.pm
index 5f0354f403b..7dec6f7bee8 100644
--- a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser.pm
+++ b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser.pm
@@ -1,6 +1,6 @@
 package BibTeX::Parser;
 {
-  $BibTeX::Parser::VERSION = '0.69';
+  $BibTeX::Parser::VERSION = '0.70';
 }
 # ABSTRACT: A pure perl BibTeX parser
 use warnings;
@@ -84,7 +84,7 @@ sub _parse_next {
             pos($_) = $pos;
 
             if ( $type eq "STRING" ) {
-                if (/\G{\s*($re_name)\s*=\s*/cgo) {
+                if (/\G\{\s*($re_name)\s*=\s*/cgo) {
                     my $key   = $1;
                     my $value = _parse_string( $self->{strings} );
                     if ( defined $self->{strings}->{$key} ) {
@@ -337,7 +337,7 @@ L<BibTeX::Parser::Author>
 
 =head1 VERSION
 
-version 0.69
+version 0.70
 
 
 =head1 AUTHOR
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Author.pm b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Author.pm
index c19bd885776..032186d8ad0 100644
--- a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Author.pm
+++ b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Author.pm
@@ -1,6 +1,6 @@
 package BibTeX::Parser::Author;
 {
-  $BibTeX::Parser::Author::VERSION = '0.69';
+  $BibTeX::Parser::Author::VERSION = '0.70';
 }
 
 use warnings;
@@ -393,7 +393,7 @@ the following token is not: C<{von}>
 
 =head1 VERSION
 
-version 0.69
+version 0.70
 
 
 =head1 AUTHOR
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm
index 9e6ab110c0c..665e307b547 100644
--- a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm
+++ b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm
@@ -1,6 +1,6 @@
 package BibTeX::Parser::Entry;
 {
-  $BibTeX::Parser::Entry::VERSION = '0.69';
+  $BibTeX::Parser::Entry::VERSION = '0.70';
 }
 
 use warnings;
@@ -357,7 +357,7 @@ C<$entry-E<gt>to_string(canonize_names=E<gt>0)> overrides this behavior.
 
 =head1 VERSION
 
-version 0.69
+version 0.70
 
 
 =head1 AUTHOR
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode.pm b/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode.pm
index b11ded80e41..cf62cf5a29d 100644
--- a/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode.pm
+++ b/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode.pm
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 package LaTeX::ToUnicode;
 BEGIN {
-  $LaTeX::ToUnicode::VERSION = '0.04';
+  $LaTeX::ToUnicode::VERSION = '0.05';
 }
 #ABSTRACT: Convert LaTeX commands to Unicode
 
@@ -29,10 +29,10 @@ sub convert {
 
 sub _convert_accents {
     my $string = shift;
-    $string =~ s/({\\(.){(\\?\w{1,2})}})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # {\"{a}}
-    $string =~ s/({\\(.)(\\?\w{1,2})})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # {\"a}
+    $string =~ s/(\{\\(.)\{(\\?\w{1,2})\}\})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # {\"{a}}
+    $string =~ s/(\{\\(.)(\\?\w{1,2})\})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # {\"a}
     $string =~ s/(\\(.)(\\?\w{1,2}))/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # \"a
-    $string =~ s/(\\(.){(\\?\w{1,2})})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # \"{a}
+    $string =~ s/(\\(.)\{(\\?\w{1,2})\})/$LaTeX::ToUnicode::Tables::ACCENTS{$2}{$3} || $1/eg; # \"{a}
     $string;
 }
 
@@ -49,7 +49,7 @@ sub _convert_commands {
     my $string = shift;
 
     foreach my $command ( keys %LaTeX::ToUnicode::Tables::COMMANDS ) {
-        $string =~ s/{\\$command}/$LaTeX::ToUnicode::Tables::COMMANDS{$command}/g;
+        $string =~ s/\{\\$command\}/$LaTeX::ToUnicode::Tables::COMMANDS{$command}/g;
         $string =~ s/\\$command(?=\s|\b)/$LaTeX::ToUnicode::Tables::COMMANDS{$command}/g;
     }
 
@@ -79,8 +79,8 @@ sub _convert_markups {
     my $string = shift;
 
     my $markups = join( '|', @LaTeX::ToUnicode::Tables::MARKUPS );
-    $string =~ s/({[^{}]+)\\(?:$markups)\s+([^{}]+})/$1$2/g; # { ... \command ... }
-    my $pattern = qr/{\\(?:$markups)\s+([^{}]*)}/o;
+    $string =~ s/(\{[^{}]+)\\(?:$markups)\s+([^{}]+\})/$1$2/g; # { ... \command ... }
+    my $pattern = qr/\{\\(?:$markups)\s+([^{}]*)\}/o;
     $string =~ s/$pattern/$1/g;
 
     $string =~ s/``/“/g;
@@ -103,7 +103,7 @@ LaTeX::ToUnicode - Convert LaTeX commands to Unicode
 
 =head1 VERSION
 
-version 0.04
+version 0.05
 
 =head1 SYNOPSIS
 
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm b/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm
index 9dd62879a75..446c46e2158 100644
--- a/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm
+++ b/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm
@@ -1,6 +1,6 @@
 package LaTeX::ToUnicode::Tables;
 BEGIN {
-  $LaTeX::ToUnicode::Tables::VERSION = '0.04';
+  $LaTeX::ToUnicode::Tables::VERSION = '0.05';
 }
 use strict;
 use warnings;
@@ -459,7 +459,7 @@ LaTeX::ToUnicode::Tables - Character tables for LaTeX::ToUnicode
 
 =head1 VERSION
 
-version 0.04
+version 0.05
 
 =head1 CONSTANTS