1 Commits

Author SHA1 Message Date
59eb0b065d Apply fixes from StyleCI 2018-07-10 15:31:03 +00:00
22 changed files with 548 additions and 531 deletions

View File

@@ -99,10 +99,10 @@ class Configuracion
{ {
$coloresLateral = ['Original' => '#C4FAEC', 'Verde' => '#7bd148', 'Azul marino' => '#5484ed', 'Azul' => '#a4bdfc', 'Turquesa' => '#46d6db', $coloresLateral = ['Original' => '#C4FAEC', 'Verde' => '#7bd148', 'Azul marino' => '#5484ed', 'Azul' => '#a4bdfc', 'Turquesa' => '#46d6db',
'Verde claro' => '#7ae7bf', 'Verde oscuro' => '#51b749', 'Amarillo' => '#fbd75b', 'Naranja' => '#ffb878', 'Morado' => '#6633FF', 'Verde claro' => '#7ae7bf', 'Verde oscuro' => '#51b749', 'Amarillo' => '#fbd75b', 'Naranja' => '#ffb878', 'Morado' => '#6633FF',
'Rojo oscuro' => '#dc2127', 'Púrpura' => '#dbadff', 'Gris' => '#e1e1e1']; 'Rojo oscuro' => '#dc2127', 'Púrpura' => '#dbadff', 'Gris' => '#e1e1e1', ];
$coloresFondo = ['Verde' => '#7bd148', 'Azul marino' => '#5484ed', 'Azul' => '#a4bdfc', 'Turquesa' => '#46d6db', $coloresFondo = ['Verde' => '#7bd148', 'Azul marino' => '#5484ed', 'Azul' => '#a4bdfc', 'Turquesa' => '#46d6db',
'Verde claro' => '#7ae7bf', 'Verde oscuro' => '#51b749', 'Amarillo' => '#fbd75b', 'Naranja' => '#ffb878', 'Rojo' => '#ff887c', 'Verde claro' => '#7ae7bf', 'Verde oscuro' => '#51b749', 'Amarillo' => '#fbd75b', 'Naranja' => '#ffb878', 'Rojo' => '#ff887c',
'Rojo oscuro' => '#dc2127', 'Púrpura' => '#dbadff', 'Gris' => '#e1e1e1', 'Original' => '#F3FEC8']; 'Rojo oscuro' => '#dc2127', 'Púrpura' => '#dbadff', 'Gris' => '#e1e1e1', 'Original' => '#F3FEC8', ];
$personal = $this->datosConf['ESTILO'] == 'personal' ? 'selected' : ' '; $personal = $this->datosConf['ESTILO'] == 'personal' ? 'selected' : ' ';
$bluecurve = $this->datosConf['ESTILO'] == 'bluecurve' ? 'selected' : ' '; $bluecurve = $this->datosConf['ESTILO'] == 'bluecurve' ? 'selected' : ' ';
$cristal = $this->datosConf['ESTILO'] == 'cristal' ? 'selected' : ' '; $cristal = $this->datosConf['ESTILO'] == 'cristal' ? 'selected' : ' ';

View File

@@ -131,7 +131,7 @@ public $PDFVersion; // PDF version number
} }
// Page sizes // Page sizes
$this->StdPageSizes = ['a3'=> [841.89, 1190.55], 'a4'=>[595.28, 841.89], 'a5'=>[420.94, 595.28], $this->StdPageSizes = ['a3'=> [841.89, 1190.55], 'a4'=>[595.28, 841.89], 'a5'=>[420.94, 595.28],
'letter' => [612, 792], 'legal'=>[612, 1008]]; 'letter' => [612, 792], 'legal'=>[612, 1008], ];
$size = $this->_getpagesize($size); $size = $this->_getpagesize($size);
$this->DefPageSize = $size; $this->DefPageSize = $size;
$this->CurPageSize = $size; $this->CurPageSize = $size;

View File

@@ -80,7 +80,7 @@ class InformePDF
$prop = ['HeaderColor' => [255, 150, 100], $prop = ['HeaderColor' => [255, 150, 100],
'color1' => [210, 245, 255], 'color1' => [210, 245, 255],
'color2' => [255, 255, 210], 'color2' => [255, 255, 210],
'padding' => 2]; 'padding' => 2, ];
$this->pdf->Table($this->def->Datos->Consulta, $prop); $this->pdf->Table($this->def->Datos->Consulta, $prop);
} }

View File

@@ -178,7 +178,7 @@ class Inventario
{ {
return ['Consulta' => $fila['consulta'], 'Modificacion' => $fila['modificacion'], return ['Consulta' => $fila['consulta'], 'Modificacion' => $fila['modificacion'],
'Alta' => $fila['alta'], 'Borrado' => $fila['borrado'], 'Informe' => $fila['informe'], 'Alta' => $fila['alta'], 'Borrado' => $fila['borrado'], 'Informe' => $fila['informe'],
'Usuarios' => $fila['usuarios'], 'Config' => $fila['config']]; 'Usuarios' => $fila['usuarios'], 'Config' => $fila['config'], ];
} }
// Esta función intenta recuperar el nombre del usuario // Esta función intenta recuperar el nombre del usuario

View File

@@ -640,7 +640,7 @@ class Mantenimiento
$this->campos[(string) $columna['Nombre']] = ['Field' => (string) $columna['Titulo'], 'Comment' => (string) $columna['Varios'], $this->campos[(string) $columna['Nombre']] = ['Field' => (string) $columna['Titulo'], 'Comment' => (string) $columna['Varios'],
'Type' => (string) $columna['Tipo'].'('.$columna['Ancho'].')', 'Editable' => (string) $columna['Editable'], 'Type' => (string) $columna['Tipo'].'('.$columna['Ancho'].')', 'Editable' => (string) $columna['Editable'],
'Campo' => (string) $columna['Campo'], 'Visible' => (string) $columna['Visible'], 'Ajuste' => (string) $columna['Ajuste'], 'Campo' => (string) $columna['Campo'], 'Visible' => (string) $columna['Visible'], 'Ajuste' => (string) $columna['Ajuste'],
'Titulo' => (string) $columna['Titulo']]; 'Titulo' => (string) $columna['Titulo'], ];
} }
$this->comandoConsulta = $def->Consulta; $this->comandoConsulta = $def->Consulta;
} else { } else {

View File

@@ -1334,7 +1334,7 @@ class Zebra_Image
'r' => 0xFF & ($int >> 0x10), 'r' => 0xFF & ($int >> 0x10),
'g' => 0xFF & ($int >> 0x8), 'g' => 0xFF & ($int >> 0x8),
'b' => 0xFF & $int 'b' => 0xFF & $int,
]; ];
} }

View File

@@ -1,8 +1,9 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Courier'; $name = 'Courier';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
for($i=0;$i<=255;$i++) for ($i = 0; $i <= 255; $i++) {
$cw[chr($i)] = 600; $cw[chr($i)] = 600;
?> }

View File

@@ -1,8 +1,9 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Courier-Bold'; $name = 'Courier-Bold';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
for($i=0;$i<=255;$i++) for ($i = 0; $i <= 255; $i++) {
$cw[chr($i)] = 600; $cw[chr($i)] = 600;
?> }

View File

@@ -1,8 +1,9 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Courier-BoldOblique'; $name = 'Courier-BoldOblique';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
for($i=0;$i<=255;$i++) for ($i = 0; $i <= 255; $i++) {
$cw[chr($i)] = 600; $cw[chr($i)] = 600;
?> }

View File

@@ -1,8 +1,9 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Courier-Oblique'; $name = 'Courier-Oblique';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
for($i=0;$i<=255;$i++) for ($i = 0; $i <= 255; $i++) {
$cw[chr($i)] = 600; $cw[chr($i)] = 600;
?> }

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Helvetica'; $name = 'Helvetica';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278, chr(0) => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584, chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584,
',' => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>278, ';'=>278, '<'=>584, '='=>584, '>'=>584, '?'=>556, '@'=>1015, 'A'=>667, ',' => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>278, ';'=>278, '<'=>584, '='=>584, '>'=>584, '?'=>556, '@'=>1015, 'A'=>667,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>556, chr(182)=>537, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667, chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>556, chr(182)=>537, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667,
chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722, chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>500, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>556, chr(241)=>556, chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>500, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>556, chr(241)=>556,
chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500); chr(242)=> 556, chr(243)=>556, chr(244)=>556, chr(245)=>556, chr(246)=>556, chr(247)=>584, chr(248)=>611, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500, ];
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Helvetica-Bold'; $name = 'Helvetica-Bold';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278, chr(0) => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>333, '"'=>474, '#'=>556, '$'=>556, '%'=>889, '&'=>722, '\''=>238, '('=>333, ')'=>333, '*'=>389, '+'=>584, chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>333, '"'=>474, '#'=>556, '$'=>556, '%'=>889, '&'=>722, '\''=>238, '('=>333, ')'=>333, '*'=>389, '+'=>584,
',' => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>333, ';'=>333, '<'=>584, '='=>584, '>'=>584, '?'=>611, '@'=>975, 'A'=>722, ',' => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>333, ';'=>333, '<'=>584, '='=>584, '>'=>584, '?'=>611, '@'=>975, 'A'=>722,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>611, chr(182)=>556, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722, chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>611, chr(182)=>556, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722, chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>556, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>611, chr(241)=>611, chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>556, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>611, chr(241)=>611,
chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556); chr(242)=> 611, chr(243)=>611, chr(244)=>611, chr(245)=>611, chr(246)=>611, chr(247)=>584, chr(248)=>611, chr(249)=>611, chr(250)=>611, chr(251)=>611, chr(252)=>611, chr(253)=>556, chr(254)=>611, chr(255)=>556, ];
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Helvetica-BoldOblique'; $name = 'Helvetica-BoldOblique';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278, chr(0) => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>333, '"'=>474, '#'=>556, '$'=>556, '%'=>889, '&'=>722, '\''=>238, '('=>333, ')'=>333, '*'=>389, '+'=>584, chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>333, '"'=>474, '#'=>556, '$'=>556, '%'=>889, '&'=>722, '\''=>238, '('=>333, ')'=>333, '*'=>389, '+'=>584,
',' => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>333, ';'=>333, '<'=>584, '='=>584, '>'=>584, '?'=>611, '@'=>975, 'A'=>722, ',' => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>333, ';'=>333, '<'=>584, '='=>584, '>'=>584, '?'=>611, '@'=>975, 'A'=>722,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>611, chr(182)=>556, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722, chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>611, chr(182)=>556, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722, chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>556, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>611, chr(241)=>611, chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>556, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>611, chr(241)=>611,
chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556); chr(242)=> 611, chr(243)=>611, chr(244)=>611, chr(245)=>611, chr(246)=>611, chr(247)=>584, chr(248)=>611, chr(249)=>611, chr(250)=>611, chr(251)=>611, chr(252)=>611, chr(253)=>556, chr(254)=>611, chr(255)=>556, ];
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Helvetica-Oblique'; $name = 'Helvetica-Oblique';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278, chr(0) => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584, chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584,
',' => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>278, ';'=>278, '<'=>584, '='=>584, '>'=>584, '?'=>556, '@'=>1015, 'A'=>667, ',' => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>278, ';'=>278, '<'=>584, '='=>584, '>'=>584, '?'=>556, '@'=>1015, 'A'=>667,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>556, chr(182)=>537, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667, chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>556, chr(182)=>537, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667,
chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722, chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>500, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>556, chr(241)=>556, chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>500, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>556, chr(241)=>556,
chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500); chr(242)=> 556, chr(243)=>556, chr(244)=>556, chr(245)=>556, chr(246)=>556, chr(247)=>584, chr(248)=>611, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500, ];
?>

View File

@@ -12,24 +12,24 @@ function ReadMap($enc)
//Read a map file //Read a map file
$file = dirname(__FILE__).'/'.strtolower($enc).'.map'; $file = dirname(__FILE__).'/'.strtolower($enc).'.map';
$a = file($file); $a = file($file);
if(empty($a)) if (empty($a)) {
die('<b>Error:</b> encoding not found: '.$enc); die('<b>Error:</b> encoding not found: '.$enc);
$cc2gn=array(); }
foreach($a as $l) $cc2gn = [];
{ foreach ($a as $l) {
if($l[0]=='!') if ($l[0] == '!') {
{
$e = preg_split('/[ \\t]+/', rtrim($l)); $e = preg_split('/[ \\t]+/', rtrim($l));
$cc = hexdec(substr($e[0], 1)); $cc = hexdec(substr($e[0], 1));
$gn = $e[2]; $gn = $e[2];
$cc2gn[$cc] = $gn; $cc2gn[$cc] = $gn;
} }
} }
for($i=0;$i<=255;$i++) for ($i = 0; $i <= 255; $i++) {
{ if (!isset($cc2gn[$i])) {
if(!isset($cc2gn[$i]))
$cc2gn[$i] = '.notdef'; $cc2gn[$i] = '.notdef';
} }
}
return $cc2gn; return $cc2gn;
} }
@@ -37,100 +37,100 @@ function ReadAFM($file, &$map)
{ {
//Read a font metric file //Read a font metric file
$a = file($file); $a = file($file);
if(empty($a)) if (empty($a)) {
die('File not found'); die('File not found');
$widths=array(); }
$fm=array(); $widths = [];
$fix=array('Edot'=>'Edotaccent','edot'=>'edotaccent','Idot'=>'Idotaccent','Zdot'=>'Zdotaccent','zdot'=>'zdotaccent', $fm = [];
$fix = ['Edot' => 'Edotaccent', 'edot'=>'edotaccent', 'Idot'=>'Idotaccent', 'Zdot'=>'Zdotaccent', 'zdot'=>'zdotaccent',
'Odblacute' => 'Ohungarumlaut', 'odblacute'=>'ohungarumlaut', 'Udblacute'=>'Uhungarumlaut', 'udblacute'=>'uhungarumlaut', 'Odblacute' => 'Ohungarumlaut', 'odblacute'=>'ohungarumlaut', 'Udblacute'=>'Uhungarumlaut', 'udblacute'=>'uhungarumlaut',
'Gcedilla' => 'Gcommaaccent', 'gcedilla'=>'gcommaaccent', 'Kcedilla'=>'Kcommaaccent', 'kcedilla'=>'kcommaaccent', 'Gcedilla' => 'Gcommaaccent', 'gcedilla'=>'gcommaaccent', 'Kcedilla'=>'Kcommaaccent', 'kcedilla'=>'kcommaaccent',
'Lcedilla' => 'Lcommaaccent', 'lcedilla'=>'lcommaaccent', 'Ncedilla'=>'Ncommaaccent', 'ncedilla'=>'ncommaaccent', 'Lcedilla' => 'Lcommaaccent', 'lcedilla'=>'lcommaaccent', 'Ncedilla'=>'Ncommaaccent', 'ncedilla'=>'ncommaaccent',
'Rcedilla' => 'Rcommaaccent', 'rcedilla'=>'rcommaaccent', 'Scedilla'=>'Scommaaccent', 'scedilla'=>'scommaaccent', 'Rcedilla' => 'Rcommaaccent', 'rcedilla'=>'rcommaaccent', 'Scedilla'=>'Scommaaccent', 'scedilla'=>'scommaaccent',
'Tcedilla' => 'Tcommaaccent', 'tcedilla'=>'tcommaaccent', 'Dslash'=>'Dcroat', 'dslash'=>'dcroat', 'Dmacron'=>'Dcroat', 'dmacron'=>'dcroat', 'Tcedilla' => 'Tcommaaccent', 'tcedilla'=>'tcommaaccent', 'Dslash'=>'Dcroat', 'dslash'=>'dcroat', 'Dmacron'=>'Dcroat', 'dmacron'=>'dcroat',
'combininggraveaccent'=> 'gravecomb', 'combininghookabove'=>'hookabovecomb', 'combiningtildeaccent'=>'tildecomb', 'combininggraveaccent'=> 'gravecomb', 'combininghookabove'=>'hookabovecomb', 'combiningtildeaccent'=>'tildecomb',
'combiningacuteaccent'=>'acutecomb','combiningdotbelow'=>'dotbelowcomb','dongsign'=>'dong'); 'combiningacuteaccent'=> 'acutecomb', 'combiningdotbelow'=>'dotbelowcomb', 'dongsign'=>'dong', ];
foreach($a as $l) foreach ($a as $l) {
{
$e = explode(' ', rtrim($l)); $e = explode(' ', rtrim($l));
if(count($e)<2) if (count($e) < 2) {
continue; continue;
}
$code = $e[0]; $code = $e[0];
$param = $e[1]; $param = $e[1];
if($code=='C') if ($code == 'C') {
{
//Character metrics //Character metrics
$cc = (int) $e[1]; $cc = (int) $e[1];
$w = $e[4]; $w = $e[4];
$gn = $e[7]; $gn = $e[7];
if(substr($gn,-4)=='20AC') if (substr($gn, -4) == '20AC') {
$gn = 'Euro'; $gn = 'Euro';
if(isset($fix[$gn])) }
{ if (isset($fix[$gn])) {
//Fix incorrect glyph name //Fix incorrect glyph name
foreach($map as $c=>$n) foreach ($map as $c=>$n) {
{ if ($n == $fix[$gn]) {
if($n==$fix[$gn])
$map[$c] = $gn; $map[$c] = $gn;
} }
} }
if(empty($map)) }
{ if (empty($map)) {
//Symbolic font: use built-in encoding //Symbolic font: use built-in encoding
$widths[$cc] = $w; $widths[$cc] = $w;
} } else {
else
{
$widths[$gn] = $w; $widths[$gn] = $w;
if($gn=='X') if ($gn == 'X') {
$fm['CapXHeight'] = $e[13]; $fm['CapXHeight'] = $e[13];
} }
if($gn=='.notdef') }
if ($gn == '.notdef') {
$fm['MissingWidth'] = $w; $fm['MissingWidth'] = $w;
} }
elseif($code=='FontName') } elseif ($code == 'FontName') {
$fm['FontName'] = $param; $fm['FontName'] = $param;
elseif($code=='Weight') } elseif ($code == 'Weight') {
$fm['Weight'] = $param; $fm['Weight'] = $param;
elseif($code=='ItalicAngle') } elseif ($code == 'ItalicAngle') {
$fm['ItalicAngle']=(double)$param; $fm['ItalicAngle'] = (float) $param;
elseif($code=='Ascender') } elseif ($code == 'Ascender') {
$fm['Ascender'] = (int) $param; $fm['Ascender'] = (int) $param;
elseif($code=='Descender') } elseif ($code == 'Descender') {
$fm['Descender'] = (int) $param; $fm['Descender'] = (int) $param;
elseif($code=='UnderlineThickness') } elseif ($code == 'UnderlineThickness') {
$fm['UnderlineThickness'] = (int) $param; $fm['UnderlineThickness'] = (int) $param;
elseif($code=='UnderlinePosition') } elseif ($code == 'UnderlinePosition') {
$fm['UnderlinePosition'] = (int) $param; $fm['UnderlinePosition'] = (int) $param;
elseif($code=='IsFixedPitch') } elseif ($code == 'IsFixedPitch') {
$fm['IsFixedPitch'] = ($param == 'true'); $fm['IsFixedPitch'] = ($param == 'true');
elseif($code=='FontBBox') } elseif ($code == 'FontBBox') {
$fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]); $fm['FontBBox'] = [$e[1], $e[2], $e[3], $e[4]];
elseif($code=='CapHeight') } elseif ($code == 'CapHeight') {
$fm['CapHeight'] = (int) $param; $fm['CapHeight'] = (int) $param;
elseif($code=='StdVW') } elseif ($code == 'StdVW') {
$fm['StdVW'] = (int) $param; $fm['StdVW'] = (int) $param;
} }
if(!isset($fm['FontName'])) }
if (!isset($fm['FontName'])) {
die('FontName not found'); die('FontName not found');
if(!empty($map)) }
{ if (!empty($map)) {
if(!isset($widths['.notdef'])) if (!isset($widths['.notdef'])) {
$widths['.notdef'] = 600; $widths['.notdef'] = 600;
if(!isset($widths['Delta']) && isset($widths['increment'])) }
if (!isset($widths['Delta']) && isset($widths['increment'])) {
$widths['Delta'] = $widths['increment']; $widths['Delta'] = $widths['increment'];
}
//Order widths according to map //Order widths according to map
for($i=0;$i<=255;$i++) for ($i = 0; $i <= 255; $i++) {
{ if (!isset($widths[$map[$i]])) {
if(!isset($widths[$map[$i]]))
{
echo '<b>Warning:</b> character '.$map[$i].' is missing<br>'; echo '<b>Warning:</b> character '.$map[$i].' is missing<br>';
$widths[$i] = $widths['.notdef']; $widths[$i] = $widths['.notdef'];
} } else {
else
$widths[$i] = $widths[$map[$i]]; $widths[$i] = $widths[$map[$i]];
} }
} }
}
$fm['Widths'] = $widths; $fm['Widths'] = $widths;
return $fm; return $fm;
} }
@@ -143,45 +143,54 @@ function MakeFontDescriptor($fm, $symbolic)
$desc = (isset($fm['Descender']) ? $fm['Descender'] : -200); $desc = (isset($fm['Descender']) ? $fm['Descender'] : -200);
$fd .= ",'Descent'=>".$desc; $fd .= ",'Descent'=>".$desc;
//CapHeight //CapHeight
if(isset($fm['CapHeight'])) if (isset($fm['CapHeight'])) {
$ch = $fm['CapHeight']; $ch = $fm['CapHeight'];
elseif(isset($fm['CapXHeight'])) } elseif (isset($fm['CapXHeight'])) {
$ch = $fm['CapXHeight']; $ch = $fm['CapXHeight'];
else } else {
$ch = $asc; $ch = $asc;
}
$fd .= ",'CapHeight'=>".$ch; $fd .= ",'CapHeight'=>".$ch;
//Flags //Flags
$flags = 0; $flags = 0;
if(isset($fm['IsFixedPitch']) && $fm['IsFixedPitch']) if (isset($fm['IsFixedPitch']) && $fm['IsFixedPitch']) {
$flags += 1 << 0; $flags += 1 << 0;
if($symbolic) }
if ($symbolic) {
$flags += 1 << 2; $flags += 1 << 2;
if(!$symbolic) }
if (!$symbolic) {
$flags += 1 << 5; $flags += 1 << 5;
if(isset($fm['ItalicAngle']) && $fm['ItalicAngle']!=0) }
if (isset($fm['ItalicAngle']) && $fm['ItalicAngle'] != 0) {
$flags += 1 << 6; $flags += 1 << 6;
}
$fd .= ",'Flags'=>".$flags; $fd .= ",'Flags'=>".$flags;
//FontBBox //FontBBox
if(isset($fm['FontBBox'])) if (isset($fm['FontBBox'])) {
$fbb = $fm['FontBBox']; $fbb = $fm['FontBBox'];
else } else {
$fbb=array(0,$desc-100,1000,$asc+100); $fbb = [0, $desc - 100, 1000, $asc + 100];
}
$fd .= ",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'"; $fd .= ",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
//ItalicAngle //ItalicAngle
$ia = (isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0); $ia = (isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
$fd .= ",'ItalicAngle'=>".$ia; $fd .= ",'ItalicAngle'=>".$ia;
//StemV //StemV
if(isset($fm['StdVW'])) if (isset($fm['StdVW'])) {
$stemv = $fm['StdVW']; $stemv = $fm['StdVW'];
elseif(isset($fm['Weight']) && preg_match('/bold|black/i',$fm['Weight'])) } elseif (isset($fm['Weight']) && preg_match('/bold|black/i', $fm['Weight'])) {
$stemv = 120; $stemv = 120;
else } else {
$stemv = 70; $stemv = 70;
}
$fd .= ",'StemV'=>".$stemv; $fd .= ",'StemV'=>".$stemv;
//MissingWidth //MissingWidth
if(isset($fm['MissingWidth'])) if (isset($fm['MissingWidth'])) {
$fd .= ",'MissingWidth'=>".$fm['MissingWidth']; $fd .= ",'MissingWidth'=>".$fm['MissingWidth'];
}
$fd .= ')'; $fd .= ')';
return $fd; return $fd;
} }
@@ -190,23 +199,26 @@ function MakeWidthArray($fm)
//Make character width array //Make character width array
$s = "array(\n\t"; $s = "array(\n\t";
$cw = $fm['Widths']; $cw = $fm['Widths'];
for($i=0;$i<=255;$i++) for ($i = 0; $i <= 255; $i++) {
{ if (chr($i) == "'") {
if(chr($i)=="'")
$s .= "'\\''"; $s .= "'\\''";
elseif(chr($i)=="\\") } elseif (chr($i) == '\\') {
$s .= "'\\\\'"; $s .= "'\\\\'";
elseif($i>=32 && $i<=126) } elseif ($i >= 32 && $i <= 126) {
$s .= "'".chr($i)."'"; $s .= "'".chr($i)."'";
else } else {
$s .= "chr($i)"; $s .= "chr($i)";
}
$s .= '=>'.$fm['Widths'][$i]; $s .= '=>'.$fm['Widths'][$i];
if($i<255) if ($i < 255) {
$s .= ','; $s .= ',';
if(($i+1)%22==0) }
if (($i + 1) % 22 == 0) {
$s .= "\n\t"; $s .= "\n\t";
} }
}
$s .= ')'; $s .= ')';
return $s; return $s;
} }
@@ -216,24 +228,25 @@ function MakeFontEncoding($map)
$ref = ReadMap('cp1252'); $ref = ReadMap('cp1252');
$s = ''; $s = '';
$last = 0; $last = 0;
for($i=32;$i<=255;$i++) for ($i = 32; $i <= 255; $i++) {
{ if ($map[$i] != $ref[$i]) {
if($map[$i]!=$ref[$i]) if ($i != $last + 1) {
{
if($i!=$last+1)
$s .= $i.' '; $s .= $i.' ';
}
$last = $i; $last = $i;
$s .= '/'.$map[$i].' '; $s .= '/'.$map[$i].' ';
} }
} }
return rtrim($s); return rtrim($s);
} }
function SaveToFile($file, $s, $mode) function SaveToFile($file, $s, $mode)
{ {
$f = fopen($file, 'w'.$mode); $f = fopen($file, 'w'.$mode);
if(!$f) if (!$f) {
die('Can\'t write to file '.$file); die('Can\'t write to file '.$file);
}
fwrite($f, $s, strlen($s)); fwrite($f, $s, strlen($s));
fclose($f); fclose($f);
} }
@@ -241,12 +254,14 @@ function SaveToFile($file, $s, $mode)
function ReadShort($f) function ReadShort($f)
{ {
$a = unpack('n1n', fread($f, 2)); $a = unpack('n1n', fread($f, 2));
return $a['n']; return $a['n'];
} }
function ReadLong($f) function ReadLong($f)
{ {
$a = unpack('N1N', fread($f, 4)); $a = unpack('N1N', fread($f, 4));
return $a['N']; return $a['N'];
} }
@@ -254,26 +269,25 @@ function CheckTTF($file)
{ {
//Check if font license allows embedding //Check if font license allows embedding
$f = fopen($file, 'rb'); $f = fopen($file, 'rb');
if(!$f) if (!$f) {
die('<b>Error:</b> Can\'t open '.$file); die('<b>Error:</b> Can\'t open '.$file);
}
//Extract number of tables //Extract number of tables
fseek($f, 4, SEEK_CUR); fseek($f, 4, SEEK_CUR);
$nb = ReadShort($f); $nb = ReadShort($f);
fseek($f, 6, SEEK_CUR); fseek($f, 6, SEEK_CUR);
//Seek OS/2 table //Seek OS/2 table
$found = false; $found = false;
for($i=0;$i<$nb;$i++) for ($i = 0; $i < $nb; $i++) {
{ if (fread($f, 4) == 'OS/2') {
if(fread($f,4)=='OS/2')
{
$found = true; $found = true;
break; break;
} }
fseek($f, 12, SEEK_CUR); fseek($f, 12, SEEK_CUR);
} }
if(!$found) if (!$found) {
{
fclose($f); fclose($f);
return; return;
} }
fseek($f, 4, SEEK_CUR); fseek($f, 4, SEEK_CUR);
@@ -286,9 +300,10 @@ function CheckTTF($file)
$pp = ($fsType & 0x04) != 0; $pp = ($fsType & 0x04) != 0;
$e = ($fsType & 0x08) != 0; $e = ($fsType & 0x08) != 0;
fclose($f); fclose($f);
if($rl && !$pp && !$e) if ($rl && !$pp && !$e) {
echo '<b>Warning:</b> font license does not allow embedding'; echo '<b>Warning:</b> font license does not allow embedding';
} }
}
/******************************************************************************* /*******************************************************************************
* fontfile: path to TTF file (or empty string if not to be embedded) * * fontfile: path to TTF file (or empty string if not to be embedded) *
@@ -297,53 +312,57 @@ function CheckTTF($file)
* patch: optional patch for encoding * * patch: optional patch for encoding *
* type: font type if fontfile is empty * * type: font type if fontfile is empty *
*******************************************************************************/ *******************************************************************************/
function MakeFont($fontfile, $afmfile, $enc='cp1252', $patch=array(), $type='TrueType') function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = [], $type = 'TrueType')
{ {
//Generate a font definition file //Generate a font definition file
if(get_magic_quotes_runtime()) if (get_magic_quotes_runtime()) {
@set_magic_quotes_runtime(0); @set_magic_quotes_runtime(0);
}
ini_set('auto_detect_line_endings', '1'); ini_set('auto_detect_line_endings', '1');
if($enc) if ($enc) {
{
$map = ReadMap($enc); $map = ReadMap($enc);
foreach($patch as $cc=>$gn) foreach ($patch as $cc=>$gn) {
$map[$cc] = $gn; $map[$cc] = $gn;
} }
else } else {
$map=array(); $map = [];
if(!file_exists($afmfile)) }
if (!file_exists($afmfile)) {
die('<b>Error:</b> AFM file not found: '.$afmfile); die('<b>Error:</b> AFM file not found: '.$afmfile);
}
$fm = ReadAFM($afmfile, $map); $fm = ReadAFM($afmfile, $map);
if($enc) if ($enc) {
$diff = MakeFontEncoding($map); $diff = MakeFontEncoding($map);
else } else {
$diff = ''; $diff = '';
}
$fd = MakeFontDescriptor($fm, empty($map)); $fd = MakeFontDescriptor($fm, empty($map));
//Find font type //Find font type
if($fontfile) if ($fontfile) {
{
$ext = strtolower(substr($fontfile, -3)); $ext = strtolower(substr($fontfile, -3));
if($ext=='ttf') if ($ext == 'ttf') {
$type = 'TrueType'; $type = 'TrueType';
elseif($ext=='pfb') } elseif ($ext == 'pfb') {
$type = 'Type1'; $type = 'Type1';
else } else {
die('<b>Error:</b> unrecognized font file extension: '.$ext); die('<b>Error:</b> unrecognized font file extension: '.$ext);
} }
else } else {
{ if ($type != 'TrueType' && $type != 'Type1') {
if($type!='TrueType' && $type!='Type1')
die('<b>Error:</b> incorrect font type: '.$type); die('<b>Error:</b> incorrect font type: '.$type);
} }
}
//Start generation //Start generation
$s = '<?php'."\n"; $s = '<?php'."\n";
$s .= '$type=\''.$type."';\n"; $s .= '$type=\''.$type."';\n";
$s .= '$name=\''.$fm['FontName']."';\n"; $s .= '$name=\''.$fm['FontName']."';\n";
$s .= '$desc='.$fd.";\n"; $s .= '$desc='.$fd.";\n";
if(!isset($fm['UnderlinePosition'])) if (!isset($fm['UnderlinePosition'])) {
$fm['UnderlinePosition'] = -100; $fm['UnderlinePosition'] = -100;
if(!isset($fm['UnderlineThickness'])) }
if (!isset($fm['UnderlineThickness'])) {
$fm['UnderlineThickness'] = 50; $fm['UnderlineThickness'] = 50;
}
$s .= '$up='.$fm['UnderlinePosition'].";\n"; $s .= '$up='.$fm['UnderlinePosition'].";\n";
$s .= '$ut='.$fm['UnderlineThickness'].";\n"; $s .= '$ut='.$fm['UnderlineThickness'].";\n";
$w = MakeWidthArray($fm); $w = MakeWidthArray($fm);
@@ -351,64 +370,59 @@ function MakeFont($fontfile, $afmfile, $enc='cp1252', $patch=array(), $type='Tru
$s .= '$enc=\''.$enc."';\n"; $s .= '$enc=\''.$enc."';\n";
$s .= '$diff=\''.$diff."';\n"; $s .= '$diff=\''.$diff."';\n";
$basename = substr(basename($afmfile), 0, -4); $basename = substr(basename($afmfile), 0, -4);
if($fontfile) if ($fontfile) {
{
//Embedded font //Embedded font
if(!file_exists($fontfile)) if (!file_exists($fontfile)) {
die('<b>Error:</b> font file not found: '.$fontfile); die('<b>Error:</b> font file not found: '.$fontfile);
if($type=='TrueType') }
if ($type == 'TrueType') {
CheckTTF($fontfile); CheckTTF($fontfile);
}
$f = fopen($fontfile, 'rb'); $f = fopen($fontfile, 'rb');
if(!$f) if (!$f) {
die('<b>Error:</b> Can\'t open '.$fontfile); die('<b>Error:</b> Can\'t open '.$fontfile);
}
$file = fread($f, filesize($fontfile)); $file = fread($f, filesize($fontfile));
fclose($f); fclose($f);
if($type=='Type1') if ($type == 'Type1') {
{
//Find first two sections and discard third one //Find first two sections and discard third one
$header = (ord($file[0]) == 128); $header = (ord($file[0]) == 128);
if($header) if ($header) {
{
//Strip first binary header //Strip first binary header
$file = substr($file, 6); $file = substr($file, 6);
} }
$pos = strpos($file, 'eexec'); $pos = strpos($file, 'eexec');
if(!$pos) if (!$pos) {
die('<b>Error:</b> font file does not seem to be valid Type1'); die('<b>Error:</b> font file does not seem to be valid Type1');
}
$size1 = $pos + 6; $size1 = $pos + 6;
if($header && ord($file[$size1])==128) if ($header && ord($file[$size1]) == 128) {
{
//Strip second binary header //Strip second binary header
$file = substr($file, 0, $size1).substr($file, $size1 + 6); $file = substr($file, 0, $size1).substr($file, $size1 + 6);
} }
$pos = strpos($file, '00000000'); $pos = strpos($file, '00000000');
if(!$pos) if (!$pos) {
die('<b>Error:</b> font file does not seem to be valid Type1'); die('<b>Error:</b> font file does not seem to be valid Type1');
}
$size2 = $pos - $size1; $size2 = $pos - $size1;
$file = substr($file, 0, $size1 + $size2); $file = substr($file, 0, $size1 + $size2);
} }
if(function_exists('gzcompress')) if (function_exists('gzcompress')) {
{
$cmp = $basename.'.z'; $cmp = $basename.'.z';
SaveToFile($cmp, gzcompress($file), 'b'); SaveToFile($cmp, gzcompress($file), 'b');
$s .= '$file=\''.$cmp."';\n"; $s .= '$file=\''.$cmp."';\n";
echo 'Font file compressed ('.$cmp.')<br>'; echo 'Font file compressed ('.$cmp.')<br>';
} } else {
else
{
$s .= '$file=\''.basename($fontfile)."';\n"; $s .= '$file=\''.basename($fontfile)."';\n";
echo '<b>Notice:</b> font file could not be compressed (zlib extension not available)<br>'; echo '<b>Notice:</b> font file could not be compressed (zlib extension not available)<br>';
} }
if($type=='Type1') if ($type == 'Type1') {
{
$s .= '$size1='.$size1.";\n"; $s .= '$size1='.$size1.";\n";
$s .= '$size2='.$size2.";\n"; $s .= '$size2='.$size2.";\n";
} } else {
else
$s .= '$originalsize='.filesize($fontfile).";\n"; $s .= '$originalsize='.filesize($fontfile).";\n";
} }
else } else {
{
//Not embedded font //Not embedded font
$s .= '$file='."'';\n"; $s .= '$file='."'';\n";
} }
@@ -416,4 +430,3 @@ function MakeFont($fontfile, $afmfile, $enc='cp1252', $patch=array(), $type='Tru
SaveToFile($basename.'.php', $s, 't'); SaveToFile($basename.'.php', $s, 't');
echo 'Font definition file generated ('.$basename.'.php'.')<br>'; echo 'Font definition file generated ('.$basename.'.php'.')<br>';
} }
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Symbol'; $name = 'Symbol';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250, chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>713, '#'=>500, '$'=>549, '%'=>833, '&'=>778, '\''=>439, '('=>333, ')'=>333, '*'=>500, '+'=>549, chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>713, '#'=>500, '$'=>549, '%'=>833, '&'=>778, '\''=>439, '('=>333, ')'=>333, '*'=>500, '+'=>549,
',' => 250, '-'=>549, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>278, ';'=>278, '<'=>549, '='=>549, '>'=>549, '?'=>444, '@'=>549, 'A'=>722, ',' => 250, '-'=>549, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>278, ';'=>278, '<'=>549, '='=>549, '>'=>549, '?'=>444, '@'=>549, 'A'=>722,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>549, chr(178)=>411, chr(179)=>549, chr(180)=>549, chr(181)=>713, chr(182)=>494, chr(183)=>460, chr(184)=>549, chr(185)=>549, chr(186)=>549, chr(187)=>549, chr(188)=>1000, chr(189)=>603, chr(190)=>1000, chr(191)=>658, chr(192)=>823, chr(193)=>686, chr(194)=>795, chr(195)=>987, chr(196)=>768, chr(197)=>768, chr(176)=> 400, chr(177)=>549, chr(178)=>411, chr(179)=>549, chr(180)=>549, chr(181)=>713, chr(182)=>494, chr(183)=>460, chr(184)=>549, chr(185)=>549, chr(186)=>549, chr(187)=>549, chr(188)=>1000, chr(189)=>603, chr(190)=>1000, chr(191)=>658, chr(192)=>823, chr(193)=>686, chr(194)=>795, chr(195)=>987, chr(196)=>768, chr(197)=>768,
chr(198)=> 823, chr(199)=>768, chr(200)=>768, chr(201)=>713, chr(202)=>713, chr(203)=>713, chr(204)=>713, chr(205)=>713, chr(206)=>713, chr(207)=>713, chr(208)=>768, chr(209)=>713, chr(210)=>790, chr(211)=>790, chr(212)=>890, chr(213)=>823, chr(214)=>549, chr(215)=>250, chr(216)=>713, chr(217)=>603, chr(218)=>603, chr(219)=>1042, chr(198)=> 823, chr(199)=>768, chr(200)=>768, chr(201)=>713, chr(202)=>713, chr(203)=>713, chr(204)=>713, chr(205)=>713, chr(206)=>713, chr(207)=>713, chr(208)=>768, chr(209)=>713, chr(210)=>790, chr(211)=>790, chr(212)=>890, chr(213)=>823, chr(214)=>549, chr(215)=>250, chr(216)=>713, chr(217)=>603, chr(218)=>603, chr(219)=>1042,
chr(220)=> 987, chr(221)=>603, chr(222)=>987, chr(223)=>603, chr(224)=>494, chr(225)=>329, chr(226)=>790, chr(227)=>790, chr(228)=>786, chr(229)=>713, chr(230)=>384, chr(231)=>384, chr(232)=>384, chr(233)=>384, chr(234)=>384, chr(235)=>384, chr(236)=>494, chr(237)=>494, chr(238)=>494, chr(239)=>494, chr(240)=>0, chr(241)=>329, chr(220)=> 987, chr(221)=>603, chr(222)=>987, chr(223)=>603, chr(224)=>494, chr(225)=>329, chr(226)=>790, chr(227)=>790, chr(228)=>786, chr(229)=>713, chr(230)=>384, chr(231)=>384, chr(232)=>384, chr(233)=>384, chr(234)=>384, chr(235)=>384, chr(236)=>494, chr(237)=>494, chr(238)=>494, chr(239)=>494, chr(240)=>0, chr(241)=>329,
chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0); chr(242)=> 274, chr(243)=>686, chr(244)=>686, chr(245)=>686, chr(246)=>384, chr(247)=>384, chr(248)=>384, chr(249)=>384, chr(250)=>384, chr(251)=>384, chr(252)=>494, chr(253)=>494, chr(254)=>494, chr(255)=>0, ];
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Times-Roman'; $name = 'Times-Roman';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250, chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>408, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>180, '('=>333, ')'=>333, '*'=>500, '+'=>564, chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>408, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>180, '('=>333, ')'=>333, '*'=>500, '+'=>564,
',' => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>278, ';'=>278, '<'=>564, '='=>564, '>'=>564, '?'=>444, '@'=>921, 'A'=>722, ',' => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>278, ';'=>278, '<'=>564, '='=>564, '>'=>564, '?'=>444, '@'=>921, 'A'=>722,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>564, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>500, chr(182)=>453, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>310, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>444, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722, chr(176)=> 400, chr(177)=>564, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>500, chr(182)=>453, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>310, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>444, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
chr(198)=> 889, chr(199)=>667, chr(200)=>611, chr(201)=>611, chr(202)=>611, chr(203)=>611, chr(204)=>333, chr(205)=>333, chr(206)=>333, chr(207)=>333, chr(208)=>722, chr(209)=>722, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>564, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722, chr(198)=> 889, chr(199)=>667, chr(200)=>611, chr(201)=>611, chr(202)=>611, chr(203)=>611, chr(204)=>333, chr(205)=>333, chr(206)=>333, chr(207)=>333, chr(208)=>722, chr(209)=>722, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>564, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722,
chr(220)=> 722, chr(221)=>722, chr(222)=>556, chr(223)=>500, chr(224)=>444, chr(225)=>444, chr(226)=>444, chr(227)=>444, chr(228)=>444, chr(229)=>444, chr(230)=>667, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>500, chr(220)=> 722, chr(221)=>722, chr(222)=>556, chr(223)=>500, chr(224)=>444, chr(225)=>444, chr(226)=>444, chr(227)=>444, chr(228)=>444, chr(229)=>444, chr(230)=>667, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>500,
chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500); chr(242)=> 500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>564, chr(248)=>500, chr(249)=>500, chr(250)=>500, chr(251)=>500, chr(252)=>500, chr(253)=>500, chr(254)=>500, chr(255)=>500, ];
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Times-Bold'; $name = 'Times-Bold';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250, chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>555, '#'=>500, '$'=>500, '%'=>1000, '&'=>833, '\''=>278, '('=>333, ')'=>333, '*'=>500, '+'=>570, chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>555, '#'=>500, '$'=>500, '%'=>1000, '&'=>833, '\''=>278, '('=>333, ')'=>333, '*'=>500, '+'=>570,
',' => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>570, '='=>570, '>'=>570, '?'=>500, '@'=>930, 'A'=>722, ',' => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>570, '='=>570, '>'=>570, '?'=>500, '@'=>930, 'A'=>722,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>570, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>556, chr(182)=>540, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>330, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722, chr(176)=> 400, chr(177)=>570, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>556, chr(182)=>540, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>330, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>389, chr(205)=>389, chr(206)=>389, chr(207)=>389, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>570, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722, chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>389, chr(205)=>389, chr(206)=>389, chr(207)=>389, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>570, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
chr(220)=> 722, chr(221)=>722, chr(222)=>611, chr(223)=>556, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>722, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>556, chr(220)=> 722, chr(221)=>722, chr(222)=>611, chr(223)=>556, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>722, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>556,
chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500); chr(242)=> 500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>570, chr(248)=>500, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500, ];
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Times-BoldItalic'; $name = 'Times-BoldItalic';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250, chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>389, '"'=>555, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>278, '('=>333, ')'=>333, '*'=>500, '+'=>570, chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>389, '"'=>555, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>278, '('=>333, ')'=>333, '*'=>500, '+'=>570,
',' => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>570, '='=>570, '>'=>570, '?'=>500, '@'=>832, 'A'=>667, ',' => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>570, '='=>570, '>'=>570, '?'=>500, '@'=>832, 'A'=>667,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>570, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>576, chr(182)=>500, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>300, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667, chr(176)=> 400, chr(177)=>570, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>576, chr(182)=>500, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>300, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667,
chr(198)=> 944, chr(199)=>667, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>389, chr(205)=>389, chr(206)=>389, chr(207)=>389, chr(208)=>722, chr(209)=>722, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>570, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722, chr(198)=> 944, chr(199)=>667, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>389, chr(205)=>389, chr(206)=>389, chr(207)=>389, chr(208)=>722, chr(209)=>722, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>570, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722,
chr(220)=> 722, chr(221)=>611, chr(222)=>611, chr(223)=>500, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>722, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>556, chr(220)=> 722, chr(221)=>611, chr(222)=>611, chr(223)=>500, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>722, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>556,
chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444); chr(242)=> 500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>570, chr(248)=>500, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>444, chr(254)=>500, chr(255)=>444, ];
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'Times-Italic'; $name = 'Times-Italic';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250, chr(0) => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>420, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>214, '('=>333, ')'=>333, '*'=>500, '+'=>675, chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>420, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>214, '('=>333, ')'=>333, '*'=>500, '+'=>675,
',' => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>675, '='=>675, '>'=>675, '?'=>500, '@'=>920, 'A'=>611, ',' => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>675, '='=>675, '>'=>675, '?'=>500, '@'=>920, 'A'=>611,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 400, chr(177)=>675, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>500, chr(182)=>523, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>310, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>611, chr(193)=>611, chr(194)=>611, chr(195)=>611, chr(196)=>611, chr(197)=>611, chr(176)=> 400, chr(177)=>675, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>500, chr(182)=>523, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>310, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>611, chr(193)=>611, chr(194)=>611, chr(195)=>611, chr(196)=>611, chr(197)=>611,
chr(198)=> 889, chr(199)=>667, chr(200)=>611, chr(201)=>611, chr(202)=>611, chr(203)=>611, chr(204)=>333, chr(205)=>333, chr(206)=>333, chr(207)=>333, chr(208)=>722, chr(209)=>667, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>675, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722, chr(198)=> 889, chr(199)=>667, chr(200)=>611, chr(201)=>611, chr(202)=>611, chr(203)=>611, chr(204)=>333, chr(205)=>333, chr(206)=>333, chr(207)=>333, chr(208)=>722, chr(209)=>667, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>675, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722,
chr(220)=> 722, chr(221)=>556, chr(222)=>611, chr(223)=>500, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>667, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>500, chr(220)=> 722, chr(221)=>556, chr(222)=>611, chr(223)=>500, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>667, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>500,
chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444); chr(242)=> 500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>675, chr(248)=>500, chr(249)=>500, chr(250)=>500, chr(251)=>500, chr(252)=>500, chr(253)=>444, chr(254)=>500, chr(255)=>444, ];
?>

View File

@@ -1,9 +1,10 @@
<?php <?php
$type = 'Core'; $type = 'Core';
$name = 'ZapfDingbats'; $name = 'ZapfDingbats';
$up = -100; $up = -100;
$ut = 50; $ut = 50;
$cw = array( $cw = [
chr(0) => 0, chr(1)=>0, chr(2)=>0, chr(3)=>0, chr(4)=>0, chr(5)=>0, chr(6)=>0, chr(7)=>0, chr(8)=>0, chr(9)=>0, chr(10)=>0, chr(11)=>0, chr(12)=>0, chr(13)=>0, chr(14)=>0, chr(15)=>0, chr(16)=>0, chr(17)=>0, chr(18)=>0, chr(19)=>0, chr(20)=>0, chr(21)=>0, chr(0) => 0, chr(1)=>0, chr(2)=>0, chr(3)=>0, chr(4)=>0, chr(5)=>0, chr(6)=>0, chr(7)=>0, chr(8)=>0, chr(9)=>0, chr(10)=>0, chr(11)=>0, chr(12)=>0, chr(13)=>0, chr(14)=>0, chr(15)=>0, chr(16)=>0, chr(17)=>0, chr(18)=>0, chr(19)=>0, chr(20)=>0, chr(21)=>0,
chr(22) => 0, chr(23)=>0, chr(24)=>0, chr(25)=>0, chr(26)=>0, chr(27)=>0, chr(28)=>0, chr(29)=>0, chr(30)=>0, chr(31)=>0, ' '=>278, '!'=>974, '"'=>961, '#'=>974, '$'=>980, '%'=>719, '&'=>789, '\''=>790, '('=>791, ')'=>690, '*'=>960, '+'=>939, chr(22) => 0, chr(23)=>0, chr(24)=>0, chr(25)=>0, chr(26)=>0, chr(27)=>0, chr(28)=>0, chr(29)=>0, chr(30)=>0, chr(31)=>0, ' '=>278, '!'=>974, '"'=>961, '#'=>974, '$'=>980, '%'=>719, '&'=>789, '\''=>790, '('=>791, ')'=>690, '*'=>960, '+'=>939,
',' => 549, '-'=>855, '.'=>911, '/'=>933, '0'=>911, '1'=>945, '2'=>974, '3'=>755, '4'=>846, '5'=>762, '6'=>761, '7'=>571, '8'=>677, '9'=>763, ':'=>760, ';'=>759, '<'=>754, '='=>494, '>'=>552, '?'=>537, '@'=>577, 'A'=>692, ',' => 549, '-'=>855, '.'=>911, '/'=>933, '0'=>911, '1'=>945, '2'=>974, '3'=>755, '4'=>846, '5'=>762, '6'=>761, '7'=>571, '8'=>677, '9'=>763, ':'=>760, ';'=>759, '<'=>754, '='=>494, '>'=>552, '?'=>537, '@'=>577, 'A'=>692,
@@ -15,5 +16,4 @@ $cw = array(
chr(176)=> 788, chr(177)=>788, chr(178)=>788, chr(179)=>788, chr(180)=>788, chr(181)=>788, chr(182)=>788, chr(183)=>788, chr(184)=>788, chr(185)=>788, chr(186)=>788, chr(187)=>788, chr(188)=>788, chr(189)=>788, chr(190)=>788, chr(191)=>788, chr(192)=>788, chr(193)=>788, chr(194)=>788, chr(195)=>788, chr(196)=>788, chr(197)=>788, chr(176)=> 788, chr(177)=>788, chr(178)=>788, chr(179)=>788, chr(180)=>788, chr(181)=>788, chr(182)=>788, chr(183)=>788, chr(184)=>788, chr(185)=>788, chr(186)=>788, chr(187)=>788, chr(188)=>788, chr(189)=>788, chr(190)=>788, chr(191)=>788, chr(192)=>788, chr(193)=>788, chr(194)=>788, chr(195)=>788, chr(196)=>788, chr(197)=>788,
chr(198)=> 788, chr(199)=>788, chr(200)=>788, chr(201)=>788, chr(202)=>788, chr(203)=>788, chr(204)=>788, chr(205)=>788, chr(206)=>788, chr(207)=>788, chr(208)=>788, chr(209)=>788, chr(210)=>788, chr(211)=>788, chr(212)=>894, chr(213)=>838, chr(214)=>1016, chr(215)=>458, chr(216)=>748, chr(217)=>924, chr(218)=>748, chr(219)=>918, chr(198)=> 788, chr(199)=>788, chr(200)=>788, chr(201)=>788, chr(202)=>788, chr(203)=>788, chr(204)=>788, chr(205)=>788, chr(206)=>788, chr(207)=>788, chr(208)=>788, chr(209)=>788, chr(210)=>788, chr(211)=>788, chr(212)=>894, chr(213)=>838, chr(214)=>1016, chr(215)=>458, chr(216)=>748, chr(217)=>924, chr(218)=>748, chr(219)=>918,
chr(220)=> 927, chr(221)=>928, chr(222)=>928, chr(223)=>834, chr(224)=>873, chr(225)=>828, chr(226)=>924, chr(227)=>924, chr(228)=>917, chr(229)=>930, chr(230)=>931, chr(231)=>463, chr(232)=>883, chr(233)=>836, chr(234)=>836, chr(235)=>867, chr(236)=>867, chr(237)=>696, chr(238)=>696, chr(239)=>874, chr(240)=>0, chr(241)=>874, chr(220)=> 927, chr(221)=>928, chr(222)=>928, chr(223)=>834, chr(224)=>873, chr(225)=>828, chr(226)=>924, chr(227)=>924, chr(228)=>917, chr(229)=>930, chr(230)=>931, chr(231)=>463, chr(232)=>883, chr(233)=>836, chr(234)=>836, chr(235)=>867, chr(236)=>867, chr(237)=>696, chr(238)=>696, chr(239)=>874, chr(240)=>0, chr(241)=>874,
chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0); chr(242)=> 760, chr(243)=>946, chr(244)=>771, chr(245)=>865, chr(246)=>771, chr(247)=>888, chr(248)=>967, chr(249)=>888, chr(250)=>831, chr(251)=>873, chr(252)=>927, chr(253)=>970, chr(254)=>918, chr(255)=>0, ];
?>

View File

@@ -373,7 +373,7 @@
[165, 3196, 0, [630, 1204, 1770, 2100]], [165, 3196, 0, [630, 1204, 1770, 2100]],
[169, 3362, 0, [660, 1260, 1860, 2220]], [169, 3362, 0, [660, 1260, 1860, 2220]],
[173, 3532, 0, [720, 1316, 1950, 2310]], [173, 3532, 0, [720, 1316, 1950, 2310]],
[177, 3706, 0, [750, 1372, 2040, 2430]] //40 [177, 3706, 0, [750, 1372, 2040, 2430]], //40
]; ];
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -419,7 +419,7 @@
[10, 12, 14], [10, 12, 14],
[9, 11, 13], [9, 11, 13],
[8, 16, 16], [8, 16, 16],
[8, 10, 12] [8, 10, 12],
]; ];
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -577,7 +577,7 @@
"\xa1\xa0\xa0\xa0\xa1", "\xa1\xa0\xa0\xa0\xa1",
"\xa1\xa0\xa1\xa0\xa1", "\xa1\xa0\xa1\xa0\xa1",
"\xa1\xa0\xa0\xa0\xa1", "\xa1\xa0\xa0\xa0\xa1",
"\xa1\xa1\xa1\xa1\xa1" "\xa1\xa1\xa1\xa1\xa1",
]; ];
$yStart = $oy - 2; $yStart = $oy - 2;
@@ -640,7 +640,7 @@
0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9, 0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9,
0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75, 0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75,
0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64, 0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64,
0x27541, 0x28c69 0x27541, 0x28c69,
]; ];
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -660,7 +660,7 @@
[0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976], [0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976],
[0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0], [0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0],
[0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed], [0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed],
[0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b] [0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b],
]; ];
public static function getFormatInfo($mask, $level) public static function getFormatInfo($mask, $level)
@@ -697,7 +697,7 @@
"\xc1\xc0\xc1\xc1\xc1\xc0\xc1", "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
"\xc1\xc0\xc1\xc1\xc1\xc0\xc1", "\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
"\xc1\xc0\xc0\xc0\xc0\xc0\xc1", "\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
"\xc1\xc1\xc1\xc1\xc1\xc1\xc1" "\xc1\xc1\xc1\xc1\xc1\xc1\xc1",
]; ];
for ($y = 0; $y < 7; $y++) { for ($y = 0; $y < 7; $y++) {
@@ -1440,7 +1440,7 @@
-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
]; ];
//---------------------------------------------------------------------- //----------------------------------------------------------------------