summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-10 23:22:31 +0000
committerKarl Berry <karl@freefriends.org>2016-03-10 23:22:31 +0000
commit139be648536d5f25096343c01cd7e96a2a663ae4 (patch)
tree6d6b86f2a5d95b397478bb8988354449f0fef24c /Master
parent5f1f6fa78b0845693569ba5dacdc711bff4aba7f (diff)
bibtexperllibs (10mar16)
git-svn-id: svn://tug.org/texlive/trunk@39989 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser.pm2
-rw-r--r--Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Author.pm2
-rw-r--r--Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm19
-rw-r--r--Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode.pm10
-rw-r--r--Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm10
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Changes6
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/LICENSE4
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/MANIFEST1
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/META.yml47
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Makefile.PL2
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/README8
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/dist.ini2
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/03-parse_entry.t122
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/09-complex.t4
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/10-funnyname.t4
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/13_output.t9
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/bibs/english.bib2
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Changes3
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/LICENSE4
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/META.yml34
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Makefile.PL4
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/README4
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/dist.ini8
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/t/convert.t3
-rw-r--r--Master/texmf-dist/source/support/bibtexperllibs/README4
25 files changed, 181 insertions, 137 deletions
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser.pm b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser.pm
index c7d7a75fc35..607e661e112 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.66';
+ $BibTeX::Parser::VERSION = '0.68';
}
# ABSTRACT: A pure perl BibTeX parser
use warnings;
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Author.pm b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Author.pm
index d7e84577e60..fbd532211b4 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.66';
+ $BibTeX::Parser::Author::VERSION = '0.68';
}
use warnings;
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm b/Master/texmf-dist/scripts/bibtexperllibs/BibTeX/Parser/Entry.pm
index b10317c42b4..6986f0a6608 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.66';
+ $BibTeX::Parser::Entry::VERSION = '0.68';
}
use warnings;
@@ -15,6 +15,13 @@ sub new {
my ($class, $type, $key, $parse_ok, $fieldsref) = @_;
my %fields = defined $fieldsref ? %$fieldsref : ();
+ my $i=0;
+ foreach my $field (keys %fields) {
+ if ($field !~ /^_/) {
+ $fields{_fieldnums}->{$field}=$i;
+ $i++;
+ }
+ }
if (defined $type) {
$fields{_type} = uc($type);
}
@@ -79,7 +86,12 @@ sub field {
return $self->{ lc( $field ) };
} else {
my ($self, $key, $value) = @_;
- $self->{ lc( $key ) } = $value; #_sanitize_field($value);
+ my $field = lc ($key);
+ $self->{$field} = $value; #_sanitize_field($value);
+ if (!exists($self->{_fieldnums}->{$field})) {
+ my $num = scalar keys %{$self->{_fieldnums}};
+ $self->{_fieldnums}->{$field} = $num;
+ }
}
}
@@ -207,6 +219,9 @@ sub raw_bibtex {
sub to_string {
my $self = shift;
my @fields = grep {!/^_/} keys %$self;
+ @fields = sort {
+ $self->{_fieldnums}->{$a} <=>
+ $self->{_fieldnums}->{$b}} @fields;
my $result = '@'.$self->type."{".$self->key.",\n";
foreach my $field (@fields) {
my $value = $self->field($field);
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode.pm b/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode.pm
index 361daf49296..b11ded80e41 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.03';
+ $LaTeX::ToUnicode::VERSION = '0.04';
}
#ABSTRACT: Convert LaTeX commands to Unicode
@@ -31,6 +31,8 @@ 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;
}
@@ -101,7 +103,7 @@ LaTeX::ToUnicode - Convert LaTeX commands to Unicode
=head1 VERSION
-version 0.03
+version 0.04
=head1 SYNOPSIS
@@ -144,11 +146,11 @@ note the missing backslash) are also handled.
=head1 AUTHOR
-Gerhard Gossen <gerhard.gossen@googlemail.com>
+Gerhard Gossen <gerhard.gossen@googlemail.com> and Boris Veytsman <boris@varphi.com>
=head1 COPYRIGHT AND LICENSE
-This software is copyright (c) 2010 by Gerhard Gossen.
+This software is copyright (c) 2010-2015 by Gerhard Gossen and Boris Veytsman
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
diff --git a/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm b/Master/texmf-dist/scripts/bibtexperllibs/LaTeX/ToUnicode/Tables.pm
index f4fa958b69c..9dd62879a75 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.03';
+ $LaTeX::ToUnicode::Tables::VERSION = '0.04';
}
use strict;
use warnings;
@@ -153,7 +153,7 @@ our %ACCENTS = (
y => "\x{1e8f}",
z => "\x{17c}"
},
- "=" => {
+ '=' => {
A => "\x{100}",
AE => "\x{1e2}",
E => "\x{112}",
@@ -459,7 +459,7 @@ LaTeX::ToUnicode::Tables - Character tables for LaTeX::ToUnicode
=head1 VERSION
-version 0.03
+version 0.04
=head1 CONSTANTS
@@ -497,11 +497,11 @@ Command names of formatting commands like C<\tt>
=head1 AUTHOR
-Gerhard Gossen <gerhard.gossen@googlemail.com>
+Gerhard Gossen <gerhard.gossen@googlemail.com> and Boris Veytsman <boris@varphi.com>
=head1 COPYRIGHT AND LICENSE
-This software is copyright (c) 2010 by Gerhard Gossen.
+This software is copyright (c) 2010-2015 by Gerhard Gossen and Boris Veytsman
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Changes b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Changes
index 57ba094ac68..3785e372e7e 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Changes
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Changes
@@ -1,5 +1,11 @@
Revision history for BibTeX-Parser
+0.68 2016-03-10 13:45:31-05:00
+ Now we preserve the order of entries
+
+0.67 2015-12-28 22:36:42+00:00
+ Corrected test t/13_output.t
+
0.66 2015-12-23 19:52:55-05:00
Corrected bug 67419.
Added $entry->to_string function
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/LICENSE b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/LICENSE
index 169f805923d..3f09c94f5c8 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/LICENSE
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/LICENSE
@@ -1,4 +1,4 @@
-This software is copyright (c) 2013 by Gerhard Gossen.
+This software is copyright (c) 2013-2016 by Gerhard Gossen and Boris Veytsman
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
@@ -12,7 +12,7 @@ b) the "Artistic License"
--- The GNU General Public License, Version 1, February 1989 ---
-This software is Copyright (c) 2013 by Gerhard Gossen.
+This software is copyright (c) 2013-2016 by Gerhard Gossen and Boris Veytsman
This is free software, licensed under:
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/MANIFEST b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/MANIFEST
index a08640964d6..7896b2c5165 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/MANIFEST
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/MANIFEST
@@ -39,4 +39,3 @@ t/pod-coverage.t
t/pod.t
t/release-pod-coverage.t
t/release-pod-syntax.t
-META.json Module JSON meta-data (added by MakeMaker)
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/META.yml b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/META.yml
index 8cee4bb38eb..6ccee5fe89c 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/META.yml
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/META.yml
@@ -1,27 +1,26 @@
----
-abstract: 'A pure perl BibTeX parser'
+--- #YAML:1.0
+name: BibTeX-Parser
+version: 0.68
+abstract: A pure perl BibTeX parser
author:
- - 'Gerhard Gossen <gerhard.gossen@googlemail.com> and Boris Veytsman <boris@varphi.com>'
-build_requires:
- Test::More: '0.88'
+ - Gerhard Gossen <gerhard.gossen@googlemail.com> and Boris Veytsman <boris@varphi.com>
+license: perl
+distribution_type: module
configure_requires:
- ExtUtils::MakeMaker: '6.30'
-dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.150005'
-license: perl
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: '1.4'
-name: BibTeX-Parser
-no_index:
- directory:
- - t
- - inc
+ ExtUtils::MakeMaker: 6.30
+build_requires:
+ ExtUtils::MakeMaker: 0
requires:
- File::Spec: '0'
- IO::File: '0'
- IO::String: '0'
- LaTeX::ToUnicode: '0.02'
- Test::More: '0'
-version: '0.66'
-x_serialization_backend: 'CPAN::Meta::YAML version 0.016'
+ File::Spec: 0
+ IO::File: 0
+ IO::String: 0
+ LaTeX::ToUnicode: 0.02
+ Test::More: 0.88
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.55_02
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Makefile.PL b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Makefile.PL
index b800aa6f863..da91d807db7 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Makefile.PL
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/Makefile.PL
@@ -29,7 +29,7 @@ my %WriteMakefileArgs = (
"TEST_REQUIRES" => {
"Test::More" => "0.88"
},
- "VERSION" => "0.66",
+ "VERSION" => "0.68",
"test" => {
"TESTS" => "t/*.t"
}
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/README b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/README
index 0960f8935e5..185cd151198 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/README
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/README
@@ -1,7 +1,5 @@
-
-
This archive contains the distribution BibTeX-Parser,
-version 0.66:
+version 0.68:
A pure perl BibTeX parser
@@ -11,6 +9,4 @@ This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
-Version 0.66 is the first version released by Boris Veytsman.
-It has an important change: now braces in names are kept to
-allow the proper output of the entries \ No newline at end of file
+
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/dist.ini b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/dist.ini
index 5e435b528c2..ca341ef139b 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/dist.ini
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/dist.ini
@@ -1,5 +1,5 @@
name = BibTeX-Parser
-version = 0.66
+version = 0.68
author = Gerhard Gossen <gerhard.gossen@googlemail.com> and Boris Veytsman <boris@varphi.com>
license = Perl_5
copyright_holder = Gerhard Gossen and Boris Veytsman
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/03-parse_entry.t b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/03-parse_entry.t
index e4d0e1b18cc..62badfe9365 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/03-parse_entry.t
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/03-parse_entry.t
@@ -1,61 +1,67 @@
-#!/usr/bin/perl -w
-
-use Test::More tests => 2;
-
-use IO::String;
-use BibTeX::Parser;
-
-{
- my $string = q|@article{lin1973,
- author = "Shen Lin and Brian W. Kernighan",
- title = "An Effective Heuristic Algorithm for the Travelling-Salesman Problem",
- journal = "Operations Research",
- volume = 21,
- year = 1973,
- pages = "498--516"
- }|;
- my $fh = IO::String->new($string);
-
- my $parser = BibTeX::Parser->new( $fh );
-
-#my @result = BibTeX::Parser->_parse($fh);
-
- my $entry = $parser->next;
-
- is_deeply($entry, {_type => 'ARTICLE', _key => 'lin1973', author => "Shen Lin and Brian W. Kernighan",
- title => "An Effective Heuristic Algorithm for the Travelling-Salesman Problem",
- journal => "Operations Research",
- volume => 21,
- year => 1973,
- pages => "498--516", _parse_ok => 1,
- _raw => $string}, "parse \@ARTICLE");
-
-}
-{
- my $string = q|@InProceedings{Herper:2001:MVS,
- author = {Henry Herper},
+#!/usr/bin/perl -w
+
+use Test::More tests => 2;
+
+use IO::String;
+use BibTeX::Parser;
+
+{
+ my $string = q|@article{lin1973,
+ author = "Shen Lin and Brian W. Kernighan",
+ title = "An Effective Heuristic Algorithm for the Travelling-Salesman Problem",
+ journal = "Operations Research",
+ volume = 21,
+ year = 1973,
+ pages = "498--516"
+ }|;
+ my $fh = IO::String->new($string);
+
+ my $parser = BibTeX::Parser->new( $fh );
+
+#my @result = BibTeX::Parser->_parse($fh);
+
+ my $entry = $parser->next;
+
+ is_deeply($entry, {_type => 'ARTICLE', _key => 'lin1973', author => "Shen Lin and Brian W. Kernighan",
+ title => "An Effective Heuristic Algorithm for the Travelling-Salesman Problem",
+ journal => "Operations Research",
+ volume => 21,
+ year => 1973,
+ pages => "498--516", _parse_ok => 1,
+ _fieldnums => {'author' => 0, 'title' => 1,
+ 'journal' => 2, 'volume' => 3,
+ 'year' => 4, 'pages' => 5},
+ _raw => $string}, "parse \@ARTICLE");
+
+}
+{
+ my $string = q|@InProceedings{Herper:2001:MVS,
+ author = {Henry Herper},
title = {{M}odellierung von {S}ystemen: ein
- {A}pplikationsgebiet im {I}nformatikunterricht},
+ {A}pplikationsgebiet im {I}nformatikunterricht},
booktitle = {Informatikunterricht und Medienbildung, INFOS 2001
(9. Fachtagung Informatik und Schule, Paderborn
- 17.-20- September 2001) -- Tagungsband},
- editor = {Reinhard Keil-Slavik and Johannes Magenheim},
- year = {2001},
-}|;
- my $fh = IO::String->new($string);
-
- my $parser = BibTeX::Parser->new( $fh );
-
- my $entry = $parser->next;
-
- is_deeply($entry, {
- _type => 'INPROCEEDINGS',
- _key => 'Herper:2001:MVS',
- author => "Henry Herper",
- title => "{M}odellierung von {S}ystemen: ein {A}pplikationsgebiet im {I}nformatikunterricht",
- booktitle => "Informatikunterricht und Medienbildung, INFOS 2001 (9. Fachtagung Informatik und Schule, Paderborn 17.-20- September 2001) -- Tagungsband",
- editor => "Reinhard Keil-Slavik and Johannes Magenheim",
- year => 2001,
- _parse_ok => 1,
- _raw => $string}, "parse \@ARTICLE");
-}
+ 17.-20- September 2001) -- Tagungsband},
+ editor = {Reinhard Keil-Slavik and Johannes Magenheim},
+ year = {2001},
+}|;
+ my $fh = IO::String->new($string);
+
+ my $parser = BibTeX::Parser->new( $fh );
+
+ my $entry = $parser->next;
+
+ is_deeply($entry, {
+ _type => 'INPROCEEDINGS',
+ _key => 'Herper:2001:MVS',
+ _fieldnums => {'author' => 0, 'title' => 1,
+ 'booktitle' => 2, 'editor' => 3,
+ 'year' => 4},
+ author => "Henry Herper",
+ title => "{M}odellierung von {S}ystemen: ein {A}pplikationsgebiet im {I}nformatikunterricht",
+ booktitle => "Informatikunterricht und Medienbildung, INFOS 2001 (9. Fachtagung Informatik und Schule, Paderborn 17.-20- September 2001) -- Tagungsband",
+ editor => "Reinhard Keil-Slavik and Johannes Magenheim",
+ year => 2001,
+ _parse_ok => 1,
+ _raw => $string}, "parse \@ARTICLE");
+}
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/09-complex.t b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/09-complex.t
index eff8f751b29..0dc126b974c 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/09-complex.t
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/09-complex.t
@@ -23,6 +23,10 @@ is_deeply($entry, {_type => 'ARTICLE', _key => 'Ahrenberg88',
pages => "66--70",
year => "1988",
keywords => "conver",
+ _fieldnums => {'author' => 0, 'title' => 1,
+ 'journal' => 2, 'volume' => 3,
+ 'number' => 4, 'pages'=> 5,
+ 'year' => 6, 'keywords' => 7},
_parse_ok => 1,
_raw => '@Article{Ahrenberg88,
author = "L. Ahrenberg and A. Jonsson",
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/10-funnyname.t b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/10-funnyname.t
index 1d21a2ea093..6d32521aacd 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/10-funnyname.t
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/10-funnyname.t
@@ -26,6 +26,10 @@ is_deeply(
pages => 1,
year => 2008,
_parse_ok => 1,
+ _fieldnums => {'year' => 0, 'title' => 1,
+ 'author' => 2, 'journal' => 3,
+ 'volume' => 4, 'number'=> 5,
+ 'pages' => 6},
_raw => '@article{testkey,
year = {2008},
title = "foo",
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/13_output.t b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/13_output.t
index 2d2e1ebfd36..e298aa5a59e 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/13_output.t
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/13_output.t
@@ -11,13 +11,15 @@ my $fh = new IO::File "t/bibs/01.bib", "r" ;
my $parser = new BibTeX::Parser $fh;
+
+
while (my $entry = $parser->next) {
if($entry->key eq 'key01') {
my $result='@ARTICLE{key01,
- month = {January~1},
- title = {Title text},
- author = {Duck, Donald and Else, Someone},
year = {1950},
+ author = {Duck, Donald and Else, Someone},
+ title = {Title text},
+ month = {January~1},
}';
is($entry->to_string,$result);
}
@@ -25,3 +27,4 @@ while (my $entry = $parser->next) {
}
done_testing();
+
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/bibs/english.bib b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/bibs/english.bib
index eda85e24d05..c7cd3409222 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/bibs/english.bib
+++ b/Master/texmf-dist/source/support/bibtexperllibs/BibTeX-Parser/t/bibs/english.bib
@@ -1,4 +1,4 @@
-$Id: english.bib,v 1.2 2015/12/24 18:46:53 boris Exp $
+$Id: english.bib,v 1.3 2016/03/10 19:00:02 boris Exp $
Please notify Adrian F Clark <alien@uk.ac.essex.ese> of any additions
or corrections to this list.
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Changes b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Changes
index d06466c13b0..a1e68be7ade 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Changes
+++ b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Changes
@@ -1,5 +1,8 @@
Changes for LaTeX::ToUnicode
+0.04 2015-12-25 19:16:41+00:00
+ Macrons are handled properly
+
0.03 2010-10-18 18:04:14
Specify minimal perl version (5.8.0) for UTF-8 support
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/LICENSE b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/LICENSE
index 7d7b0bce304..2bf757fccfb 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/LICENSE
+++ b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/LICENSE
@@ -1,4 +1,4 @@
-This software is copyright (c) 2010 by Gerhard Gossen.
+This software is copyright (c) 2010-2016 by Gerhard Gossen and Boris Veytsman
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
@@ -12,7 +12,7 @@ b) the "Artistic License"
--- The GNU General Public License, Version 1, February 1989 ---
-This software is Copyright (c) 2010 by Gerhard Gossen.
+This software is copyright (c) 2010-2016 by Gerhard Gossen and Boris Veytsman
This is free software, licensed under:
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/META.yml b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/META.yml
index 0808eaa33c7..30d55cd33b1 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/META.yml
+++ b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/META.yml
@@ -1,19 +1,21 @@
----
-abstract: 'Convert LaTeX commands to Unicode'
+--- #YAML:1.0
+name: LaTeX-ToUnicode
+version: 0.04
+abstract: Convert LaTeX commands to Unicode
author:
- - 'Gerhard Gossen <gerhard.gossen@googlemail.com>'
-build_requires: {}
+ - Gerhard Gossen <gerhard.gossen@googlemail.com> and Boris Veytsman <boris@varphi.com>
+license: perl
+distribution_type: module
configure_requires:
- ExtUtils::MakeMaker: 6.31
-dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.102342, CPAN::Meta::Converter version 2.101670'
-license: perl
+ ExtUtils::MakeMaker: 6.31
+build_requires:
+ ExtUtils::MakeMaker: 0
+requires: {}
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.55_02
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
-name: LaTeX-ToUnicode
-requires:
- perl: 5.8.0
-resources:
- repository: http://github.com/gerhardgossen/latex-tounicode
-version: 0.03
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Makefile.PL b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Makefile.PL
index bc3f3df880b..9660c45c8b5 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Makefile.PL
+++ b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/Makefile.PL
@@ -10,7 +10,7 @@ use ExtUtils::MakeMaker 6.31;
my %WriteMakefileArgs = (
'ABSTRACT' => 'Convert LaTeX commands to Unicode',
- 'AUTHOR' => 'Gerhard Gossen <gerhard.gossen@googlemail.com>',
+ 'AUTHOR' => 'Gerhard Gossen <gerhard.gossen@googlemail.com> and Boris Veytsman <boris@varphi.com>',
'BUILD_REQUIRES' => {},
'CONFIGURE_REQUIRES' => {
'ExtUtils::MakeMaker' => '6.31'
@@ -20,7 +20,7 @@ my %WriteMakefileArgs = (
'LICENSE' => 'perl',
'NAME' => 'LaTeX::ToUnicode',
'PREREQ_PM' => {},
- 'VERSION' => '0.03',
+ 'VERSION' => '0.04',
'test' => {
'TESTS' => 't/*.t'
}
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/README b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/README
index 2ab8acc2ca0..abbb803eb3b 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/README
+++ b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/README
@@ -1,11 +1,11 @@
This archive contains the distribution LaTeX-ToUnicode,
-version 0.03:
+version 0.04:
Convert LaTeX commands to Unicode
-This software is copyright (c) 2010 by Gerhard Gossen.
+This software is copyright (c) 2010-2016 by Gerhard Gossen and Boris Veytsman
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/dist.ini b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/dist.ini
index 52dfa14626b..7c49db83b46 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/dist.ini
+++ b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/dist.ini
@@ -1,9 +1,9 @@
name = LaTeX-ToUnicode
-author = Gerhard Gossen <gerhard.gossen@googlemail.com>
+author = Gerhard Gossen <gerhard.gossen@googlemail.com> and Boris Veytsman <boris@varphi.com>
license = Perl_5
-copyright_holder = Gerhard Gossen
-copyright_year = 2010
-version = 0.03
+copyright_holder = Gerhard Gossen and Boris Veytsman
+copyright_year = 2015
+version = 0.04
[@Classic]
[Prereqs]
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/t/convert.t b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/t/convert.t
index 14aa5d469a4..11d80cfee0a 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/t/convert.t
+++ b/Master/texmf-dist/source/support/bibtexperllibs/LaTeX-ToUnicode/t/convert.t
@@ -16,6 +16,9 @@ my @tests = (
[ '{\`a}' => 'à' ],
[ '\ae' => 'æ' ],
[ '\L' => 'Ł' ],
+ [ "{\\'e}" => 'é'],
+ ['\={a}' => 'ā'],
+ ['{\=a}' => 'ā'],
);
foreach my $test ( @tests ) {
diff --git a/Master/texmf-dist/source/support/bibtexperllibs/README b/Master/texmf-dist/source/support/bibtexperllibs/README
index 6266323fb8f..65d114cced2 100644
--- a/Master/texmf-dist/source/support/bibtexperllibs/README
+++ b/Master/texmf-dist/source/support/bibtexperllibs/README
@@ -1,5 +1,5 @@
BibTeX Perl Libs
- Version 0.2
+ Version 1.0
Gerhard Gossen and Boris Veytsman
This package provides BibTeX related Perl libraries by Gerhard Gossen,
@@ -13,4 +13,6 @@ scripts/bibtexperllibs inside your TeX distribution.
Changes:
+ version 1.0 Upgraded BibTeX::Parser to v0.68 and LaTeX::ToUnicode to 0.04
+
version 0.2 New upstream version for BibTeX::Parser (0.66)