r9410 - in /trunk/libpdf-api2-perl: ./ debian/ examples/ lib/PDF/API2/ lib/PDF/API2/Resource/ lib/PDF/API2/Resource/CIDFont/
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Fri Nov 16 14:31:21 UTC 2007
Author: dmn
Date: Fri Nov 16 14:31:21 2007
New Revision: 9410
URL: http://svn.debian.org/wsvn/?sc=1&rev=9410
Log:
upstream version 0.66
Added:
trunk/libpdf-api2-perl/examples/022_truefonts_diacrits_utf8
- copied unchanged from r9409, branches/upstream/libpdf-api2-perl/current/examples/022_truefonts_diacrits_utf8
Modified:
trunk/libpdf-api2-perl/MANIFEST
trunk/libpdf-api2-perl/META.yml
trunk/libpdf-api2-perl/debian/changelog
trunk/libpdf-api2-perl/examples/020_textunderline
trunk/libpdf-api2-perl/lib/PDF/API2/Annotation.pm
trunk/libpdf-api2-perl/lib/PDF/API2/Content.pm
trunk/libpdf-api2-perl/lib/PDF/API2/Resource/BaseFont.pm
trunk/libpdf-api2-perl/lib/PDF/API2/Resource/CIDFont/TrueType.pm
trunk/libpdf-api2-perl/lib/PDF/API2/Version.pm
Modified: trunk/libpdf-api2-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/MANIFEST?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/MANIFEST (original)
+++ trunk/libpdf-api2-perl/MANIFEST Fri Nov 16 14:31:21 2007
@@ -210,6 +210,7 @@
examples/020_textunderline
examples/021_synfonts
examples/022_truefonts
+examples/022_truefonts_diacrits_utf8
examples/023_cjkfonts
examples/024_bmpfonts
examples/025_unifonts
Modified: trunk/libpdf-api2-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/META.yml?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/META.yml (original)
+++ trunk/libpdf-api2-perl/META.yml Fri Nov 16 14:31:21 2007
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: PDF-API2
-version: 0.65
+version: 0.66
version_from: lib/PDF/API2/Version.pm
installdirs: site
requires:
Modified: trunk/libpdf-api2-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/debian/changelog?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/debian/changelog (original)
+++ trunk/libpdf-api2-perl/debian/changelog Fri Nov 16 14:31:21 2007
@@ -1,4 +1,4 @@
-libpdf-api2-perl (0.65-1) UNRELEASED; urgency=low
+libpdf-api2-perl (0.66-1) UNRELEASED; urgency=low
[ Damyan Ivanov ]
* New upstream release
Modified: trunk/libpdf-api2-perl/examples/020_textunderline
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/examples/020_textunderline?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/examples/020_textunderline (original)
+++ trunk/libpdf-api2-perl/examples/020_textunderline Fri Nov 16 14:31:21 2007
@@ -31,7 +31,7 @@
# OF THE USE OF THIS FILE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $Id: 020_textunderline,v 2.0 2005/11/16 02:16:00 areibens Exp $
+# $Id: 020_textunderline,v 2.1 2007/10/23 07:46:35 areibens Exp $
#
#=======================================================================
Modified: trunk/libpdf-api2-perl/lib/PDF/API2/Annotation.pm
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/lib/PDF/API2/Annotation.pm?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/lib/PDF/API2/Annotation.pm (original)
+++ trunk/libpdf-api2-perl/lib/PDF/API2/Annotation.pm Fri Nov 16 14:31:21 2007
@@ -27,7 +27,7 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
-# $Id: Annotation.pm,v 2.0 2005/11/16 02:16:00 areibens Exp $
+# $Id: Annotation.pm,v 2.1 2007/10/02 19:59:37 areibens Exp $
#
#=======================================================================
package PDF::API2::Annotation;
@@ -44,7 +44,7 @@
@ISA = qw(PDF::API2::Basic::PDF::Dict);
- ( $VERSION ) = sprintf '%i.%03i', split(/\./,('$Revision: 2.0 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2005/11/16 02:16:00 $
+ ( $VERSION ) = sprintf '%i.%03i', split(/\./,('$Revision: 2.1 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2007/10/02 19:59:37 $
use utf8;
use Encode qw(:all);
@@ -431,6 +431,9 @@
=head1 HISTORY
$Log: Annotation.pm,v $
+ Revision 2.1 2007/10/02 19:59:37 areibens
+ added movie annotation
+
Revision 2.0 2005/11/16 02:16:00 areibens
revision workaround for SF cvs import not to screw up CPAN
Modified: trunk/libpdf-api2-perl/lib/PDF/API2/Content.pm
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/lib/PDF/API2/Content.pm?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/lib/PDF/API2/Content.pm (original)
+++ trunk/libpdf-api2-perl/lib/PDF/API2/Content.pm Fri Nov 16 14:31:21 2007
@@ -27,7 +27,7 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
-# $Id: Content.pm,v 2.8 2007/08/07 20:23:37 areibens Exp $
+# $Id: Content.pm,v 2.9 2007/10/10 06:18:15 areibens Exp $
#
#=======================================================================
@@ -47,7 +47,7 @@
@ISA = qw(PDF::API2::Basic::PDF::Dict);
- ( $VERSION ) = sprintf '%i.%03i', split(/\./,('$Revision: 2.8 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2007/08/07 20:23:37 $
+ ( $VERSION ) = sprintf '%i.%03i', split(/\./,('$Revision: 2.9 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2007/10/10 06:18:15 $
}
@@ -1461,7 +1461,7 @@
sub _font
{
my ($font,$size)=@_;
- if($font->isvirtual)
+ if($font->isvirtual == 1)
{
return('/'.$font->fontlist->[0]->name.' '.float($size).' Tf');
}
@@ -1485,7 +1485,7 @@
$self->{' fontsize'}=$size;
$self->{' fontset'}=0;
- if($font->isvirtual)
+ if($font->isvirtual == 1)
{
foreach my $f (@{$font->fontlist})
{
Modified: trunk/libpdf-api2-perl/lib/PDF/API2/Resource/BaseFont.pm
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/lib/PDF/API2/Resource/BaseFont.pm?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/lib/PDF/API2/Resource/BaseFont.pm (original)
+++ trunk/libpdf-api2-perl/lib/PDF/API2/Resource/BaseFont.pm Fri Nov 16 14:31:21 2007
@@ -27,7 +27,7 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
-# $Id: BaseFont.pm,v 2.7 2007/04/07 10:25:46 areibens Exp $
+# $Id: BaseFont.pm,v 2.9 2007/10/16 20:08:19 areibens Exp $
#
#=======================================================================
package PDF::API2::Resource::BaseFont;
@@ -46,7 +46,7 @@
@ISA = qw( PDF::API2::Resource );
- ( $VERSION ) = sprintf '%i.%03i', split(/\./,('$Revision: 2.7 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2007/04/07 10:25:46 $
+ ( $VERSION ) = sprintf '%i.%03i', split(/\./,('$Revision: 2.9 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2007/10/16 20:08:19 $
}
no warnings qw[ deprecated recursion uninitialized ];
@@ -548,17 +548,34 @@
sub wxByGlyph
{
my $self=shift;
- my $val=shift;
+ my $val=shift;
+ my $ret=undef;
if(ref($self->data->{wx}) eq 'HASH')
{
- return ( $self->data->{wx}->{$val} || $self->missingwidth || 300 );
+ $ret=$self->data->{wx}->{$val};
+ if(!defined($ret))
+ {
+ $ret=$self->missingwidth;
+ }
+ if(!defined($ret))
+ {
+ $ret=300;
+ }
}
else
{
my $cid=$self->cidByUni(uniByName($val));
- return ( $self->data->{wx}->[$cid] || $self->missingwidth || 300 );
- # return ( $self->data->{wx}->[$val] || $self->missingwidth || 300 );
- }
+ $ret=$self->data->{wx}->[$cid];
+ if(!defined($ret))
+ {
+ $ret=$self->missingwidth;
+ }
+ if(!defined($ret))
+ {
+ $ret=300;
+ }
+ }
+ return $ret;
}
=item $width = $font->wxByUni $uni
@@ -567,7 +584,22 @@
=cut
-sub wxByUni { return ( $_[0]->data->{wx}->{$_[0]->glyphByUni($_[1])} || $_[0]->missingwidth || 300 ); }
+sub wxByUni
+{
+ my $self=shift;
+ my $val=shift;
+ my $gid=$self->glyphByUni($val);
+ my $ret=$self->data->{wx}->{$gid};
+ if(!defined($ret))
+ {
+ $ret=$self->missingwidth;
+ }
+ if(!defined($ret))
+ {
+ $ret=300;
+ }
+ return $ret;
+}
=item $width = $font->wxByEnc $char
@@ -575,11 +607,20 @@
=cut
-sub wxByEnc {
+sub wxByEnc
+{
my ($self,$e)=@_;
my $g=$self->glyphByEnc($e);
- my $w=$self->data->{wx}->{$g} || $self->missingwidth || 300;
- return ( $w );
+ my $ret=$self->data->{wx}->{$g};
+ if(!defined($ret))
+ {
+ $ret=$self->missingwidth;
+ }
+ if(!defined($ret))
+ {
+ $ret=300;
+ }
+ return $ret;
}
=item $width = $font->wxByMap $char
@@ -588,7 +629,21 @@
=cut
-sub wxByMap { return ( $_[0]->data->{wx}->{$_[0]->glyphByMap($_[1])} || $_[0]->missingwidth || 300 ); }
+sub wxByMap
+{
+ my ($self,$m)=@_;
+ my $g=$self->glyphByMap($m);
+ my $ret=$self->data->{wx}->{$g};
+ if(!defined($ret))
+ {
+ $ret=$self->missingwidth;
+ }
+ if(!defined($ret))
+ {
+ $ret=300;
+ }
+ return $ret;
+}
=item $wd = $font->width $text
@@ -761,7 +816,7 @@
}
}
-sub isvirtual { return(undef); }
+sub isvirtual { return(0); }
1;
@@ -776,6 +831,12 @@
=head1 HISTORY
$Log: BaseFont.pm,v $
+ Revision 2.9 2007/10/16 20:08:19 areibens
+ changed undef safeguards for wx* methods
+
+ Revision 2.8 2007/10/10 06:18:15 areibens
+ fixed noisy undef handling of isvirtual
+
Revision 2.7 2007/04/07 10:25:46 areibens
fixed fix for wxByGlyph not honoring cidfont width arrays
Modified: trunk/libpdf-api2-perl/lib/PDF/API2/Resource/CIDFont/TrueType.pm
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/lib/PDF/API2/Resource/CIDFont/TrueType.pm?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/lib/PDF/API2/Resource/CIDFont/TrueType.pm (original)
+++ trunk/libpdf-api2-perl/lib/PDF/API2/Resource/CIDFont/TrueType.pm Fri Nov 16 14:31:21 2007
@@ -27,7 +27,7 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
-# $Id: TrueType.pm,v 2.1 2007/03/17 20:38:51 areibens Exp $
+# $Id: TrueType.pm,v 2.2 2007/10/23 07:45:49 areibens Exp $
#
#=======================================================================
package PDF::API2::Resource::CIDFont::TrueType;
@@ -50,7 +50,7 @@
@ISA = qw( PDF::API2::Resource::CIDFont );
- ( $VERSION ) = sprintf '%i.%03i', split(/\./,('$Revision: 2.1 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2007/03/17 20:38:51 $
+ ( $VERSION ) = sprintf '%i.%03i', split(/\./,('$Revision: 2.2 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2007/10/23 07:45:49 $
}
no warnings qw[ deprecated recursion uninitialized ];
@@ -199,12 +199,14 @@
$notdefbefore=0;
$ml=PDFArray();
$wx->add_elements(PDFNum($w),$ml);
- $ml->add_elements(PDFNum($self->data->{wx}->[$w]));
+ # $ml->add_elements(PDFNum($self->data->{wx}->[$w]));
+ $ml->add_elements(PDFNum($self->wxByCId($w)));
}
elsif($self->subvec($w) && $notdefbefore==0)
{
$notdefbefore=0;
- $ml->add_elements(PDFNum($self->data->{wx}->[$w]));
+ # $ml->add_elements(PDFNum($self->data->{wx}->[$w]));
+ $ml->add_elements(PDFNum($self->wxByCId($w)));
}
else
{
@@ -239,6 +241,9 @@
=head1 HISTORY
$Log: TrueType.pm,v $
+ Revision 2.2 2007/10/23 07:45:49 areibens
+ fixed width encoding for wrong advance codes
+
Revision 2.1 2007/03/17 20:38:51 areibens
replaced IOString dep. with scalar IO.
Modified: trunk/libpdf-api2-perl/lib/PDF/API2/Version.pm
URL: http://svn.debian.org/wsvn/trunk/libpdf-api2-perl/lib/PDF/API2/Version.pm?rev=9410&op=diff
==============================================================================
--- trunk/libpdf-api2-perl/lib/PDF/API2/Version.pm (original)
+++ trunk/libpdf-api2-perl/lib/PDF/API2/Version.pm Fri Nov 16 14:31:21 2007
@@ -9,14 +9,14 @@
package PDF::API2::Version;
BEGIN {
use vars qw( $VERSION %CVersion );
- $VERSION = '0.65';
+ $VERSION = '0.66';
%CVersion = (
- 'vFredo' => 'PDF::API2 0.65',
- 'vHex' => '0x00041000',
- 'vLong' => '0.65',
- 'vPerl' => '0.65',
- 'vShort' => '0.65',
- 'vWeb' => 'PDF::API2/0.65',
+ 'vFredo' => 'PDF::API2 0.66',
+ 'vHex' => '0x00042000',
+ 'vLong' => '0.66',
+ 'vPerl' => '0.66',
+ 'vShort' => '0.66',
+ 'vWeb' => 'PDF::API2/0.66',
);
}
1;
@@ -32,12 +32,12 @@
=head1 VERSION
- vFredo: PDF::API2 0.65
- vHex: 0x00041000
- vLong: 0.65
- vPerl: 0.65
- vShort: 0.65
- vWeb: PDF::API2/0.65
+ vFredo: PDF::API2 0.66
+ vHex: 0x00042000
+ vLong: 0.66
+ vPerl: 0.66
+ vShort: 0.66
+ vWeb: PDF::API2/0.66
=cut
More information about the Pkg-perl-cvs-commits
mailing list