From 3f14d643fd17ac77b4b8c01a10d141d0ab8d3c3b Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 18 Oct 2023 10:26:20 +0200 Subject: [PATCH 1/4] Improve the README --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e30b745..df8edfe 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,8 @@ Usage Example ------------- ### Base font information -``` + +```php $font = \FontLib\Font::load('fontfile.ttf'); $font->parse(); // for getFontWeight() to work this call must be done first! echo $font->getFontName() .'
'; @@ -28,14 +29,16 @@ $font->close(); ``` ### Font Metrics Generation -``` + +```php $font = FontLib\Font::load('fontfile.ttf'); $font->parse(); $font->saveAdobeFontMetrics('fontfile.ufm'); ``` ### Create a font subset -``` + +```php $font = FontLib\Font::load('fontfile.ttf'); $font->parse(); $font->setSubset("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ.:,;' (!?)+-*/== 1234567890"); // characters to include From e6ffdc40f1dca4d6758517eb0d0306238bbae4fd Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 18 Oct 2023 10:32:22 +0200 Subject: [PATCH 2/4] Add PHP 8.3 and bump actions checkout --- .github/workflows/phpunit.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 01e4435..c5ae9ac 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -26,10 +26,11 @@ jobs: - "8.0" - "8.1" - "8.2" + - "8.3" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install PHP uses: "shivammathur/setup-php@v2" From cb6d5c5495fae2508abe8aa44fe46edb10be51da Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 18 Oct 2023 10:32:58 +0200 Subject: [PATCH 3/4] Update the library license field --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4e39585..97b42b8 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "library", "description": "A library to read, parse, export and make subsets of different types of font files.", "homepage": "https://github.com/PhenX/php-font-lib", - "license": "LGPL-3.0", + "license": "LGPL-2.1-or-later", "authors": [ { "name": "Fabien Ménager", From 7911e0b4168ad61aab45412fb038e22d0bd71e31 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 18 Oct 2023 10:34:35 +0200 Subject: [PATCH 4/4] Update `@link` occurrences --- src/FontLib/AdobeFontMetrics.php | 4 ++-- src/FontLib/BinaryStream.php | 2 +- src/FontLib/EOT/File.php | 2 +- src/FontLib/EOT/Header.php | 2 +- src/FontLib/EncodingMap.php | 2 +- src/FontLib/Font.php | 2 +- src/FontLib/Glyph/Outline.php | 2 +- src/FontLib/Glyph/OutlineComponent.php | 2 +- src/FontLib/Glyph/OutlineComposite.php | 2 +- src/FontLib/Glyph/OutlineSimple.php | 2 +- src/FontLib/Header.php | 2 +- src/FontLib/OpenType/File.php | 2 +- src/FontLib/OpenType/TableDirectoryEntry.php | 2 +- src/FontLib/Table/DirectoryEntry.php | 2 +- src/FontLib/Table/Table.php | 2 +- src/FontLib/Table/Type/cmap.php | 2 +- src/FontLib/Table/Type/glyf.php | 2 +- src/FontLib/Table/Type/head.php | 2 +- src/FontLib/Table/Type/hhea.php | 2 +- src/FontLib/Table/Type/hmtx.php | 2 +- src/FontLib/Table/Type/kern.php | 2 +- src/FontLib/Table/Type/loca.php | 2 +- src/FontLib/Table/Type/maxp.php | 2 +- src/FontLib/Table/Type/name.php | 2 +- src/FontLib/Table/Type/nameRecord.php | 2 +- src/FontLib/Table/Type/os2.php | 2 +- src/FontLib/Table/Type/post.php | 2 +- src/FontLib/TrueType/Collection.php | 2 +- src/FontLib/TrueType/File.php | 2 +- src/FontLib/TrueType/Header.php | 2 +- src/FontLib/TrueType/TableDirectoryEntry.php | 2 +- src/FontLib/WOFF/File.php | 2 +- src/FontLib/WOFF/Header.php | 2 +- src/FontLib/WOFF/TableDirectoryEntry.php | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/FontLib/AdobeFontMetrics.php b/src/FontLib/AdobeFontMetrics.php index e75385f..e70e503 100644 --- a/src/FontLib/AdobeFontMetrics.php +++ b/src/FontLib/AdobeFontMetrics.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ @@ -48,7 +48,7 @@ function write($file, $encoding = null) { $this->startSection("FontMetrics", 4.1); $this->addPair("Notice", "Converted by PHP-font-lib"); - $this->addPair("Comment", "https://github.com/PhenX/php-font-lib"); + $this->addPair("Comment", "https://github.com/dompdf/php-font-lib"); $encoding_scheme = ($encoding ? $encoding : "FontSpecific"); $this->addPair("EncodingScheme", $encoding_scheme); diff --git a/src/FontLib/BinaryStream.php b/src/FontLib/BinaryStream.php index c7eb52f..5e170c6 100644 --- a/src/FontLib/BinaryStream.php +++ b/src/FontLib/BinaryStream.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/EOT/File.php b/src/FontLib/EOT/File.php index f51d876..55933eb 100644 --- a/src/FontLib/EOT/File.php +++ b/src/FontLib/EOT/File.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/EOT/Header.php b/src/FontLib/EOT/Header.php index 960e36a..2730c80 100644 --- a/src/FontLib/EOT/Header.php +++ b/src/FontLib/EOT/Header.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/EncodingMap.php b/src/FontLib/EncodingMap.php index 2acdebc..02e7ca4 100644 --- a/src/FontLib/EncodingMap.php +++ b/src/FontLib/EncodingMap.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Font.php b/src/FontLib/Font.php index e13a653..3f6a784 100644 --- a/src/FontLib/Font.php +++ b/src/FontLib/Font.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Glyph/Outline.php b/src/FontLib/Glyph/Outline.php index 639ff60..d88a7a3 100644 --- a/src/FontLib/Glyph/Outline.php +++ b/src/FontLib/Glyph/Outline.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License * @version $Id: Font_Table_glyf.php 46 2012-04-02 20:22:38Z fabien.menager $ diff --git a/src/FontLib/Glyph/OutlineComponent.php b/src/FontLib/Glyph/OutlineComponent.php index 9cafaf4..fa75c2a 100644 --- a/src/FontLib/Glyph/OutlineComponent.php +++ b/src/FontLib/Glyph/OutlineComponent.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License * @version $Id: Font_Table_glyf.php 46 2012-04-02 20:22:38Z fabien.menager $ diff --git a/src/FontLib/Glyph/OutlineComposite.php b/src/FontLib/Glyph/OutlineComposite.php index 8ab0d2c..b3e05fd 100644 --- a/src/FontLib/Glyph/OutlineComposite.php +++ b/src/FontLib/Glyph/OutlineComposite.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License * @version $Id: Font_Table_glyf.php 46 2012-04-02 20:22:38Z fabien.menager $ diff --git a/src/FontLib/Glyph/OutlineSimple.php b/src/FontLib/Glyph/OutlineSimple.php index 56b2fb4..c0c5c85 100644 --- a/src/FontLib/Glyph/OutlineSimple.php +++ b/src/FontLib/Glyph/OutlineSimple.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License * @version $Id: Font_Table_glyf.php 46 2012-04-02 20:22:38Z fabien.menager $ diff --git a/src/FontLib/Header.php b/src/FontLib/Header.php index cbf137e..df308b3 100644 --- a/src/FontLib/Header.php +++ b/src/FontLib/Header.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/OpenType/File.php b/src/FontLib/OpenType/File.php index 9c6df96..0b46df9 100644 --- a/src/FontLib/OpenType/File.php +++ b/src/FontLib/OpenType/File.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/OpenType/TableDirectoryEntry.php b/src/FontLib/OpenType/TableDirectoryEntry.php index dd75a3e..d8f0f6e 100644 --- a/src/FontLib/OpenType/TableDirectoryEntry.php +++ b/src/FontLib/OpenType/TableDirectoryEntry.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/DirectoryEntry.php b/src/FontLib/Table/DirectoryEntry.php index 54a67af..86500e1 100644 --- a/src/FontLib/Table/DirectoryEntry.php +++ b/src/FontLib/Table/DirectoryEntry.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Table.php b/src/FontLib/Table/Table.php index b127112..57328dd 100644 --- a/src/FontLib/Table/Table.php +++ b/src/FontLib/Table/Table.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/cmap.php b/src/FontLib/Table/Type/cmap.php index d09b0dc..5cfce38 100644 --- a/src/FontLib/Table/Type/cmap.php +++ b/src/FontLib/Table/Type/cmap.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/glyf.php b/src/FontLib/Table/Type/glyf.php index 1fbec3f..b8f7c93 100644 --- a/src/FontLib/Table/Type/glyf.php +++ b/src/FontLib/Table/Type/glyf.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/head.php b/src/FontLib/Table/Type/head.php index 6349f14..3d15f37 100644 --- a/src/FontLib/Table/Type/head.php +++ b/src/FontLib/Table/Type/head.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/hhea.php b/src/FontLib/Table/Type/hhea.php index dc60a14..cd69040 100644 --- a/src/FontLib/Table/Type/hhea.php +++ b/src/FontLib/Table/Type/hhea.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/hmtx.php b/src/FontLib/Table/Type/hmtx.php index 76e3307..cfd49e1 100644 --- a/src/FontLib/Table/Type/hmtx.php +++ b/src/FontLib/Table/Type/hmtx.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/kern.php b/src/FontLib/Table/Type/kern.php index 9875946..538d8b2 100644 --- a/src/FontLib/Table/Type/kern.php +++ b/src/FontLib/Table/Type/kern.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/loca.php b/src/FontLib/Table/Type/loca.php index cbc2a20..25453f7 100644 --- a/src/FontLib/Table/Type/loca.php +++ b/src/FontLib/Table/Type/loca.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/maxp.php b/src/FontLib/Table/Type/maxp.php index b4ebae0..c69da3c 100644 --- a/src/FontLib/Table/Type/maxp.php +++ b/src/FontLib/Table/Type/maxp.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/name.php b/src/FontLib/Table/Type/name.php index 794824d..9e77042 100644 --- a/src/FontLib/Table/Type/name.php +++ b/src/FontLib/Table/Type/name.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/nameRecord.php b/src/FontLib/Table/Type/nameRecord.php index 2073c20..38cd114 100644 --- a/src/FontLib/Table/Type/nameRecord.php +++ b/src/FontLib/Table/Type/nameRecord.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/os2.php b/src/FontLib/Table/Type/os2.php index 19a3e21..276de0d 100644 --- a/src/FontLib/Table/Type/os2.php +++ b/src/FontLib/Table/Type/os2.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/Table/Type/post.php b/src/FontLib/Table/Type/post.php index 030a942..1160c0b 100644 --- a/src/FontLib/Table/Type/post.php +++ b/src/FontLib/Table/Type/post.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/TrueType/Collection.php b/src/FontLib/TrueType/Collection.php index 460ef4d..a6afa4f 100644 --- a/src/FontLib/TrueType/Collection.php +++ b/src/FontLib/TrueType/Collection.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/TrueType/File.php b/src/FontLib/TrueType/File.php index 3594479..ceb9d97 100644 --- a/src/FontLib/TrueType/File.php +++ b/src/FontLib/TrueType/File.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/TrueType/Header.php b/src/FontLib/TrueType/Header.php index 7ff79cc..652e66f 100644 --- a/src/FontLib/TrueType/Header.php +++ b/src/FontLib/TrueType/Header.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/TrueType/TableDirectoryEntry.php b/src/FontLib/TrueType/TableDirectoryEntry.php index fc4fe55..9cf4489 100644 --- a/src/FontLib/TrueType/TableDirectoryEntry.php +++ b/src/FontLib/TrueType/TableDirectoryEntry.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/WOFF/File.php b/src/FontLib/WOFF/File.php index 4668c23..2c6dff4 100644 --- a/src/FontLib/WOFF/File.php +++ b/src/FontLib/WOFF/File.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/WOFF/Header.php b/src/FontLib/WOFF/Header.php index 65a6f14..9911c97 100644 --- a/src/FontLib/WOFF/Header.php +++ b/src/FontLib/WOFF/Header.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */ diff --git a/src/FontLib/WOFF/TableDirectoryEntry.php b/src/FontLib/WOFF/TableDirectoryEntry.php index eb67c9c..5f66311 100644 --- a/src/FontLib/WOFF/TableDirectoryEntry.php +++ b/src/FontLib/WOFF/TableDirectoryEntry.php @@ -1,7 +1,7 @@ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License */