mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-15 17:24:10 +00:00
04952d91ed
Closes the audit gaps from the original font system commit. The bundled NotoSans only covered Latin/Greek/Cyrillic but the descriptions claimed Arabic, Thai and Hindi too — that was false. DejaVu Sans, the prior dompdf default, did cover Hebrew, Arabic, Armenian and Georgian, so swapping it for NotoSans had silently regressed those scripts. The Thai conditional include was also dropped from every PDF template in that commit, leaving th locales rendering boxes despite THSarabunNew still sitting in resources/static/fonts/. Adds four on-demand Font Packages — Noto Sans Hebrew, Noto Naskh Arabic (covering Arabic, Persian, Urdu, Sorani Kurdish), Noto Sans Devanagari (Hindi, Marathi, Sanskrit, Nepali) and Sarabun (Thai) — sourced from openmaptiles/fonts and google/fonts as static TTF. Static is mandatory because dompdf's PHP-Font-Lib does not parse variable fonts. Sarabun replaces THSarabunNew as the Thai face: same designer, OFL-licensed, maintained on a stable upstream URL, and surfaces through the same install flow as every other non-Latin script. The bundled THSarabunNew TTF files and the dead app/pdf/locale/th.blade.php legacy partial are removed as part of the migration. Unifies the bundled Noto Sans into FONT_PACKAGES as a noto-sans entry with bundled => true and files served from resources/static/fonts/ instead of storage/fonts/. FontService::isInstalled, downloadPackage, getInstalledFontFaces and getPackageStatuses honor the flag through a new packageDir() helper. The hardcoded @font-face block in the PDF partial is gone — fonts.blade.php collapses to a single getInstalledFontFaces() call so the package array is the only source of truth for every face, bundled or on-demand. Admin → Font Packages now lists Noto Sans at the top with a primary-colored Bundled pill (new settings.fonts.bundled string) alongside the existing Installed badge / Install button states. Also fixes the misleading settings.fonts.description and settings.fonts.bundled_info copy to actually describe what ships out of the box vs. what's optional, and rebuilds the en locale chunk.
391 lines
13 KiB
PHP
391 lines
13 KiB
PHP
<?php
|
|
|
|
namespace App\Services;
|
|
|
|
use Illuminate\Support\Facades\File;
|
|
use Illuminate\Support\Facades\Http;
|
|
|
|
class FontService
|
|
{
|
|
/**
|
|
* Font packages available for on-demand download.
|
|
*
|
|
* Each package downloads STATIC TrueType fonts (not variable fonts) — dompdf's
|
|
* PHP-Font-Lib does not support variable fonts (`fvar`/`gvar` tables), which is
|
|
* why Google Fonts' `NotoSansTC[wght].ttf` produces empty boxes when registered.
|
|
* Source: https://github.com/life888888/cjk-fonts-ttf — official Adobe Source Han
|
|
* Sans / Noto Sans CJK rebuilt as static TTF in Regular + Bold weights.
|
|
*/
|
|
public const FONT_PACKAGES = [
|
|
'noto-sans' => [
|
|
'name' => 'Noto Sans (Latin, Greek, Cyrillic)',
|
|
'family' => 'NotoSans',
|
|
'locales' => [],
|
|
'size' => '~1.7MB',
|
|
'bundled' => true,
|
|
'files' => [
|
|
[
|
|
'file' => 'NotoSans-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoSans-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoSans-Italic.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'italic',
|
|
],
|
|
[
|
|
'file' => 'NotoSans-BoldItalic.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'italic',
|
|
],
|
|
],
|
|
],
|
|
'noto-sans-sc' => [
|
|
'name' => 'Noto Sans Simplified Chinese',
|
|
'family' => 'NotoSansCJKsc',
|
|
'locales' => ['zh_CN'],
|
|
'size' => '~32MB',
|
|
'files' => [
|
|
[
|
|
'file' => 'NotoSansCJKsc-Regular.ttf',
|
|
'url' => 'https://github.com/life888888/cjk-fonts-ttf/releases/download/v0.1.0/NotoSansCJKsc-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoSansCJKsc-Bold.ttf',
|
|
'url' => 'https://github.com/life888888/cjk-fonts-ttf/releases/download/v0.1.0/NotoSansCJKsc-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
],
|
|
],
|
|
'noto-sans-tc' => [
|
|
'name' => 'Noto Sans Traditional Chinese',
|
|
'family' => 'NotoSansCJKtc',
|
|
'locales' => ['zh'],
|
|
'size' => '~32MB',
|
|
'files' => [
|
|
[
|
|
'file' => 'NotoSansCJKtc-Regular.ttf',
|
|
'url' => 'https://github.com/life888888/cjk-fonts-ttf/releases/download/v0.1.0/NotoSansCJKtc-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoSansCJKtc-Bold.ttf',
|
|
'url' => 'https://github.com/life888888/cjk-fonts-ttf/releases/download/v0.1.0/NotoSansCJKtc-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
],
|
|
],
|
|
'noto-sans-jp' => [
|
|
'name' => 'Noto Sans Japanese',
|
|
'family' => 'NotoSansCJKjp',
|
|
'locales' => ['ja'],
|
|
'size' => '~32MB',
|
|
'files' => [
|
|
[
|
|
'file' => 'NotoSansCJKjp-Regular.ttf',
|
|
'url' => 'https://github.com/life888888/cjk-fonts-ttf/releases/download/v0.1.0/NotoSansCJKjp-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoSansCJKjp-Bold.ttf',
|
|
'url' => 'https://github.com/life888888/cjk-fonts-ttf/releases/download/v0.1.0/NotoSansCJKjp-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
],
|
|
],
|
|
'noto-sans-kr' => [
|
|
'name' => 'Noto Sans Korean',
|
|
'family' => 'NotoSansCJKkr',
|
|
'locales' => ['ko'],
|
|
'size' => '~32MB',
|
|
'files' => [
|
|
[
|
|
'file' => 'NotoSansCJKkr-Regular.ttf',
|
|
'url' => 'https://github.com/life888888/cjk-fonts-ttf/releases/download/v0.1.0/NotoSansCJKkr-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoSansCJKkr-Bold.ttf',
|
|
'url' => 'https://github.com/life888888/cjk-fonts-ttf/releases/download/v0.1.0/NotoSansCJKkr-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
],
|
|
],
|
|
'noto-sans-hebrew' => [
|
|
'name' => 'Noto Sans Hebrew',
|
|
'family' => 'NotoSansHebrew',
|
|
'locales' => ['he', 'yi'],
|
|
'size' => '~40KB',
|
|
'files' => [
|
|
[
|
|
'file' => 'NotoSansHebrew-Regular.ttf',
|
|
'url' => 'https://github.com/openmaptiles/fonts/raw/master/noto-sans/NotoSansHebrew-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoSansHebrew-Bold.ttf',
|
|
'url' => 'https://github.com/openmaptiles/fonts/raw/master/noto-sans/NotoSansHebrew-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
],
|
|
],
|
|
'noto-naskh-arabic' => [
|
|
'name' => 'Noto Naskh Arabic (Arabic, Persian, Urdu)',
|
|
'family' => 'NotoNaskhArabic',
|
|
'locales' => ['ar', 'fa', 'ur', 'ckb'],
|
|
'size' => '~285KB',
|
|
'files' => [
|
|
[
|
|
'file' => 'NotoNaskhArabic-Regular.ttf',
|
|
'url' => 'https://github.com/openmaptiles/fonts/raw/master/noto-sans/NotoNaskhArabic-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoNaskhArabic-Bold.ttf',
|
|
'url' => 'https://github.com/openmaptiles/fonts/raw/master/noto-sans/NotoNaskhArabic-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
],
|
|
],
|
|
'noto-sans-devanagari' => [
|
|
'name' => 'Noto Sans Devanagari (Hindi, Marathi, Sanskrit, Nepali)',
|
|
'family' => 'NotoSansDevanagari',
|
|
'locales' => ['hi', 'mr', 'sa', 'ne'],
|
|
'size' => '~280KB',
|
|
'files' => [
|
|
[
|
|
'file' => 'NotoSansDevanagari-Regular.ttf',
|
|
'url' => 'https://github.com/openmaptiles/fonts/raw/master/noto-sans/NotoSansDevanagari-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'NotoSansDevanagari-Bold.ttf',
|
|
'url' => 'https://github.com/openmaptiles/fonts/raw/master/noto-sans/NotoSansDevanagari-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
],
|
|
],
|
|
'sarabun' => [
|
|
'name' => 'Sarabun (Thai)',
|
|
'family' => 'Sarabun',
|
|
'locales' => ['th'],
|
|
'size' => '~180KB',
|
|
'files' => [
|
|
[
|
|
'file' => 'Sarabun-Regular.ttf',
|
|
'url' => 'https://github.com/google/fonts/raw/main/ofl/sarabun/Sarabun-Regular.ttf',
|
|
'weight' => 'normal',
|
|
'style' => 'normal',
|
|
],
|
|
[
|
|
'file' => 'Sarabun-Bold.ttf',
|
|
'url' => 'https://github.com/google/fonts/raw/main/ofl/sarabun/Sarabun-Bold.ttf',
|
|
'weight' => 'bold',
|
|
'style' => 'normal',
|
|
],
|
|
],
|
|
],
|
|
];
|
|
|
|
/**
|
|
* Check if a locale requires an on-demand font download.
|
|
*/
|
|
public function needsDownload(string $locale): bool
|
|
{
|
|
$package = $this->getPackageForLocale($locale);
|
|
|
|
return $package && ! $this->isInstalled($package);
|
|
}
|
|
|
|
/**
|
|
* Ensure fonts are available for the given locale.
|
|
* Downloads synchronously if not already installed (blocking fallback).
|
|
*/
|
|
public function ensureFontsForLocale(string $locale): void
|
|
{
|
|
$package = $this->getPackageForLocale($locale);
|
|
|
|
if (! $package) {
|
|
return;
|
|
}
|
|
|
|
if (! $this->isInstalled($package)) {
|
|
$this->downloadPackage($package);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Resolve where a package's font files live on disk.
|
|
* Bundled packages ship with the repo under resources/static/fonts/;
|
|
* on-demand packages are downloaded into storage/fonts/.
|
|
*/
|
|
private function packageDir(array $package): string
|
|
{
|
|
return ! empty($package['bundled'])
|
|
? resource_path('static/fonts')
|
|
: storage_path('fonts');
|
|
}
|
|
|
|
/**
|
|
* Check if a font package is installed (all files present).
|
|
*/
|
|
public function isInstalled(array $package): bool
|
|
{
|
|
$dir = $this->packageDir($package);
|
|
|
|
foreach ($package['files'] as $entry) {
|
|
if (! File::exists($dir.'/'.$entry['file'])) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Download a font package to storage/fonts/.
|
|
* No-op for bundled packages — those ship with the repo.
|
|
*/
|
|
public function downloadPackage(array $package): void
|
|
{
|
|
if (! empty($package['bundled'])) {
|
|
return;
|
|
}
|
|
|
|
$fontsDir = storage_path('fonts');
|
|
|
|
if (! File::isDirectory($fontsDir)) {
|
|
File::makeDirectory($fontsDir, 0755, true);
|
|
}
|
|
|
|
foreach ($package['files'] as $entry) {
|
|
$targetPath = $fontsDir.'/'.$entry['file'];
|
|
|
|
if (File::exists($targetPath)) {
|
|
continue;
|
|
}
|
|
|
|
$response = Http::timeout(180)->get($entry['url']);
|
|
|
|
if ($response->successful()) {
|
|
File::put($targetPath, $response->body());
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the status of all font packages (for the admin UI).
|
|
*/
|
|
public function getPackageStatuses(): array
|
|
{
|
|
$statuses = [];
|
|
|
|
foreach (self::FONT_PACKAGES as $key => $package) {
|
|
$statuses[] = [
|
|
'key' => $key,
|
|
'name' => $package['name'],
|
|
'family' => $package['family'],
|
|
'locales' => $package['locales'],
|
|
'size' => $package['size'],
|
|
'installed' => $this->isInstalled($package),
|
|
'bundled' => ! empty($package['bundled']),
|
|
];
|
|
}
|
|
|
|
return $statuses;
|
|
}
|
|
|
|
/**
|
|
* Generate @font-face CSS rules for all installed on-demand fonts.
|
|
* Used by the PDF fonts partial so dompdf can resolve CJK families
|
|
* via standard CSS — no separate registerFont() dance required.
|
|
*/
|
|
public function getInstalledFontFaces(): array
|
|
{
|
|
$faces = [];
|
|
|
|
foreach (self::FONT_PACKAGES as $package) {
|
|
if (! $this->isInstalled($package)) {
|
|
continue;
|
|
}
|
|
|
|
$dir = $this->packageDir($package);
|
|
|
|
foreach ($package['files'] as $entry) {
|
|
$filePath = $dir.'/'.$entry['file'];
|
|
|
|
$faces[] = "@font-face {
|
|
font-family: '{$package['family']}';
|
|
font-style: {$entry['style']};
|
|
font-weight: {$entry['weight']};
|
|
src: url(\"{$filePath}\") format('truetype');
|
|
}";
|
|
}
|
|
}
|
|
|
|
return $faces;
|
|
}
|
|
|
|
/**
|
|
* Get the primary font family for the current locale.
|
|
*
|
|
* DomPDF doesn't support font-family fallback for missing glyphs —
|
|
* it uses the first font for ALL characters. So CJK locales must
|
|
* use the CJK font as the primary, not as a fallback.
|
|
*/
|
|
public function getFontFamilyForLocale(?string $locale = null): string
|
|
{
|
|
$locale = $locale ?? app()->getLocale();
|
|
|
|
// Check if this locale has an installed on-demand font
|
|
$package = $this->getPackageForLocale($locale);
|
|
if ($package && $this->isInstalled($package)) {
|
|
return '"'.$package['family'].'"';
|
|
}
|
|
|
|
return '"NotoSans"';
|
|
}
|
|
|
|
/**
|
|
* Get the full font-family CSS value for the current locale.
|
|
*/
|
|
public function getFontFamilyChain(?string $locale = null): string
|
|
{
|
|
$primary = $this->getFontFamilyForLocale($locale);
|
|
|
|
return $primary.', "NotoSans", "DejaVu Sans", sans-serif';
|
|
}
|
|
|
|
private function getPackageForLocale(string $locale): ?array
|
|
{
|
|
foreach (self::FONT_PACKAGES as $package) {
|
|
if (in_array($locale, $package['locales'])) {
|
|
return $package;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
}
|