Skip to content

Commit

Permalink
T1795 - FIX character encoding in letters
Browse files Browse the repository at this point in the history
  • Loading branch information
@NoeBerdoz @ecino
NoeBerdoz authored and ecino committed Sep 23, 2024
1 parent e60dc21 commit b544f55
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
Binary file modified sbc_compassion/FPDF/src/font/Montserrat-Regular.z
View file
Binary file not shown.
24 changes: 12 additions & 12 deletions sbc_compassion/FPDF/src/font/montserrat.php
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<?php
$type = 'TrueType';
$name = 'Montserrat-Regular';
$desc = array('Ascent'=>968,'Descent'=>-251,'CapHeight'=>700,'Flags'=>32,'FontBBox'=>'[-823 -262 1586 1043]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>587);
$up = -75;
$desc = array('Ascent'=>968,'Descent'=>-251,'CapHeight'=>700,'Flags'=>32,'FontBBox'=>'[-184 -262 1585 1043]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>587);
$up = -100;
$ut = 50;
$cw = array(
chr(0)=>587,chr(1)=>587,chr(2)=>587,chr(3)=>587,chr(4)=>587,chr(5)=>587,chr(6)=>587,chr(7)=>587,chr(8)=>587,chr(9)=>587,chr(10)=>587,chr(11)=>587,chr(12)=>587,chr(13)=>587,chr(14)=>587,chr(15)=>587,chr(16)=>587,chr(17)=>587,chr(18)=>587,chr(19)=>587,chr(20)=>587,chr(21)=>587,
chr(22)=>587,chr(23)=>587,chr(24)=>587,chr(25)=>587,chr(26)=>587,chr(27)=>587,chr(28)=>587,chr(29)=>587,chr(30)=>587,chr(31)=>587,' '=>262,'!'=>260,'"'=>373,'#'=>696,'$'=>615,'%'=>829,'&'=>669,'\''=>202,'('=>329,')'=>329,'*'=>386,'+'=>575,
','=>212,'-'=>382,'.'=>212,'/'=>335,'0'=>662,'1'=>361,'2'=>568,'3'=>564,'4'=>661,'5'=>566,'6'=>609,'7'=>589,'8'=>638,'9'=>609,':'=>212,';'=>212,'<'=>575,'='=>575,'>'=>575,'?'=>567,'@'=>1033,'A'=>717,
'B'=>754,'C'=>719,'D'=>826,'E'=>669,'F'=>633,'G'=>773,'H'=>813,'I'=>302,'J'=>501,'K'=>711,'L'=>589,'M'=>955,'N'=>813,'O'=>839,'P'=>718,'Q'=>839,'R'=>723,'S'=>615,'T'=>574,'U'=>792,'V'=>698,'W'=>1111,
'X'=>656,'Y'=>635,'Z'=>651,'['=>318,'\\'=>335,']'=>318,'^'=>576,'_'=>500,'`'=>600,'a'=>590,'b'=>678,'c'=>563,'d'=>678,'e'=>604,'f'=>339,'g'=>686,'h'=>677,'i'=>269,'j'=>274,'k'=>601,'l'=>269,'m'=>1061,
'n'=>677,'o'=>627,'p'=>678,'q'=>678,'r'=>401,'s'=>489,'t'=>406,'u'=>673,'v'=>542,'w'=>879,'x'=>534,'y'=>542,'z'=>511,'{'=>334,'|'=>295,'}'=>334,'~'=>575,chr(127)=>587,chr(128)=>587,chr(129)=>587,chr(130)=>587,chr(131)=>587,
'X'=>656,'Y'=>635,'Z'=>651,'['=>318,'\\'=>335,']'=>318,'^'=>576,'_'=>500,'`'=>600,'a'=>590,'b'=>678,'c'=>563,'d'=>678,'e'=>604,'f'=>339,'g'=>685,'h'=>676,'i'=>269,'j'=>274,'k'=>601,'l'=>269,'m'=>1061,
'n'=>676,'o'=>627,'p'=>678,'q'=>678,'r'=>401,'s'=>488,'t'=>406,'u'=>672,'v'=>542,'w'=>879,'x'=>534,'y'=>542,'z'=>511,'{'=>334,'|'=>294,'}'=>334,'~'=>575,chr(127)=>587,chr(128)=>587,chr(129)=>587,chr(130)=>587,chr(131)=>587,
chr(132)=>587,chr(133)=>587,chr(134)=>587,chr(135)=>587,chr(136)=>587,chr(137)=>587,chr(138)=>587,chr(139)=>587,chr(140)=>587,chr(141)=>587,chr(142)=>587,chr(143)=>587,chr(144)=>587,chr(145)=>587,chr(146)=>587,chr(147)=>587,chr(148)=>587,chr(149)=>587,chr(150)=>587,chr(151)=>587,chr(152)=>587,chr(153)=>587,
chr(154)=>587,chr(155)=>587,chr(156)=>587,chr(157)=>587,chr(158)=>587,chr(159)=>587,chr(160)=>262,chr(161)=>260,chr(162)=>563,chr(163)=>637,chr(164)=>700,chr(165)=>695,chr(166)=>295,chr(167)=>490,chr(168)=>600,chr(169)=>809,chr(170)=>401,chr(171)=>477,chr(172)=>575,chr(173)=>382,chr(174)=>809,chr(175)=>600,
chr(176)=>419,chr(177)=>575,chr(178)=>430,chr(179)=>430,chr(180)=>600,chr(181)=>678,chr(182)=>632,chr(183)=>252,chr(184)=>600,chr(185)=>430,chr(186)=>414,chr(187)=>477,chr(188)=>1029,chr(189)=>1029,chr(190)=>1029,chr(191)=>567,chr(192)=>717,chr(193)=>717,chr(194)=>717,chr(195)=>717,chr(196)=>717,chr(197)=>717,
chr(154)=>587,chr(155)=>587,chr(156)=>587,chr(157)=>587,chr(158)=>587,chr(159)=>587,chr(160)=>262,chr(161)=>260,chr(162)=>563,chr(163)=>637,chr(164)=>802,chr(165)=>695,chr(166)=>615,chr(167)=>490,chr(168)=>488,chr(169)=>809,chr(170)=>401,chr(171)=>477,chr(172)=>575,chr(173)=>382,chr(174)=>809,chr(175)=>600,
chr(176)=>419,chr(177)=>575,chr(178)=>430,chr(179)=>430,chr(180)=>651,chr(181)=>678,chr(182)=>632,chr(183)=>252,chr(184)=>511,chr(185)=>430,chr(186)=>414,chr(187)=>477,chr(188)=>1121,chr(189)=>1068,chr(190)=>635,chr(191)=>567,chr(192)=>717,chr(193)=>717,chr(194)=>717,chr(195)=>717,chr(196)=>717,chr(197)=>717,
chr(198)=>1033,chr(199)=>719,chr(200)=>669,chr(201)=>669,chr(202)=>669,chr(203)=>669,chr(204)=>302,chr(205)=>302,chr(206)=>302,chr(207)=>302,chr(208)=>831,chr(209)=>813,chr(210)=>839,chr(211)=>839,chr(212)=>839,chr(213)=>839,chr(214)=>839,chr(215)=>575,chr(216)=>839,chr(217)=>792,chr(218)=>792,chr(219)=>792,
chr(220)=>792,chr(221)=>635,chr(222)=>718,chr(223)=>668,chr(224)=>590,chr(225)=>590,chr(226)=>590,chr(227)=>590,chr(228)=>590,chr(229)=>590,chr(230)=>986,chr(231)=>563,chr(232)=>604,chr(233)=>604,chr(234)=>604,chr(235)=>604,chr(236)=>269,chr(237)=>269,chr(238)=>269,chr(239)=>269,chr(240)=>633,chr(241)=>677,
chr(242)=>627,chr(243)=>627,chr(244)=>627,chr(245)=>627,chr(246)=>627,chr(247)=>575,chr(248)=>627,chr(249)=>673,chr(250)=>673,chr(251)=>673,chr(252)=>673,chr(253)=>542,chr(254)=>678,chr(255)=>542);
$enc = 'ISO-8859-1';
$diff = '128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef';
$uv = array(0=>array(0,256));
chr(220)=>792,chr(221)=>635,chr(222)=>718,chr(223)=>668,chr(224)=>590,chr(225)=>590,chr(226)=>590,chr(227)=>590,chr(228)=>590,chr(229)=>590,chr(230)=>986,chr(231)=>563,chr(232)=>604,chr(233)=>604,chr(234)=>604,chr(235)=>604,chr(236)=>269,chr(237)=>269,chr(238)=>269,chr(239)=>269,chr(240)=>633,chr(241)=>676,
chr(242)=>627,chr(243)=>627,chr(244)=>627,chr(245)=>627,chr(246)=>627,chr(247)=>575,chr(248)=>627,chr(249)=>672,chr(250)=>672,chr(251)=>672,chr(252)=>672,chr(253)=>542,chr(254)=>678,chr(255)=>542);
$enc = 'ISO-8859-15';
$diff = '128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
$uv = array(0=>array(0,164),164=>8364,165=>165,166=>352,167=>167,168=>353,169=>array(169,11),180=>381,181=>array(181,3),184=>382,185=>array(185,3),188=>array(338,2),190=>376,191=>array(191,65));
$file = 'Montserrat-Regular.z';
$originalsize = 27080;
$originalsize = 17504;
$subsetted = true;
?>
4 changes: 3 additions & 1 deletion sbc_compassion/FPDF/src/text.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ class Text

function __construct($filename, $type)
{
$this->text = file_get_contents($filename);
$this->text = iconv(
'UTF-8', 'ISO-8859-15//TRANSLIT', file_get_contents($filename)
);
$this->type = $type;
}

Expand Down

0 comments on commit b544f55

Please sign in to comment.