Permalink
Browse files

SDLx::Text now shipping with default font

  • Loading branch information...
1 parent 7607c55 commit e74beea321ff961b585a835afc9d044c406a7a2c @garu garu committed Feb 27, 2011
Showing with 334 additions and 17 deletions.
  1. +9 −8 Build.PL
  2. +216 −0 OFL-FAQ.txt
  3. +94 −0 OFL.txt
  4. +5 −2 lib/SDLx/Text.pm
  5. +2 −2 lib/pods/SDLx/Text.pod
  6. BIN share/GenBasB.ttf
  7. +8 −5 t/sdlx_text.t
View
@@ -571,7 +571,7 @@ my $build = $package->new(
'ExtUtils::CBuilder' => '0.260301',
'Alien::SDL' => '1.424',
'File::Find' => '0',
- 'File::ShareDir' => '0',
+ 'File::ShareDir' => '1.0',
'Tie::Simple' => '0',
'Capture::Tiny' => '0',
},
@@ -581,18 +581,19 @@ my $build = $package->new(
'Test::Most' => '0.21',
'Alien::SDL' => '1.424',
'File::Find' => '0',
- 'File::ShareDir' => '0',
- 'Tie::Simple' => '0'
+ 'File::ShareDir' => '1.0',
+ 'Tie::Simple' => '0',
},
requires => {
- 'Tie::Simple' => '0',
- 'CPAN' => '1.92',
- 'perl' => '5.008009'
+ 'Tie::Simple' => '0',
+ 'File::ShareDir' => '1.0',
+ 'CPAN' => '1.92',
+ 'perl' => '5.008009',
},
+ share_dir => 'share',
build_recommends => {
- 'Pod::ToDemo' => '0.20'
-
+ 'Pod::ToDemo' => '0.20',
},
config => $My::Builder::config,
c_source => 'src',
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
94 OFL.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2003-2008 SIL International (http://www.sil.org/),
+with Reserved Font Names "Gentium" and "SIL".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 1 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that the font
+names of derivative works are changed. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
View
@@ -12,8 +12,11 @@ sub new {
unless ( SDL::Config->has('SDL_ttf') ) {
Carp::cluck("SDL_ttf support has not been compiled");
}
- my $file = $options{'font'}
- or Carp::croak 'must provide font filename';
+ my $file = $options{'font'};
+ if (!$file) {
+ require File::ShareDir;
+ $file = File::ShareDir::dist_file('SDL', 'GenBasB.ttf');
+ }
my $color = $options{'color'} || [255, 0, 0];
View
@@ -37,7 +37,7 @@ Instantiates a new SDLx::Text object. All arguments are optional:
Sets the font to use. Fonts can be in TTF or FON formats. Generates an
exception if the font cannot be loaded. If this argument is not provided,
-it will load the default C<Tuffy> free font (see "L</"COPYRIGHT & LICENSE">".
+it will load the default C<Gentium Basic (Bold)> free font (see "L</"COPYRIGHT & LICENSE">" for more information).
=item * color
@@ -115,7 +115,7 @@ See L<SDL/AUTHORS>.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
-This module ships with a default font, "I<Tuffy>", released to public domain by Thatcher Ulrich (http://tulrich.com).
+This module ships with a default font, "I<Gentium Basic (Bold)>", Copyright 2003-2008 SIL International (http://sil.org), released under the SIL Open Font License 1.1 (OFL). The font is available for use in free and commercial products, with some minor restrictions. Please read the C<OFL.txt> and C<OFL-FAQ.txt> for further information.
=head1 SEE ALSO
View
Binary file not shown.
View
@@ -14,20 +14,23 @@ BEGIN {
}
}
-use SDLx::Text;
+use_ok( 'SDLx::Text' );
my $videodriver = $ENV{SDL_VIDEODRIVER};
$ENV{SDL_VIDEODRIVER} = 'dummy' unless $ENV{SDL_RELEASE_TESTING};
-
-my $score = SDLx::Text->new( font => 'test/data/aircut3.ttf' );
+use FindBin;
+use File::Spec;
+my $score = SDLx::Text->new(
+ font => File::Spec->catfile($FindBin::Bin, '..', 'share', 'GenBasB.ttf')
+);
isa_ok( $score, 'SDLx::Text');
$score->text('Hello!');
-is( $score->w, 56, 'Hello! is 56 px wide!' );
-is( $score->h, 27, 'Hello! is 27 px high!' );
+is( $score->w, 62, 'Hello! is 62 px wide!' );
+is( $score->h, 28, 'Hello! is 28 px high!' );
END {

0 comments on commit e74beea

Please sign in to comment.