r3185 - in /packages/libfont-ttf-perl/trunk: MANIFEST MANIFEST.SKIP
META.yml
Makefile.PL README.TXT debian/changelog debian/control lib/Font/TTF.pm
lib/Font/TTF/Changes lib/Font/TTF/Font.pm lib/Font/TTF/OS_2.pm
lib/Font/TTF/Ttopen.pm
eloy at users.alioth.debian.org
eloy at users.alioth.debian.org
Wed Jun 28 12:01:52 UTC 2006
Author: eloy
Date: Wed Jun 28 12:01:50 2006
New Revision: 3185
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=3185
Log:
eloy: new upstream version
Added:
packages/libfont-ttf-perl/trunk/lib/Font/TTF.pm
- copied unchanged from r3184, packages/libfont-ttf-perl/branches/upstream/current/lib/Font/TTF.pm
Removed:
packages/libfont-ttf-perl/trunk/Makefile.PL
Modified:
packages/libfont-ttf-perl/trunk/MANIFEST
packages/libfont-ttf-perl/trunk/MANIFEST.SKIP
packages/libfont-ttf-perl/trunk/META.yml
packages/libfont-ttf-perl/trunk/README.TXT (props changed)
packages/libfont-ttf-perl/trunk/debian/changelog
packages/libfont-ttf-perl/trunk/debian/control
packages/libfont-ttf-perl/trunk/lib/Font/TTF/Changes (props changed)
packages/libfont-ttf-perl/trunk/lib/Font/TTF/Font.pm
packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm
packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm
Modified: packages/libfont-ttf-perl/trunk/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfont-ttf-perl/trunk/MANIFEST?rev=3185&op=diff
==============================================================================
--- packages/libfont-ttf-perl/trunk/MANIFEST (original)
+++ packages/libfont-ttf-perl/trunk/MANIFEST Wed Jun 28 12:01:50 2006
@@ -1,4 +1,5 @@
COPYING
+lib/Font/TTF.pm
lib/Font/TTF/AATKern.pm
lib/Font/TTF/AATutils.pm
lib/Font/TTF/Anchor.pm
@@ -60,7 +61,6 @@
lib/Font/TTF/Win32.pm
lib/Font/TTF/XMLparse.pm
lib/ttfmod.pl
-Makefile.PL
MANIFEST This list of files
MANIFEST.SKIP
META.yml
Modified: packages/libfont-ttf-perl/trunk/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfont-ttf-perl/trunk/MANIFEST.SKIP?rev=3185&op=diff
==============================================================================
--- packages/libfont-ttf-perl/trunk/MANIFEST.SKIP (original)
+++ packages/libfont-ttf-perl/trunk/MANIFEST.SKIP Wed Jun 28 12:01:50 2006
@@ -10,5 +10,10 @@
\.cvsignore
^#
\.svn/
-^Makefile$
-~$
+Makefile
+\.par$
+-stamp$
+debian/
+pm_to_blib
+\~$
+dev/
Modified: packages/libfont-ttf-perl/trunk/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfont-ttf-perl/trunk/META.yml?rev=3185&op=diff
==============================================================================
--- packages/libfont-ttf-perl/trunk/META.yml (original)
+++ packages/libfont-ttf-perl/trunk/META.yml Wed Jun 28 12:01:50 2006
@@ -1,8 +1,8 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Font-TTF
-version: 0.38
-version_from:
+version: 0.39
+version_from: lib/Font/TTF.pm
installdirs: site
requires:
Propchange: packages/libfont-ttf-perl/trunk/README.TXT
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/libfont-ttf-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfont-ttf-perl/trunk/debian/changelog?rev=3185&op=diff
==============================================================================
--- packages/libfont-ttf-perl/trunk/debian/changelog (original)
+++ packages/libfont-ttf-perl/trunk/debian/changelog Wed Jun 28 12:01:50 2006
@@ -1,3 +1,12 @@
+libfont-ttf-perl (0.39a-1) unstable; urgency=low
+
+ * New upstream release (closes: #375324)
+ * debian/control:
+ - Uploaders: Added me
+ - Standards-Version: increased to 3.7.2.1 without changes
+
+ -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org> Wed, 28 Jun 2006 13:58:46 +0200
+
libfont-ttf-perl (0.38.1-1) unstable; urgency=low
* New upstream release
Modified: packages/libfont-ttf-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfont-ttf-perl/trunk/debian/control?rev=3185&op=diff
==============================================================================
--- packages/libfont-ttf-perl/trunk/debian/control (original)
+++ packages/libfont-ttf-perl/trunk/debian/control Wed Jun 28 12:01:50 2006
@@ -2,16 +2,16 @@
Section: perl
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Gunnar Wolf <gwolf at debian.org>, Russ Allbery <rra at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
+Uploaders: Gunnar Wolf <gwolf at debian.org>, Russ Allbery <rra at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
Build-Depends: debhelper (>= 5.0.0)
Build-Depends-Indep: perl (>= 5.8.0-19)
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2.1
Package: libfont-ttf-perl
Architecture: all
Depends: ${perl:Depends}
Suggests: libxml-parser-perl
Description: Perl module for TrueType font hacking
- This module supports reading, processing and writing many different
+ Font::TTF module supports reading, processing and writing many different
table formats for TrueType fonts. You can do almost anything with a
TrueType font with this module.
Propchange: packages/libfont-ttf-perl/trunk/lib/Font/TTF/Changes
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/libfont-ttf-perl/trunk/lib/Font/TTF/Font.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfont-ttf-perl/trunk/lib/Font/TTF/Font.pm?rev=3185&op=diff
==============================================================================
--- packages/libfont-ttf-perl/trunk/lib/Font/TTF/Font.pm (original)
+++ packages/libfont-ttf-perl/trunk/lib/Font/TTF/Font.pm Wed Jun 28 12:01:50 2006
@@ -615,21 +615,23 @@
sub dirty
{ $_[0]->tables_do(sub { $_[0]->dirty; }); $_[0]; }
-=head2 $f->tables_do(&func)
+=head2 $f->tables_do(&func [, tables])
Calls &func for each table in the font. Calls the table in alphabetical sort
order as per the order in the directory:
&func($table, $name);
+May optionally take a list of table names in which case func is called
+for each of them in the given order.
=cut
sub tables_do
{
- my ($self, $func) = @_;
+ my ($self, $func, @tables) = @_;
my ($t);
- foreach $t (sort grep {length($_) == 4} keys %$self)
+ foreach $t (@tables ? @tables : sort grep {length($_) == 4} keys %$self)
{ &$func($self->{$t}, $t); }
$self;
}
Modified: packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm?rev=3185&op=diff
==============================================================================
--- packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm (original)
+++ packages/libfont-ttf-perl/trunk/lib/Font/TTF/OS_2.pm Wed Jun 28 12:01:50 2006
@@ -60,7 +60,7 @@
breakChar
maxLookups
-Notice that versions 0, 1 & 2 of the table are supported. Notice also that the
+Notice that versions 0, 1, 2 & 3 of the table are supported. Notice also that the
Panose variable has been broken down into its elements.
=head1 METHODS
@@ -119,7 +119,9 @@
'CapHeight' => 's',
'defaultChar' => 'S',
'breakChar' => 'S',
- 'maxLookups' => 's');
+ 'maxLookups' => 's',
+ '' => '', # i.e. v3 is basically same as v2
+ );
@weights = qw(64 14 27 35 100 20 14 42 63 3 6 35 20 56 56 17 4 49 56 71 31 10 18 3 18 2 166);
@@ -130,7 +132,7 @@
my ($k, $v, $c, $n, $i, $t, $j);
$n = 0;
- @lens = (76, 84, 94);
+ @lens = (76, 84, 94, 94);
for ($j = 0; $j < $#field_info; $j += 2)
{
if ($field_info[$j] eq '')
@@ -140,7 +142,7 @@
}
($k, $v, $c) = TTF_Init_Fields($field_info[$j], $c, $field_info[$j+1]);
next unless defined $k && $k ne "";
- for ($i = $n; $i < 3; $i++)
+ for ($i = $n; $i < 4; $i++)
{ $fields[$i]{$k} = $v; }
}
}
@@ -163,7 +165,7 @@
$self->{' INFILE'}->read($dat, 2);
$ver = unpack("n", $dat);
$self->{'Version'} = $ver;
- if ($ver < 3)
+ if ($ver < 4)
{
$self->{' INFILE'}->read($dat, $lens[$ver]);
TTF_Read_Fields($self, $dat, $fields[$ver]);
@@ -293,10 +295,25 @@
$self->{'sTypoLineGap'} = $table->{'LineGap'} = 0;
}
- for ($i = 0; $i < 26; $i++)
- { $avg += $hmtx->{'advance'}[$map->{'val'}{$i + 0x0061}] * $weights[$i]; }
- $avg += $hmtx->{'advance'}[$map->{'val'}{0x0020}] * $weights[-1];
- $self->{'xAvgCharWidth'} = $avg / 1000;
+ if ($self->{'Version'} < 3)
+ {
+ for ($i = 0; $i < 26; $i++)
+ { $avg += $hmtx->{'advance'}[$map->{'val'}{$i + 0x0061}] * $weights[$i]; }
+ $avg += $hmtx->{'advance'}[$map->{'val'}{0x0020}] * $weights[-1];
+ $self->{'xAvgCharWidth'} = $avg / 1000;
+ }
+ elsif ($self->{'Version'} > 2)
+ {
+ $i = 0; $avg = 0;
+ foreach (@{$hmtx->{'advance'}})
+ {
+ next unless ($_);
+ $i++;
+ $avg += $_;
+ }
+ $avg /= $i if ($i);
+ $self->{'xAvgCharWidth'} = $avg;
+ }
foreach $i (keys %{$map->{'val'}})
{
Modified: packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm?rev=3185&op=diff
==============================================================================
--- packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm (original)
+++ packages/libfont-ttf-perl/trunk/lib/Font/TTF/Ttopen.pm Wed Jun 28 12:01:50 2006
@@ -1041,13 +1041,13 @@
$r = $lookup->{'RULES'}[0][0];
$out .= pack('n2', $fmt, scalar @{$r->{'PRE'}});
foreach $t (@{$r->{'PRE'}})
- { $out .= Font::TTF::Ttopen::ref_cache($t, $ctables, length($out)); }
+ { $out .= pack('n', Font::TTF::Ttopen::ref_cache($t, $ctables, length($out))); }
$out .= pack('n', scalar @{$r->{'MATCH'}});
foreach $t (@{$r->{'MATCH'}})
- { $out .= Font::TTF::Ttopen::ref_cache($t, $ctables, length($out)); }
+ { $out .= pack('n', Font::TTF::Ttopen::ref_cache($t, $ctables, length($out))); }
$out .= pack('n', scalar @{$r->{'POST'}});
foreach $t (@{$r->{'POST'}})
- { $out .= Font::TTF::Ttopen::ref_cache($t, $ctables, length($out)); }
+ { $out .= pack('n', Font::TTF::Ttopen::ref_cache($t, $ctables, length($out))); }
$out .= pack('n', scalar @{$r->{'ACTION'}});
foreach $t (@{$r->{'ACTION'}})
{ $out .= pack('n2', @$t); }
More information about the Pkg-perl-cvs-commits
mailing list