Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump setasign/fpdi from 1.6.2 to 2.6.0 #867

Merged
merged 7 commits into from
Apr 17, 2024
Merged

Bump setasign/fpdi from 1.6.2 to 2.6.0 #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40e6815
Bump setasign/fpdi from 1.6.2 to 2.6.0
dependabot[bot] Mar 18, 2024
c2b82cd
Fix Fpdi
nanasess Mar 18, 2024
474986d
Merge branch 'master' into dependabot/composer/setasign/fpdi-2.6.0
nanasess Mar 25, 2024
6cf4277
Merge branch 'master' into dependabot/composer/setasign/fpdi-2.6.0
nanasess Mar 25, 2024
020c291
Merge branch 'master' into dependabot/composer/setasign/fpdi-2.6.0
dotani1111 Apr 4, 2024
e9dac25
Merge branch 'master' into dependabot/composer/setasign/fpdi-2.6.0
nanasess Apr 12, 2024
6f6958e
Merge branch 'master' into dependabot/composer/setasign/fpdi-2.6.0
nanasess Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"pear/xml_serializer": "*",
"pear/xml_util": "*",
"setasign/fpdf": "^1.8",
"setasign/fpdi": "^1.6",
"setasign/fpdi": "^2.6",
"smarty/smarty": "^3.1 || ^4.3"
},
"autoload": {
Expand Down
51 changes: 35 additions & 16 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion data/module/fpdi/japanese.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php

use setasign\Fpdi\Fpdi;
$SJIS_widths = array(' '=>278,'!'=>299,'"'=>353,'#'=>614,'$'=>614,'%'=>721,'&'=>735,'\''=>216,
'('=>323,')'=>323,'*'=>449,'+'=>529,','=>219,'-'=>306,'.'=>219,'/'=>453,'0'=>614,'1'=>614,
'2'=>614,'3'=>614,'4'=>614,'5'=>614,'6'=>614,'7'=>614,'8'=>614,'9'=>614,':'=>219,';'=>219,
Expand All @@ -11,7 +12,7 @@
'n'=>579,'o'=>550,'p'=>578,'q'=>566,'r'=>410,'s'=>444,'t'=>340,'u'=>575,'v'=>512,'w'=>760,
'x'=>503,'y'=>529,'z'=>453,'{'=>326,'|'=>380,'}'=>326,'~'=>387);

class PDF_Japanese extends FPDI
class PDF_Japanese extends Fpdi
{
function AddCIDFont($family, $style, $name, $cw, $CMap, $registry)
{
Expand Down
Loading