Revision: 8590
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8590&view=rev
Author: vargenau
Date: 2012-12-03 13:29:21 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Update to fpdf 1.7
Modified Paths:
--------------
trunk/lib/font/chinese.php
trunk/lib/font/courier.php
trunk/lib/font/helvetica.php
trunk/lib/font/helveticab.php
trunk/lib/font/helveticabi.php
trunk/lib/font/helveticai.php
trunk/lib/font/japanese.php
trunk/lib/font/symbol.php
trunk/lib/font/times.php
trunk/lib/font/timesb.php
trunk/lib/font/timesbi.php
trunk/lib/font/timesi.php
trunk/lib/font/zapfdingbats.php
trunk/lib/fpdf.php
Added Paths:
-----------
trunk/lib/font/
trunk/lib/font/courierb.php
trunk/lib/font/courierbi.php
trunk/lib/font/courieri.php
Removed Paths:
-------------
trunk/lib/fpdf/
Modified: trunk/lib/font/chinese.php
===================================================================
--- trunk/lib/fpdf/chinese.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/chinese.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,417 +1,456 @@
<?php // -*-php-*-
+// $Id: chinese.php 7956 2011-03-03 17:08:31Z vargenau $
// PDF functions taken from FPDF http://www.fpdf.org
-require 'lib/pdf.php';
+require('lib/pdf.php');
-$Big5_widths = array(' ' => 250, '!' => 250, '"' => 408, '#' => 668, '$' => 490, '%' => 875, '&' => 698, '\'' => 250,
- '(' => 240, ')' => 240, '*' => 417, '+' => 667, ',' => 250, '-' => 313, '.' => 250, '/' => 520, '0' => 500, '1' => 500,
- '2' => 500, '3' => 500, '4' => 500, '5' => 500, '6' => 500, '7' => 500, '8' => 500, '9' => 500, ':' => 250, ';' => 250,
- '<' => 667, '=' => 667, '>' => 667, '?' => 396, '@' => 921, 'A' => 677, 'B' => 615, 'C' => 719, 'D' => 760, 'E' => 625,
- 'F' => 552, 'G' => 771, 'H' => 802, 'I' => 354, 'J' => 354, 'K' => 781, 'L' => 604, 'M' => 927, 'N' => 750, 'O' => 823,
- 'P' => 563, 'Q' => 823, 'R' => 729, 'S' => 542, 'T' => 698, 'U' => 771, 'V' => 729, 'W' => 948, 'X' => 771, 'Y' => 677,
- 'Z' => 635, '[' => 344, '\\' => 520, ']' => 344, '^' => 469, '_' => 500, '`' => 250, 'a' => 469, 'b' => 521, 'c' => 427,
- 'd' => 521, 'e' => 438, 'f' => 271, 'g' => 469, 'h' => 531, 'i' => 250, 'j' => 250, 'k' => 458, 'l' => 240, 'm' => 802,
- 'n' => 531, 'o' => 500, 'p' => 521, 'q' => 521, 'r' => 365, 's' => 333, 't' => 292, 'u' => 521, 'v' => 458, 'w' => 677,
- 'x' => 479, 'y' => 458, 'z' => 427, '{' => 480, '|' => 496, '}' => 480, '~' => 667);
+$Big5_widths=array(' '=>250,'!'=>250,'"'=>408,'#'=>668,'$'=>490,'%'=>875,'&'=>698,'\''=>250,
+ '('=>240,')'=>240,'*'=>417,'+'=>667,','=>250,'-'=>313,'.'=>250,'/'=>520,'0'=>500,'1'=>500,
+ '2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>250,';'=>250,
+ '<'=>667,'='=>667,'>'=>667,'?'=>396,'@'=>921,'A'=>677,'B'=>615,'C'=>719,'D'=>760,'E'=>625,
+ 'F'=>552,'G'=>771,'H'=>802,'I'=>354,'J'=>354,'K'=>781,'L'=>604,'M'=>927,'N'=>750,'O'=>823,
+ 'P'=>563,'Q'=>823,'R'=>729,'S'=>542,'T'=>698,'U'=>771,'V'=>729,'W'=>948,'X'=>771,'Y'=>677,
+ 'Z'=>635,'['=>344,'\\'=>520,']'=>344,'^'=>469,'_'=>500,'`'=>250,'a'=>469,'b'=>521,'c'=>427,
+ 'd'=>521,'e'=>438,'f'=>271,'g'=>469,'h'=>531,'i'=>250,'j'=>250,'k'=>458,'l'=>240,'m'=>802,
+ 'n'=>531,'o'=>500,'p'=>521,'q'=>521,'r'=>365,'s'=>333,'t'=>292,'u'=>521,'v'=>458,'w'=>677,
+ 'x'=>479,'y'=>458,'z'=>427,'{'=>480,'|'=>496,'}'=>480,'~'=>667);
-$GB_widths = array(' ' => 207, '!' => 270, '"' => 342, '#' => 467, '$' => 462, '%' => 797, '&' => 710, '\'' => 239,
- '(' => 374, ')' => 374, '*' => 423, '+' => 605, ',' => 238, '-' => 375, '.' => 238, '/' => 334, '0' => 462, '1' => 462,
- '2' => 462, '3' => 462, '4' => 462, '5' => 462, '6' => 462, '7' => 462, '8' => 462, '9' => 462, ':' => 238, ';' => 238,
- '<' => 605, '=' => 605, '>' => 605, '?' => 344, '@' => 748, 'A' => 684, 'B' => 560, 'C' => 695, 'D' => 739, 'E' => 563,
- 'F' => 511, 'G' => 729, 'H' => 793, 'I' => 318, 'J' => 312, 'K' => 666, 'L' => 526, 'M' => 896, 'N' => 758, 'O' => 772,
- 'P' => 544, 'Q' => 772, 'R' => 628, 'S' => 465, 'T' => 607, 'U' => 753, 'V' => 711, 'W' => 972, 'X' => 647, 'Y' => 620,
- 'Z' => 607, '[' => 374, '\\' => 333, ']' => 374, '^' => 606, '_' => 500, '`' => 239, 'a' => 417, 'b' => 503, 'c' => 427,
- 'd' => 529, 'e' => 415, 'f' => 264, 'g' => 444, 'h' => 518, 'i' => 241, 'j' => 230, 'k' => 495, 'l' => 228, 'm' => 793,
- 'n' => 527, 'o' => 524, 'p' => 524, 'q' => 504, 'r' => 338, 's' => 336, 't' => 277, 'u' => 517, 'v' => 450, 'w' => 652,
- 'x' => 466, 'y' => 452, 'z' => 407, '{' => 370, '|' => 258, '}' => 370, '~' => 605);
+$GB_widths=array(' '=>207,'!'=>270,'"'=>342,'#'=>467,'$'=>462,'%'=>797,'&'=>710,'\''=>239,
+ '('=>374,')'=>374,'*'=>423,'+'=>605,','=>238,'-'=>375,'.'=>238,'/'=>334,'0'=>462,'1'=>462,
+ '2'=>462,'3'=>462,'4'=>462,'5'=>462,'6'=>462,'7'=>462,'8'=>462,'9'=>462,':'=>238,';'=>238,
+ '<'=>605,'='=>605,'>'=>605,'?'=>344,'@'=>748,'A'=>684,'B'=>560,'C'=>695,'D'=>739,'E'=>563,
+ 'F'=>511,'G'=>729,'H'=>793,'I'=>318,'J'=>312,'K'=>666,'L'=>526,'M'=>896,'N'=>758,'O'=>772,
+ 'P'=>544,'Q'=>772,'R'=>628,'S'=>465,'T'=>607,'U'=>753,'V'=>711,'W'=>972,'X'=>647,'Y'=>620,
+ 'Z'=>607,'['=>374,'\\'=>333,']'=>374,'^'=>606,'_'=>500,'`'=>239,'a'=>417,'b'=>503,'c'=>427,
+ 'd'=>529,'e'=>415,'f'=>264,'g'=>444,'h'=>518,'i'=>241,'j'=>230,'k'=>495,'l'=>228,'m'=>793,
+ 'n'=>527,'o'=>524,'p'=>524,'q'=>504,'r'=>338,'s'=>336,'t'=>277,'u'=>517,'v'=>450,'w'=>652,
+ 'x'=>466,'y'=>452,'z'=>407,'{'=>370,'|'=>258,'}'=>370,'~'=>605);
class PDF_Chinese extends PDF
{
- function AddCIDFont($family, $style, $name, $cw, $CMap, $registry)
+ function AddCIDFont($family,$style,$name,$cw,$CMap,$registry)
{
- $fontkey = strtolower($family) . strtoupper($style);
- if (isset($this->fonts[$fontkey]))
- $this->Error("Font already added: $family $style");
- $i = count($this->fonts) + 1;
- $name = str_replace(' ', '', $name);
- $this->fonts[$fontkey] = array('i' => $i, 'type' => 'Type0', 'name' => $name, 'up' => -130, 'ut' => 40, 'cw' => $cw, 'CMap' => $CMap, 'registry' => $registry);
+ $fontkey=strtolower($family).strtoupper($style);
+ if(isset($this->fonts[$fontkey]))
+ $this->Error("Font already added: $family $style");
+ $i=count($this->fonts)+1;
+ $name=str_replace(' ','',$name);
+ $this->fonts[$fontkey]=array('i'=>$i,'type'=>'Type0','name'=>$name,'up'=>-130,'ut'=>40,'cw'=>$cw,'CMap'=>$CMap,'registry'=>$registry);
}
- function AddCIDFonts($family, $name, $cw, $CMap, $registry)
+ function AddCIDFonts($family,$name,$cw,$CMap,$registry)
{
- $this->AddCIDFont($family, '', $name, $cw, $CMap, $registry);
- $this->AddCIDFont($family, 'B', $name . ',Bold', $cw, $CMap, $registry);
- $this->AddCIDFont($family, 'I', $name . ',Italic', $cw, $CMap, $registry);
- $this->AddCIDFont($family, 'BI', $name . ',BoldItalic', $cw, $CMap, $registry);
+ $this->AddCIDFont($family,'',$name,$cw,$CMap,$registry);
+ $this->AddCIDFont($family,'B',$name.',Bold',$cw,$CMap,$registry);
+ $this->AddCIDFont($family,'I',$name.',Italic',$cw,$CMap,$registry);
+ $this->AddCIDFont($family,'BI',$name.',BoldItalic',$cw,$CMap,$registry);
}
- function AddBig5Font($family = 'Big5', $name = 'MSungStd-Light-Acro')
+ function AddBig5Font($family='Big5',$name='MSungStd-Light-Acro')
{
- //Add Big5 font with proportional Latin
- $cw = $GLOBALS['Big5_widths'];
- $CMap = 'ETenms-B5-H';
- $registry = array('ordering' => 'CNS1', 'supplement' => 0);
- $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+ //Add Big5 font with proportional Latin
+ $cw=$GLOBALS['Big5_widths'];
+ $CMap='ETenms-B5-H';
+ $registry=array('ordering'=>'CNS1','supplement'=>0);
+ $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
}
- function AddBig5hwFont($family = 'Big5-hw', $name = 'MSungStd-Light-Acro')
+ function AddBig5hwFont($family='Big5-hw',$name='MSungStd-Light-Acro')
{
- //Add Big5 font with half-witdh Latin
- for ($i = 32; $i <= 126; $i++)
- $cw[chr($i)] = 500;
- $CMap = 'ETen-B5-H';
- $registry = array('ordering' => 'CNS1', 'supplement' => 0);
- $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+ //Add Big5 font with half-witdh Latin
+ for($i=32;$i<=126;$i++)
+ $cw[chr($i)]=500;
+ $CMap='ETen-B5-H';
+ $registry=array('ordering'=>'CNS1','supplement'=>0);
+ $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
}
- function AddGBFont($family = 'GB', $name = 'STSongStd-Light-Acro')
+ function AddGBFont($family='GB',$name='STSongStd-Light-Acro')
{
- //Add GB font with proportional Latin
- $cw = $GLOBALS['GB_widths'];
- $CMap = 'GBKp-EUC-H';
- $registry = array('ordering' => 'GB1', 'supplement' => 2);
- $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+ //Add GB font with proportional Latin
+ $cw=$GLOBALS['GB_widths'];
+ $CMap='GBKp-EUC-H';
+ $registry=array('ordering'=>'GB1','supplement'=>2);
+ $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
}
- function AddGBhwFont($family = 'GB-hw', $name = 'STSongStd-Light-Acro')
+ function AddGBhwFont($family='GB-hw',$name='STSongStd-Light-Acro')
{
- //Add GB font with half-width Latin
- for ($i = 32; $i <= 126; $i++)
- $cw[chr($i)] = 500;
- $CMap = 'GBK-EUC-H';
- $registry = array('ordering' => 'GB1', 'supplement' => 2);
- $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+ //Add GB font with half-width Latin
+ for($i=32;$i<=126;$i++)
+ $cw[chr($i)]=500;
+ $CMap='GBK-EUC-H';
+ $registry=array('ordering'=>'GB1','supplement'=>2);
+ $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
}
function GetStringWidth($s)
{
- if ($this->CurrentFont['type'] == 'Type0')
- return $this->GetMBStringWidth($s);
- else
- return parent::GetStringWidth($s);
+ if ($this->CurrentFont['type']=='Type0')
+ return $this->GetMBStringWidth($s);
+ else
+ return parent::GetStringWidth($s);
}
function GetMBStringWidth($s)
{
- //Multi-byte version of GetStringWidth()
- $l = 0;
- $cw =& $this->CurrentFont['cw'];
- $nb = strlen($s);
- $i = 0;
- while ($i < $nb) {
- $c = $s[$i];
- if (ord($c) < 128) {
- $l += $cw[$c];
- $i++;
- } else {
- $l += 1000;
- $i += 2;
- }
+ //Multi-byte version of GetStringWidth()
+ $l=0;
+ $cw=&$this->CurrentFont['cw'];
+ $nb=strlen($s);
+ $i=0;
+ while($i<$nb)
+ {
+ $c=$s[$i];
+ if(ord($c)<128)
+ {
+ $l+=$cw[$c];
+ $i++;
}
- return $l * $this->FontSize / 1000;
+ else
+ {
+ $l+=1000;
+ $i+=2;
+ }
}
+ return $l*$this->FontSize/1000;
+ }
- function MultiCell($w, $h, $txt, $border = 0, $align = 'L', $fill = 0)
+ function MultiCell($w,$h,$txt,$border=0,$align='L',$fill=0)
{
- if ($this->CurrentFont['type'] == 'Type0')
- $this->MBMultiCell($w, $h, $txt, $border, $align, $fill);
- else
- parent::MultiCell($w, $h, $txt, $border, $align, $fill);
+ if($this->CurrentFont['type']=='Type0')
+ $this->MBMultiCell($w,$h,$txt,$border,$align,$fill);
+ else
+ parent::MultiCell($w,$h,$txt,$border,$align,$fill);
}
- function MBMultiCell($w, $h, $txt, $border = 0, $align = 'L', $fill = 0)
+ function MBMultiCell($w,$h,$txt,$border=0,$align='L',$fill=0)
{
- //Multi-byte version of MultiCell()
- $cw =& $this->CurrentFont['cw'];
- if ($w == 0)
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
- $s = str_replace("\r", '', $txt);
- $nb = strlen($s);
- if ($nb > 0 and $s[$nb - 1] == "\n")
- $nb--;
- $b = 0;
- if ($border) {
- if ($border == 1) {
- $border = 'LTRB';
- $b = 'LRT';
- $b2 = 'LR';
- } else {
- $b2 = '';
- if (is_int(strpos($border, 'L')))
- $b2 .= 'L';
- if (is_int(strpos($border, 'R')))
- $b2 .= 'R';
- $b = is_int(strpos($border, 'T')) ? $b2 . 'T' : $b2;
- }
+ //Multi-byte version of MultiCell()
+ $cw=&$this->CurrentFont['cw'];
+ if($w==0)
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+ $s=str_replace("\r",'',$txt);
+ $nb=strlen($s);
+ if($nb>0 and $s[$nb-1]=="\n")
+ $nb--;
+ $b=0;
+ if($border)
+ {
+ if($border==1)
+ {
+ $border='LTRB';
+ $b='LRT';
+ $b2='LR';
}
- $sep = -1;
- $i = 0;
- $j = 0;
- $l = 0;
- $nl = 1;
- while ($i < $nb) {
- //Get next character
- $c = $s[$i];
- //Check if ASCII or MB
- $ascii = (ord($c) < 128);
- if ($c == "\n") {
- //Explicit line break
- $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
- $i++;
- $sep = -1;
- $j = $i;
- $l = 0;
- $nl++;
- if ($border and $nl == 2)
- $b = $b2;
- continue;
+ else
+ {
+ $b2='';
+ if(is_int(strpos($border,'L')))
+ $b2.='L';
+ if(is_int(strpos($border,'R')))
+ $b2.='R';
+ $b=is_int(strpos($border,'T')) ? $b2.'T' : $b2;
+ }
+ }
+ $sep=-1;
+ $i=0;
+ $j=0;
+ $l=0;
+ $nl=1;
+ while($i<$nb)
+ {
+ //Get next character
+ $c=$s[$i];
+ //Check if ASCII or MB
+ $ascii=(ord($c)<128);
+ if($c=="\n")
+ {
+ //Explicit line break
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+ $i++;
+ $sep=-1;
+ $j=$i;
+ $l=0;
+ $nl++;
+ if($border and $nl==2)
+ $b=$b2;
+ continue;
+ }
+ if(!$ascii)
+ {
+ $sep=$i;
+ $ls=$l;
+ }
+ elseif($c==' ')
+ {
+ $sep=$i;
+ $ls=$l;
+ }
+ $l+=$ascii ? $cw[$c] : 1000;
+ if($l>$wmax)
+ {
+ //Automatic line break
+ if($sep==-1 or $i==$j)
+ {
+ if($i==$j)
+ $i+=$ascii ? 1 : 2;
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
}
- if (!$ascii) {
- $sep = $i;
- $ls = $l;
- } elseif ($c == ' ') {
- $sep = $i;
- $ls = $l;
+ else
+ {
+ $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
+ $i=($s[$sep]==' ') ? $sep+1 : $sep;
}
- $l += $ascii ? $cw[$c] : 1000;
- if ($l > $wmax) {
- //Automatic line break
- if ($sep == -1 or $i == $j) {
- if ($i == $j)
- $i += $ascii ? 1 : 2;
- $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
- } else {
- $this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);
- $i = ($s[$sep] == ' ') ? $sep + 1 : $sep;
- }
- $sep = -1;
- $j = $i;
- $l = 0;
- $nl++;
- if ($border and $nl == 2)
- $b = $b2;
- } else
- $i += $ascii ? 1 : 2;
+ $sep=-1;
+ $j=$i;
+ $l=0;
+ $nl++;
+ if($border and $nl==2)
+ $b=$b2;
}
- //Last chunk
- if ($border and is_int(strpos($border, 'B')))
- $b .= 'B';
- $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
- $this->x = $this->lMargin;
+ else
+ $i+=$ascii ? 1 : 2;
}
+ //Last chunk
+ if($border and is_int(strpos($border,'B')))
+ $b.='B';
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+ $this->x=$this->lMargin;
+ }
- function Write($h, $txt, $link = '')
+ function Write($h,$txt,$link='')
{
- if ($this->CurrentFont['type'] == 'Type0')
- $this->MBWrite($h, $txt, $link);
- else
- parent::Write($h, $txt, $link);
+ if($this->CurrentFont['type']=='Type0')
+ $this->MBWrite($h,$txt,$link);
+ else
+ parent::Write($h,$txt,$link);
}
- function MBWrite($h, $txt, $link)
+ function MBWrite($h,$txt,$link)
{
- //Multi-byte version of Write()
- $cw =& $this->CurrentFont['cw'];
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
- $s = str_replace("\r", '', $txt);
- $nb = strlen($s);
- $sep = -1;
- $i = 0;
- $j = 0;
- $l = 0;
- $nl = 1;
- while ($i < $nb) {
- //Get next character
- $c = $s[$i];
- //Check if ASCII or MB
- $ascii = (ord($c) < 128);
- if ($c == "\n") {
- //Explicit line break
- $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
- $i++;
- $sep = -1;
- $j = $i;
- $l = 0;
- if ($nl == 1) {
- $this->x = $this->lMargin;
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+ //Multi-byte version of Write()
+ $cw=&$this->CurrentFont['cw'];
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+ $s=str_replace("\r",'',$txt);
+ $nb=strlen($s);
+ $sep=-1;
+ $i=0;
+ $j=0;
+ $l=0;
+ $nl=1;
+ while($i<$nb)
+ {
+ //Get next character
+ $c=$s[$i];
+ //Check if ASCII or MB
+ $ascii=(ord($c)<128);
+ if($c=="\n")
+ {
+ //Explicit line break
+ $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
+ $i++;
+ $sep=-1;
+ $j=$i;
+ $l=0;
+ if($nl==1)
+ {
+ $this->x=$this->lMargin;
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+ }
+ $nl++;
+ continue;
+ }
+ if(!$ascii or $c==' ')
+ $sep=$i;
+ $l+=$ascii ? $cw[$c] : 1000;
+ if($l>$wmax)
+ {
+ //Automatic line break
+ if($sep==-1 or $i==$j)
+ {
+ if($this->x>$this->lMargin)
+ {
+ //Move to next line
+ $this->x=$this->lMargin;
+ $this->y+=$h;
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+ $i++;
+ $nl++;
+ continue;
}
- $nl++;
- continue;
+ if($i==$j)
+ $i+=$ascii ? 1 : 2;
+ $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
}
- if (!$ascii or $c == ' ')
- $sep = $i;
- $l += $ascii ? $cw[$c] : 1000;
- if ($l > $wmax) {
- //Automatic line break
- if ($sep == -1 or $i == $j) {
- if ($this->x > $this->lMargin) {
- //Move to next line
- $this->x = $this->lMargin;
- $this->y += $h;
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
- $i++;
- $nl++;
- continue;
- }
- if ($i == $j)
- $i += $ascii ? 1 : 2;
- $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
- } else {
- $this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', 0, $link);
- $i = ($s[$sep] == ' ') ? $sep + 1 : $sep;
- }
- $sep = -1;
- $j = $i;
- $l = 0;
- if ($nl == 1) {
- $this->x = $this->lMargin;
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
- }
- $nl++;
- } else
- $i += $ascii ? 1 : 2;
+ else
+ {
+ $this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);
+ $i=($s[$sep]==' ') ? $sep+1 : $sep;
+ }
+ $sep=-1;
+ $j=$i;
+ $l=0;
+ if($nl==1)
+ {
+ $this->x=$this->lMargin;
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+ }
+ $nl++;
}
- //Last chunk
- if ($i != $j)
- $this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j, $i - $j), 0, 0, '', 0, $link);
+ else
+ $i+=$ascii ? 1 : 2;
}
+ //Last chunk
+ if($i!=$j)
+ $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j,$i-$j),0,0,'',0,$link);
+ }
function _putfonts()
{
- $nf = $this->n;
- foreach ($this->diffs as $diff) {
- //Encodings
- $this->_newobj();
- $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences [' . $diff . ']>>');
- $this->_out('endobj');
- }
+ $nf=$this->n;
+ foreach($this->diffs as $diff)
+ {
+ //Encodings
+ $this->_newobj();
+ $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
+ $this->_out('endobj');
+ }
- if (!check_php_version(5, 3)) {
- $mqr = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
- foreach ($this->FontFiles as $file => $info) {
- //Font file embedding
- $this->_newobj();
- $this->FontFiles[$file]['n'] = $this->n;
- if (defined('FPDF_FONTPATH'))
- $file = FPDF_FONTPATH . $file;
- $size = filesize($file);
- if (!$size)
- $this->Error('Font file not found');
- $this->_out('<</Length ' . $size);
- if (substr($file, -2) == '.z')
- $this->_out('/Filter /FlateDecode');
- $this->_out('/Length1 ' . $info['length1']);
- if (isset($info['length2']))
- $this->_out('/Length2 ' . $info['length2'] . ' /Length3 0');
+ if (!check_php_version(5,3)) {
+ $mqr=get_magic_quotes_runtime();
+ set_magic_quotes_runtime(0);
+ }
+ foreach($this->FontFiles as $file=>$info)
+ {
+ //Font file embedding
+ $this->_newobj();
+ $this->FontFiles[$file]['n']=$this->n;
+ if(defined('FPDF_FONTPATH'))
+ $file=FPDF_FONTPATH.$file;
+ $size=filesize($file);
+ if(!$size)
+ $this->Error('Font file not found');
+ $this->_out('<</Length '.$size);
+ if(substr($file,-2)=='.z')
+ $this->_out('/Filter /FlateDecode');
+ $this->_out('/Length1 '.$info['length1']);
+ if(isset($info['length2']))
+ $this->_out('/Length2 '.$info['length2'].' /Length3 0');
+ $this->_out('>>');
+ $f=fopen($file,'rb');
+ $this->_putstream(fread($f,$size));
+ fclose($f);
+ $this->_out('endobj');
+ }
+ if (!check_php_version(5,3)) {
+ set_magic_quotes_runtime($mqr);
+ }
+ foreach($this->fonts as $k=>$font)
+ {
+ //Font objects
+ $this->_newobj();
+ $this->fonts[$k]['n']=$this->n;
+ $this->_out('<</Type /Font');
+ if($font['type']=='Type0')
+ $this->_putType0($font);
+ else
+ {
+ $name=$font['name'];
+ $this->_out('/BaseFont /'.$name);
+ if($font['type']=='core')
+ {
+ //Standard font
+ $this->_out('/Subtype /Type1');
+ if($name!='Symbol' and $name!='ZapfDingbats')
+ $this->_out('/Encoding /WinAnsiEncoding');
+ }
+ else
+ {
+ //Additional font
+ $this->_out('/Subtype /'.$font['type']);
+ $this->_out('/FirstChar 32');
+ $this->_out('/LastChar 255');
+ $this->_out('/Widths '.($this->n+1).' 0 R');
+ $this->_out('/FontDescriptor '.($this->n+2).' 0 R');
+ if($font['enc'])
+ {
+ if(isset($font['diff']))
+ $this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
+ else
+ $this->_out('/Encoding /WinAnsiEncoding');
+ }
+ }
$this->_out('>>');
- $f = fopen($file, 'rb');
- $this->_putstream(fread($f, $size));
- fclose($f);
$this->_out('endobj');
- }
- if (!check_php_version(5, 3)) {
- set_magic_quotes_runtime($mqr);
- }
- foreach ($this->fonts as $k => $font) {
- //Font objects
- $this->_newobj();
- $this->fonts[$k]['n'] = $this->n;
- $this->_out('<</Type /Font');
- if ($font['type'] == 'Type0')
- $this->_putType0($font);
- else {
- $name = $font['name'];
- $this->_out('/BaseFont /' . $name);
- if ($font['type'] == 'core') {
- //Standard font
- $this->_out('/Subtype /Type1');
- if ($name != 'Symbol' and $name != 'ZapfDingbats')
- $this->_out('/Encoding /WinAnsiEncoding');
- } else {
- //Additional font
- $this->_out('/Subtype /' . $font['type']);
- $this->_out('/FirstChar 32');
- $this->_out('/LastChar 255');
- $this->_out('/Widths ' . ($this->n + 1) . ' 0 R');
- $this->_out('/FontDescriptor ' . ($this->n + 2) . ' 0 R');
- if ($font['enc']) {
- if (isset($font['diff']))
- $this->_out('/Encoding ' . ($nf + $font['diff']) . ' 0 R');
- else
- $this->_out('/Encoding /WinAnsiEncoding');
- }
- }
- $this->_out('>>');
+ if($font['type']!='core')
+ {
+ //Widths
+ $this->_newobj();
+ $cw=&$font['cw'];
+ $s='[';
+ for($i=32;$i<=255;$i++)
+ $s.=$cw[chr($i)].' ';
+ $this->_out($s.']');
$this->_out('endobj');
- if ($font['type'] != 'core') {
- //Widths
- $this->_newobj();
- $cw =& $font['cw'];
- $s = '[';
- for ($i = 32; $i <= 255; $i++)
- $s .= $cw[chr($i)] . ' ';
- $this->_out($s . ']');
- $this->_out('endobj');
- //Descriptor
- $this->_newobj();
- $s = '<</Type /FontDescriptor /FontName /' . $name;
- foreach ($font['desc'] as $k => $v)
- $s .= ' /' . $k . ' ' . $v;
- $file = $font['file'];
- if ($file)
- $s .= ' /FontFile' . ($font['type'] == 'Type1' ? '' : '2') . ' ' . $this->FontFiles[$file]['n'] . ' 0 R';
- $this->_out($s . '>>');
- $this->_out('endobj');
- }
+ //Descriptor
+ $this->_newobj();
+ $s='<</Type /FontDescriptor /FontName /'.$name;
+ foreach($font['desc'] as $k=>$v)
+ $s.=' /'.$k.' '.$v;
+ $file=$font['file'];
+ if($file)
+ $s.=' /FontFile'.($font['type']=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+ $this->_out($s.'>>');
+ $this->_out('endobj');
}
}
}
+ }
function _putType0($font)
{
- //Type0
- $this->_out('/Subtype /Type0');
- $this->_out('/BaseFont /' . $font['name'] . '-' . $font['CMap']);
- $this->_out('/Encoding /' . $font['CMap']);
- $this->_out('/DescendantFonts [' . ($this->n + 1) . ' 0 R]');
- $this->_out('>>');
- $this->_out('endobj');
- //CIDFont
- $this->_newobj();
- $this->_out('<</Type /Font');
- $this->_out('/Subtype /CIDFontType0');
- $this->_out('/BaseFont /' . $font['name']);
- $this->_out('/CIDSystemInfo <</Registry ' . $this->_textstring('Adobe') . ' /Ordering ' . $this->_textstring($font['registry']['ordering']) . ' /Supplement ' . $font['registry']['supplement'] . '>>');
- $this->_out('/FontDescriptor ' . ($this->n + 1) . ' 0 R');
- if ($font['CMap'] == 'ETen-B5-H')
- $W = '13648 13742 500';
- elseif ($font['CMap'] == 'GBK-EUC-H')
- $W = '814 907 500 7716 [500]'; else
- $W = '1 [' . implode(' ', $font['cw']) . ']';
- $this->_out('/W [' . $W . ']>>');
- $this->_out('endobj');
- //Font descriptor
- $this->_newobj();
- $this->_out('<</Type /FontDescriptor');
- $this->_out('/FontName /' . $font['name']);
- $this->_out('/Flags 6');
- $this->_out('/FontBBox [0 -200 1000 900]');
- $this->_out('/ItalicAngle 0');
- $this->_out('/Ascent 800');
- $this->_out('/Descent -200');
- $this->_out('/CapHeight 800');
- $this->_out('/StemV 50');
- $this->_out('>>');
- $this->_out('endobj');
+ //Type0
+ $this->_out('/Subtype /Type0');
+ $this->_out('/BaseFont /'.$font['name'].'-'.$font['CMap']);
+ $this->_out('/Encoding /'.$font['CMap']);
+ $this->_out('/DescendantFonts ['.($this->n+1).' 0 R]');
+ $this->_out('>>');
+ $this->_out('endobj');
+ //CIDFont
+ $this->_newobj();
+ $this->_out('<</Type /Font');
+ $this->_out('/Subtype /CIDFontType0');
+ $this->_out('/BaseFont /'.$font['name']);
+ $this->_out('/CIDSystemInfo <</Registry '.$this->_textstring('Adobe').' /Ordering '.$this->_textstring($font['registry']['ordering']).' /Supplement '.$font['registry']['supplement'].'>>');
+ $this->_out('/FontDescriptor '.($this->n+1).' 0 R');
+ if($font['CMap']=='ETen-B5-H')
+ $W='13648 13742 500';
+ elseif($font['CMap']=='GBK-EUC-H')
+ $W='814 907 500 7716 [500]';
+ else
+ $W='1 ['.implode(' ',$font['cw']).']';
+ $this->_out('/W ['.$W.']>>');
+ $this->_out('endobj');
+ //Font descriptor
+ $this->_newobj();
+ $this->_out('<</Type /FontDescriptor');
+ $this->_out('/FontName /'.$font['name']);
+ $this->_out('/Flags 6');
+ $this->_out('/FontBBox [0 -200 1000 900]');
+ $this->_out('/ItalicAngle 0');
+ $this->_out('/Ascent 800');
+ $this->_out('/Descent -200');
+ $this->_out('/CapHeight 800');
+ $this->_out('/StemV 50');
+ $this->_out('>>');
+ $this->_out('endobj');
}
}
@@ -422,3 +461,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
+?>
Modified: trunk/lib/font/courier.php
===================================================================
--- trunk/lib/fpdf/courier.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/courier.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,6 +1,8 @@
<?php
-for ($i = 0; $i <= 255; $i++)
- $fpdf_charwidths['courier'][chr($i)] = 600;
-$fpdf_charwidths['courierB'] = $fpdf_charwidths['courier'];
-$fpdf_charwidths['courierI'] = $fpdf_charwidths['courier'];
-$fpdf_charwidths['courierBI'] = $fpdf_charwidths['courier'];
+$type = 'Core';
+$name = 'Courier';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+ $cw[chr($i)] = 600;
+?>
Added: trunk/lib/font/courierb.php
===================================================================
--- trunk/lib/font/courierb.php (rev 0)
+++ trunk/lib/font/courierb.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-Bold';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+ $cw[chr($i)] = 600;
+?>
Added: trunk/lib/font/courierbi.php
===================================================================
--- trunk/lib/font/courierbi.php (rev 0)
+++ trunk/lib/font/courierbi.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-BoldOblique';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+ $cw[chr($i)] = 600;
+?>
Added: trunk/lib/font/courieri.php
===================================================================
--- trunk/lib/font/courieri.php (rev 0)
+++ trunk/lib/font/courieri.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-Oblique';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+ $cw[chr($i)] = 600;
+?>
Modified: trunk/lib/font/helvetica.php
===================================================================
--- trunk/lib/fpdf/helvetica.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/helvetica.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
<?php
-$fpdf_charwidths['helvetica'] = array(
- 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,
- ',' => 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,
- 'B' => 667, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 500, 'K' => 667, 'L' => 556, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
- 'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 278, '\\' => 278, ']' => 278, '^' => 469, '_' => 556, '`' => 333, 'a' => 556, 'b' => 556, 'c' => 500, 'd' => 556, 'e' => 556, 'f' => 278, 'g' => 556, 'h' => 556, 'i' => 222, 'j' => 222, 'k' => 500, 'l' => 222, 'm' => 833,
- 'n' => 556, 'o' => 556, 'p' => 556, 'q' => 556, 'r' => 333, 's' => 500, 't' => 278, 'u' => 556, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 500, '{' => 334, '|' => 260, '}' => 334, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 222, chr(131) => 556,
- chr(132) => 333, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 222, chr(146) => 222, chr(147) => 333, chr(148) => 333, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
- chr(154) => 500, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 260, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
- 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(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);
+$type = 'Core';
+$name = 'Helvetica';
+$up = -100;
+$ut = 50;
+$cw = array(
+ 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,
+ ','=>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,
+ 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+ 'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+ 'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+ chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+ 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(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);
+?>
Modified: trunk/lib/font/helveticab.php
===================================================================
--- trunk/lib/fpdf/helveticab.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/helveticab.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
<?php
-$fpdf_charwidths['helveticaB'] = array(
- 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,
- ',' => 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,
- 'B' => 722, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 556, 'K' => 722, 'L' => 611, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
- 'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 584, '_' => 556, '`' => 333, 'a' => 556, 'b' => 611, 'c' => 556, 'd' => 611, 'e' => 556, 'f' => 333, 'g' => 611, 'h' => 611, 'i' => 278, 'j' => 278, 'k' => 556, 'l' => 278, 'm' => 889,
- 'n' => 611, 'o' => 611, 'p' => 611, 'q' => 611, 'r' => 389, 's' => 556, 't' => 333, 'u' => 611, 'v' => 556, 'w' => 778, 'x' => 556, 'y' => 556, 'z' => 500, '{' => 389, '|' => 280, '}' => 389, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 278, chr(131) => 556,
- chr(132) => 500, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 278, chr(146) => 278, chr(147) => 500, chr(148) => 500, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
- chr(154) => 556, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 280, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
- 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(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);
+$type = 'Core';
+$name = 'Helvetica-Bold';
+$up = -100;
+$ut = 50;
+$cw = array(
+ 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,
+ ','=>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,
+ 'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+ 'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+ 'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+ 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(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);
+?>
Modified: trunk/lib/font/helveticabi.php
===================================================================
--- trunk/lib/fpdf/helveticabi.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/helveticabi.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
<?php
-$fpdf_charwidths['helveticaBI'] = array(
- 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,
- ',' => 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,
- 'B' => 722, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 556, 'K' => 722, 'L' => 611, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
- 'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 584, '_' => 556, '`' => 333, 'a' => 556, 'b' => 611, 'c' => 556, 'd' => 611, 'e' => 556, 'f' => 333, 'g' => 611, 'h' => 611, 'i' => 278, 'j' => 278, 'k' => 556, 'l' => 278, 'm' => 889,
- 'n' => 611, 'o' => 611, 'p' => 611, 'q' => 611, 'r' => 389, 's' => 556, 't' => 333, 'u' => 611, 'v' => 556, 'w' => 778, 'x' => 556, 'y' => 556, 'z' => 500, '{' => 389, '|' => 280, '}' => 389, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 278, chr(131) => 556,
- chr(132) => 500, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 278, chr(146) => 278, chr(147) => 500, chr(148) => 500, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
- chr(154) => 556, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 280, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
- 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(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);
+$type = 'Core';
+$name = 'Helvetica-BoldOblique';
+$up = -100;
+$ut = 50;
+$cw = array(
+ 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,
+ ','=>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,
+ 'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+ 'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+ 'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+ 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(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);
+?>
Modified: trunk/lib/font/helveticai.php
===================================================================
--- trunk/lib/fpdf/helveticai.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/helveticai.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
<?php
-$fpdf_charwidths['helveticaI'] = array(
- 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,
- ',' => 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,
- 'B' => 667, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 500, 'K' => 667, 'L' => 556, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
- 'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 278, '\\' => 278, ']' => 278, '^' => 469, '_' => 556, '`' => 333, 'a' => 556, 'b' => 556, 'c' => 500, 'd' => 556, 'e' => 556, 'f' => 278, 'g' => 556, 'h' => 556, 'i' => 222, 'j' => 222, 'k' => 500, 'l' => 222, 'm' => 833,
- 'n' => 556, 'o' => 556, 'p' => 556, 'q' => 556, 'r' => 333, 's' => 500, 't' => 278, 'u' => 556, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 500, '{' => 334, '|' => 260, '}' => 334, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 222, chr(131) => 556,
- chr(132) => 333, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 222, chr(146) => 222, chr(147) => 333, chr(148) => 333, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
- chr(154) => 500, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 260, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
- 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(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);
+$type = 'Core';
+$name = 'Helvetica-Oblique';
+$up = -100;
+$ut = 50;
+$cw = array(
+ 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,
+ ','=>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,
+ 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+ 'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+ 'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+ chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+ 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(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);
+?>
Modified: trunk/lib/font/japanese.php
===================================================================
--- trunk/lib/fpdf/japanese.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/japanese.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,66 +1,67 @@
-<?php
+<?php // -*-php-*-
+// $Id: japanese.php 7956 2011-03-03 17:08:31Z vargenau $
+
// PDF functions taken from FPDF http://www.fpdf.org
-require_once 'lib/pdf.php';
+require_once('lib/pdf.php');
-class PDF_Japanese extends PDF
-{
+class PDF_Japanese extends PDF {
var $B;
var $I;
var $U;
var $HREF;
- var $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,
- '<' => 529, '=' => 529, '>' => 529, '?' => 486, '@' => 744, 'A' => 646, 'B' => 604, 'C' => 617, 'D' => 681, 'E' => 567,
- 'F' => 537, 'G' => 647, 'H' => 738, 'I' => 320, 'J' => 433, 'K' => 637, 'L' => 566, 'M' => 904, 'N' => 710, 'O' => 716,
- 'P' => 605, 'Q' => 716, 'R' => 623, 'S' => 517, 'T' => 601, 'U' => 690, 'V' => 668, 'W' => 990, 'X' => 681, 'Y' => 634,
- 'Z' => 578, '[' => 316, '\\' => 614, ']' => 316, '^' => 529, '_' => 500, '`' => 387, 'a' => 509, 'b' => 566, 'c' => 478,
- 'd' => 565, 'e' => 503, 'f' => 337, 'g' => 549, 'h' => 580, 'i' => 275, 'j' => 266, 'k' => 544, 'l' => 276, 'm' => 854,
- '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);
+ var $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,
+ '<'=>529,'='=>529,'>'=>529,'?'=>486,'@'=>744,'A'=>646,'B'=>604,'C'=>617,'D'=>681,'E'=>567,
+ 'F'=>537,'G'=>647,'H'=>738,'I'=>320,'J'=>433,'K'=>637,'L'=>566,'M'=>904,'N'=>710,'O'=>716,
+ 'P'=>605,'Q'=>716,'R'=>623,'S'=>517,'T'=>601,'U'=>690,'V'=>668,'W'=>990,'X'=>681,'Y'=>634,
+ 'Z'=>578,'['=>316,'\\'=>614,']'=>316,'^'=>529,'_'=>500,'`'=>387,'a'=>509,'b'=>566,'c'=>478,
+ 'd'=>565,'e'=>503,'f'=>337,'g'=>549,'h'=>580,'i'=>275,'j'=>266,'k'=>544,'l'=>276,'m'=>854,
+ '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);
- function AddCIDFont($family, $style, $name, $cw, $CMap, $registry)
+ function AddCIDFont($family,$style,$name,$cw,$CMap,$registry)
{
- $fontkey = strtolower($family) . strtoupper($style);
- if (isset($this->fonts[$fontkey]))
+ $fontkey=strtolower($family).strtoupper($style);
+ if(isset($this->fonts[$fontkey]))
$this->Error("CID font already added: $family $style");
- $i = count($this->fonts) + 1;
- $this->fonts[$fontkey] = array('i' => $i, 'type' => 'Type0', 'name' => $name, 'up' => -120, 'ut' => 40, 'cw' => $cw, 'CMap' => $CMap, 'registry' => $registry);
+ $i=count($this->fonts)+1;
+ $this->fonts[$fontkey]=array('i'=>$i,'type'=>'Type0','name'=>$name,'up'=>-120,'ut'=>40,'cw'=>$cw,'CMap'=>$CMap,'registry'=>$registry);
}
- function AddCIDFonts($family, $name, $cw, $CMap, $registry)
+ function AddCIDFonts($family,$name,$cw,$CMap,$registry)
{
- $this->AddCIDFont($family, '', $name, $cw, $CMap, $registry);
- $this->AddCIDFont($family, 'B', $name . ',Bold', $cw, $CMap, $registry);
- $this->AddCIDFont($family, 'I', $name . ',Italic', $cw, $CMap, $registry);
- $this->AddCIDFont($family, 'BI', $name . ',BoldItalic', $cw, $CMap, $registry);
+ $this->AddCIDFont($family,'',$name,$cw,$CMap,$registry);
+ $this->AddCIDFont($family,'B',$name.',Bold',$cw,$CMap,$registry);
+ $this->AddCIDFont($family,'I',$name.',Italic',$cw,$CMap,$registry);
+ $this->AddCIDFont($family,'BI',$name.',BoldItalic',$cw,$CMap,$registry);
}
- function AddSJISFont($family = 'SJIS')
+ function AddSJISFont($family='SJIS')
{
//Add SJIS font with proportional Latin
- $name = 'KozMinPro-Regular-Acro';
- $cw = $this->SJIS_widths;
- $CMap = '90msp-RKSJ-H';
- $registry = array('ordering' => 'Japan1', 'supplement' => 2);
- $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+ $name='KozMinPro-Regular-Acro';
+ $cw=$this->SJIS_widths;
+ $CMap='90msp-RKSJ-H';
+ $registry=array('ordering'=>'Japan1','supplement'=>2);
+ $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
}
- function AddSJIShwFont($family = 'SJIS-hw')
+ function AddSJIShwFont($family='SJIS-hw')
{
//Add SJIS font with half-width Latin
- $name = 'KozMinPro-Regular-Acro';
- for ($i = 32; $i <= 126; $i++)
- $cw[chr($i)] = 500;
- $CMap = '90ms-RKSJ-H';
- $registry = array('ordering' => 'Japan1', 'supplement' => 2);
- $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+ $name='KozMinPro-Regular-Acro';
+ for($i=32;$i<=126;$i++)
+ $cw[chr($i)]=500;
+ $CMap='90ms-RKSJ-H';
+ $registry=array('ordering'=>'Japan1','supplement'=>2);
+ $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
}
function GetStringWidth($s)
{
- if ($this->CurrentFont['type'] == 'Type0')
+ if($this->CurrentFont['type']=='Type0')
return $this->GetSJISStringWidth($s);
else
return parent::GetStringWidth($s);
@@ -69,314 +70,315 @@
function GetSJISStringWidth($s)
{
//SJIS version of GetStringWidth()
- $l = 0;
- $cw =& $this->CurrentFont['cw'];
- $nb = strlen($s);
- $i = 0;
- while ($i < $nb) {
- $o = ord($s{$i});
- if ($o < 128) {
+ $l=0;
+ $cw=&$this->CurrentFont['cw'];
+ $nb=strlen($s);
+ $i=0;
+ while($i<$nb) {
+ $o=ord($s{$i});
+ if($o<128) {
//ASCII
- $l += $cw[$s{$i}];
+ $l+=$cw[$s{$i}];
$i++;
- } elseif ($o >= 161 and $o <= 223) {
+ }
+ elseif($o>=161 and $o<=223) {
//Half-width katakana
- $l += 500;
+ $l+=500;
$i++;
} else {
//Full-width character
- $l += 1000;
- $i += 2;
+ $l+=1000;
+ $i+=2;
}
}
- return $l * $this->FontSize / 1000;
+ return $l*$this->FontSize/1000;
}
- function MultiCell($w, $h, $txt, $border = 0, $align = 'L', $fill = 0)
+ function MultiCell($w,$h,$txt,$border=0,$align='L',$fill=0)
{
- if ($this->CurrentFont['type'] == 'Type0')
- $this->SJISMultiCell($w, $h, $txt, $border, $align, $fill);
+ if($this->CurrentFont['type']=='Type0')
+ $this->SJISMultiCell($w,$h,$txt,$border,$align,$fill);
else
- parent::MultiCell($w, $h, $txt, $border, $align, $fill);
+ parent::MultiCell($w,$h,$txt,$border,$align,$fill);
}
- function SJISMultiCell($w, $h, $txt, $border = 0, $align = 'L', $fill = 0)
+ function SJISMultiCell($w,$h,$txt,$border=0,$align='L',$fill=0)
{
//Output text with automatic or explicit line breaks
- $cw =& $this->CurrentFont['cw'];
- if ($w == 0)
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
- $s = str_replace("\r", '', $txt);
- $nb = strlen($s);
- if ($nb > 0 and $s{$nb - 1} == "\n")
+ $cw=&$this->CurrentFont['cw'];
+ if($w==0)
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+ $s=str_replace("\r",'',$txt);
+ $nb=strlen($s);
+ if($nb>0 and $s{$nb-1}=="\n")
$nb--;
- $b = 0;
- if ($border) {
- if ($border == 1) {
- $border = 'LTRB';
- $b = 'LRT';
- $b2 = 'LR';
+ $b=0;
+ if($border) {
+ if($border==1) {
+ $border='LTRB';
+ $b='LRT';
+ $b2='LR';
} else {
- $b2 = '';
- if (is_int(strpos($border, 'L')))
- $b2 .= 'L';
- if (is_int(strpos($border, 'R')))
- $b2 .= 'R';
- $b = is_int(strpos($border, 'T')) ? $b2 . 'T' : $b2;
+ $b2='';
+ if(is_int(strpos($border,'L')))
+ $b2.='L';
+ if(is_int(strpos($border,'R')))
+ $b2.='R';
+ $b=is_int(strpos($border,'T')) ? $b2.'T' : $b2;
}
}
- $sep = -1;
- $i = 0;
- $j = 0;
- $l = 0;
- $nl = 1;
- while ($i < $nb) {
+ $sep=-1;
+ $i=0;
+ $j=0;
+ $l=0;
+ $nl=1;
+ while($i<$nb) {
//Get next character
- $c = $s{$i};
- $o = ord($c);
- if ($o == 10) {
+ $c=$s{$i};
+ $o=ord($c);
+ if($o==10) {
//Explicit line break
- $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
$i++;
- $sep = -1;
- $j = $i;
- $l = 0;
+ $sep=-1;
+ $j=$i;
+ $l=0;
$nl++;
- if ($border and $nl == 2)
- $b = $b2;
+ if($border and $nl==2)
+ $b=$b2;
continue;
}
- if ($o < 128) {
+ if($o<128) {
//ASCII
- $l += $cw[$c];
- $n = 1;
- if ($o == 32)
- $sep = $i;
- } elseif ($o >= 161 and $o <= 223) {
+ $l+=$cw[$c];
+ $n=1;
+ if($o==32)
+ $sep=$i;
+ } elseif($o>=161 and $o<=223) {
//Half-width katakana
- $l += 500;
- $n = 1;
- $sep = $i;
+ $l+=500;
+ $n=1;
+ $sep=$i;
} else {
//Full-width character
- $l += 1000;
- $n = 2;
- $sep = $i;
+ $l+=1000;
+ $n=2;
+ $sep=$i;
}
- if ($l > $wmax) {
+ if($l>$wmax) {
//Automatic line break
- if ($sep == -1 or $i == $j) {
- if ($i == $j)
- $i += $n;
- $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
+ if($sep==-1 or $i==$j) {
+ if($i==$j)
+ $i+=$n;
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
} else {
- $this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);
- $i = ($s[$sep] == ' ') ? $sep + 1 : $sep;
+ $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
+ $i=($s[$sep]==' ') ? $sep+1 : $sep;
}
- $sep = -1;
- $j = $i;
- $l = 0;
+ $sep=-1;
+ $j=$i;
+ $l=0;
$nl++;
- if ($border and $nl == 2)
- $b = $b2;
+ if($border and $nl==2)
+ $b=$b2;
} else {
- $i += $n;
- if ($o >= 128)
- $sep = $i;
+ $i+=$n;
+ if($o>=128)
+ $sep=$i;
}
}
- //Last chunk
- if ($border and is_int(strpos($border, 'B')))
- $b .= 'B';
- $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
- $this->x = $this->lMargin;
+ //Last chunk
+ if($border and is_int(strpos($border,'B')))
+ $b.='B';
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+ $this->x=$this->lMargin;
}
- function Write($h, $txt, $link = '')
+ function Write($h,$txt,$link='')
{
- if ($this->CurrentFont['type'] == 'Type0')
- $this->SJISWrite($h, $txt, $link);
- else
- parent::Write($h, $txt, $link);
+ if($this->CurrentFont['type']=='Type0')
+ $this->SJISWrite($h,$txt,$link);
+ else
+ parent::Write($h,$txt,$link);
}
- function SJISWrite($h, $txt, $link)
+ function SJISWrite($h,$txt,$link)
{
- //SJIS version of Write()
- $cw =& $this->CurrentFont['cw'];
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
- $s = str_replace("\r", '', $txt);
- $nb = strlen($s);
- $sep = -1;
- $i = 0;
- $j = 0;
- $l = 0;
- $nl = 1;
- while ($i < $nb) {
+ //SJIS version of Write()
+ $cw=&$this->CurrentFont['cw'];
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+ $s=str_replace("\r",'',$txt);
+ $nb=strlen($s);
+ $sep=-1;
+ $i=0;
+ $j=0;
+ $l=0;
+ $nl=1;
+ while($i<$nb) {
//Get next character
- $c = $s{$i};
- $o = ord($c);
- if ($o == 10) {
+ $c=$s{$i};
+ $o=ord($c);
+ if($o==10) {
//Explicit line break
- $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
+ $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
$i++;
- $sep = -1;
- $j = $i;
- $l = 0;
- if ($nl == 1) {
+ $sep=-1;
+ $j=$i;
+ $l=0;
+ if($nl==1) {
//Go to left margin
- $this->x = $this->lMargin;
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+ $this->x=$this->lMargin;
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
}
$nl++;
continue;
}
- if ($o < 128) {
+ if($o<128) {
//ASCII
- $l += $cw[$c];
- $n = 1;
- if ($o == 32)
- $sep = $i;
- } elseif ($o >= 161 and $o <= 223) {
+ $l+=$cw[$c];
+ $n=1;
+ if($o==32)
+ $sep=$i;
+ } elseif($o>=161 and $o<=223) {
//Half-width katakana
- $l += 500;
- $n = 1;
- $sep = $i;
+ $l+=500;
+ $n=1;
+ $sep=$i;
} else {
//Full-width character
- $l += 1000;
- $n = 2;
- $sep = $i;
+ $l+=1000;
+ $n=2;
+ $sep=$i;
}
- if ($l > $wmax) {
+ if($l>$wmax) {
//Automatic line break
- if ($sep == -1 or $i == $j) {
- if ($this->x > $this->lMargin) {
+ if($sep==-1 or $i==$j) {
+ if($this->x>$this->lMargin) {
//Move to next line
- $this->x = $this->lMargin;
- $this->y += $h;
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
- $i += $n;
+ $this->x=$this->lMargin;
+ $this->y+=$h;
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+ $i+=$n;
$nl++;
continue;
}
- if ($i == $j)
- $i += $n;
- $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
+ if($i==$j)
+ $i+=$n;
+ $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
} else {
- $this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', 0, $link);
- $i = ($s[$sep] == ' ') ? $sep + 1 : $sep;
+ $this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);
+ $i=($s[$sep]==' ') ? $sep+1 : $sep;
}
- $sep = -1;
- $j = $i;
- $l = 0;
- if ($nl == 1) {
- $this->x = $this->lMargin;
- $w = $this->w - $this->rMargin - $this->x;
- $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+ $sep=-1;
+ $j=$i;
+ $l=0;
+ if($nl==1) {
+ $this->x=$this->lMargin;
+ $w=$this->w-$this->rMargin-$this->x;
+ $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
}
$nl++;
} else {
- $i += $n;
- if ($o >= 128)
- $sep = $i;
+ $i+=$n;
+ if($o>=128)
+ $sep=$i;
}
}
- //Last chunk
- if ($i != $j)
- $this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j, $i - $j), 0, 0, '', 0, $link);
+ //Last chunk
+ if($i!=$j)
+ $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j,$i-$j),0,0,'',0,$link);
}
function _putfonts()
{
- $nf = $this->n;
- foreach ($this->diffs as $diff) {
+ $nf=$this->n;
+ foreach($this->diffs as $diff) {
//Encodings
$this->_newobj();
- $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences [' . $diff . ']>>');
+ $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
$this->_out('endobj');
}
- if (!check_php_version(5, 3)) {
- $mqr = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
- }
- foreach ($this->FontFiles as $file => $info) {
+ if (!check_php_version(5,3)) {
+ $mqr=get_magic_quotes_runtime();
+ set_magic_quotes_runtime(0);
+ }
+ foreach($this->FontFiles as $file=>$info) {
//Font file embedding
$this->_newobj();
- $this->FontFiles[$file]['n'] = $this->n;
- if (defined('FPDF_FONTPATH'))
- $file = FPDF_FONTPATH . $file;
- $size = filesize($file);
- if (!$size)
+ $this->FontFiles[$file]['n']=$this->n;
+ if(defined('FPDF_FONTPATH'))
+ $file=FPDF_FONTPATH.$file;
+ $size=filesize($file);
+ if(!$size)
$this->Error('Font file not found');
- $this->_out('<</Length ' . $size);
- if (substr($file, -2) == '.z')
+ $this->_out('<</Length '.$size);
+ if(substr($file,-2)=='.z')
$this->_out('/Filter /FlateDecode');
- $this->_out('/Length1 ' . $info['length1']);
- if (isset($info['length2']))
- $this->_out('/Length2 ' . $info['length2'] . ' /Length3 0');
+ $this->_out('/Length1 '.$info['length1']);
+ if(isset($info['length2']))
+ $this->_out('/Length2 '.$info['length2'].' /Length3 0');
$this->_out('>>');
- $f = fopen($file, 'rb');
- $this->_putstream(fread($f, $size));
+ $f=fopen($file,'rb');
+ $this->_putstream(fread($f,$size));
fclose($f);
$this->_out('endobj');
}
- if (!check_php_version(5, 3)) {
- set_magic_quotes_runtime($mqr);
- }
- foreach ($this->fonts as $k => $font) {
+ if (!check_php_version(5,3)) {
+ set_magic_quotes_runtime($mqr);
+ }
+ foreach($this->fonts as $k=>$font) {
//Font objects
$this->_newobj();
- $this->fonts[$k]['n'] = $this->n;
+ $this->fonts[$k]['n']=$this->n;
$this->_out('<</Type /Font');
- if ($font['type'] == 'Type0')
+ if($font['type']=='Type0')
$this->_putType0($font);
else {
- $name = $font['name'];
- $this->_out('/BaseFont /' . $name);
- if ($font['type'] == 'core') {
+ $name=$font['name'];
+ $this->_out('/BaseFont /'.$name);
+ if($font['type']=='core') {
//Standard font
$this->_out('/Subtype /Type1');
- if ($name != 'Symbol' and $name != 'ZapfDingbats')
+ if($name!='Symbol' and $name!='ZapfDingbats')
$this->_out('/Encoding /WinAnsiEncoding');
} else {
//Additional font
- $this->_out('/Subtype /' . $font['type']);
+ $this->_out('/Subtype /'.$font['type']);
$this->_out('/FirstChar 32');
$this->_out('/LastChar 255');
- $this->_out('/Widths ' . ($this->n + 1) . ' 0 R');
- $this->_out('/FontDescriptor ' . ($this->n + 2) . ' 0 R');
- if ($font['enc']) {
- if (isset($font['diff']))
- $this->_out('/Encoding ' . ($nf + $font['diff']) . ' 0 R');
+ $this->_out('/Widths '.($this->n+1).' 0 R');
+ $this->_out('/FontDescriptor '.($this->n+2).' 0 R');
+ if($font['enc']) {
+ if(isset($font['diff']))
+ $this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
else
$this->_out('/Encoding /WinAnsiEncoding');
}
}
$this->_out('>>');
$this->_out('endobj');
- if ($font['type'] != 'core') {
+ if($font['type']!='core') {
//Widths
$this->_newobj();
- $cw =& $font['cw'];
- $s = '[';
- for ($i = 32; $i <= 255; $i++)
- $s .= $cw[chr($i)] . ' ';
- $this->_out($s . ']');
+ $cw=&$font['cw'];
+ $s='[';
+ for($i=32;$i<=255;$i++)
+ $s.=$cw[chr($i)].' ';
+ $this->_out($s.']');
$this->_out('endobj');
//Descriptor
$this->_newobj();
- $s = '<</Type /FontDescriptor /FontName /' . $name;
- foreach ($font['desc'] as $k => $v)
- $s .= ' /' . $k . ' ' . $v;
- $file = $font['file'];
- if ($file)
- $s .= ' /FontFile' . ($font['type'] == 'Type1' ? '' : '2') . ' ' . $this->FontFiles[$file]['n'] . ' 0 R';
- $this->_out($s . '>>');
+ $s='<</Type /FontDescriptor /FontName /'.$name;
+ foreach($font['desc'] as $k=>$v)
+ $s.=' /'.$k.' '.$v;
+ $file=$font['file'];
+ if($file)
+ $s.=' /FontFile'.($font['type']=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+ $this->_out($s.'>>');
$this->_out('endobj');
}
}
@@ -385,39 +387,39 @@
function _putType0($font)
{
- //Type0
- $this->_out('/Subtype /Type0');
- $this->_out('/BaseFont /' . $font['name'] . '-' . $font['CMap']);
- $this->_out('/Encoding /' . $font['CMap']);
- $this->_out('/DescendantFonts [' . ($this->n + 1) . ' 0 R]');
- $this->_out('>>');
- $this->_out('endobj');
- //CIDFont
- $this->_newobj();
- $this->_out('<</Type /Font');
- $this->_out('/Subtype /CIDFontType0');
- $this->_out('/BaseFont /' . $font['name']);
- $this->_out('/CIDSystemInfo <</Registry (Adobe) /Ordering (' . $font['registry']['ordering'] . ') /Supplement ' . $font['registry']['supplement'] . '>>');
- $this->_out('/FontDescriptor ' . ($this->n + 1) . ' 0 R');
- $W = '/W [1 [';
- foreach ($font['cw'] as $w)
- $W .= $w . ' ';
- $this->_out($W . '] 231 325 500 631 [500] 326 389 500]');
- $this->_out('>>');
- $this->_out('endobj');
- //Font descriptor
- $this->_newobj();
- $this->_out('<</Type /FontDescriptor');
- $this->_out('/FontName /' . $font['name']);
- $this->_out('/Flags 6');
- $this->_out('/FontBBox [0 -200 1000 900]');
- $this->_out('/ItalicAngle 0');
- $this->_out('/Ascent 800');
- $this->_out('/Descent -200');
- $this->_out('/CapHeight 800');
- $this->_out('/StemV 60');
- $this->_out('>>');
- $this->_out('endobj');
+ //Type0
+ $this->_out('/Subtype /Type0');
+ $this->_out('/BaseFont /'.$font['name'].'-'.$font['CMap']);
+ $this->_out('/Encoding /'.$font['CMap']);
+ $this->_out('/DescendantFonts ['.($this->n+1).' 0 R]');
+ $this->_out('>>');
+ $this->_out('endobj');
+ //CIDFont
+ $this->_newobj();
+ $this->_out('<</Type /Font');
+ $this->_out('/Subtype /CIDFontType0');
+ $this->_out('/BaseFont /'.$font['name']);
+ $this->_out('/CIDSystemInfo <</Registry (Adobe) /Ordering ('.$font['registry']['ordering'].') /Supplement '.$font['registry']['supplement'].'>>');
+ $this->_out('/FontDescriptor '.($this->n+1).' 0 R');
+ $W='/W [1 [';
+ foreach($font['cw'] as $w)
+ $W.=$w.' ';
+ $this->_out($W.'] 231 325 500 631 [500] 326 389 500]');
+ $this->_out('>>');
+ $this->_out('endobj');
+ //Font descriptor
+ $this->_newobj();
+ $this->_out('<</Type /FontDescriptor');
+ $this->_out('/FontName /'.$font['name']);
+ $this->_out('/Flags 6');
+ $this->_out('/FontBBox [0 -200 1000 900]');
+ $this->_out('/ItalicAngle 0');
+ $this->_out('/Ascent 800');
+ $this->_out('/Descent -200');
+ $this->_out('/CapHeight 800');
+ $this->_out('/StemV 60');
+ $this->_out('>>');
+ $this->_out('endobj');
}
}
@@ -428,3 +430,4 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
+?>
Modified: trunk/lib/font/symbol.php
===================================================================
--- trunk/lib/fpdf/symbol.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/symbol.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
<?php
-$fpdf_charwidths['symbol'] = array(
- 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,
- ',' => 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,
- 'B' => 667, 'C' => 722, 'D' => 612, 'E' => 611, 'F' => 763, 'G' => 603, 'H' => 722, 'I' => 333, 'J' => 631, 'K' => 722, 'L' => 686, 'M' => 889, 'N' => 722, 'O' => 722, 'P' => 768, 'Q' => 741, 'R' => 556, 'S' => 592, 'T' => 611, 'U' => 690, 'V' => 439, 'W' => 768,
- 'X' => 645, 'Y' => 795, 'Z' => 611, '[' => 333, '\\' => 863, ']' => 333, '^' => 658, '_' => 500, '`' => 500, 'a' => 631, 'b' => 549, 'c' => 549, 'd' => 494, 'e' => 439, 'f' => 521, 'g' => 411, 'h' => 603, 'i' => 329, 'j' => 603, 'k' => 549, 'l' => 549, 'm' => 576,
- 'n' => 521, 'o' => 549, 'p' => 549, 'q' => 521, 'r' => 549, 's' => 603, 't' => 439, 'u' => 576, 'v' => 713, 'w' => 686, 'x' => 493, 'y' => 686, 'z' => 494, '{' => 480, '|' => 200, '}' => 480, '~' => 549, chr(127) => 0, chr(128) => 0, chr(129) => 0, chr(130) => 0, chr(131) => 0,
- chr(132) => 0, chr(133) => 0, chr(134) => 0, chr(135) => 0, chr(136) => 0, chr(137) => 0, chr(138) => 0, chr(139) => 0, chr(140) => 0, chr(141) => 0, chr(142) => 0, chr(143) => 0, chr(144) => 0, chr(145) => 0, chr(146) => 0, chr(147) => 0, chr(148) => 0, chr(149) => 0, chr(150) => 0, chr(151) => 0, chr(152) => 0, chr(153) => 0,
- chr(154) => 0, chr(155) => 0, chr(156) => 0, chr(157) => 0, chr(158) => 0, chr(159) => 0, chr(160) => 750, chr(161) => 620, chr(162) => 247, chr(163) => 549, chr(164) => 167, chr(165) => 713, chr(166) => 500, chr(167) => 753, chr(168) => 753, chr(169) => 753, chr(170) => 753, chr(171) => 1042, chr(172) => 987, chr(173) => 603, chr(174) => 987, chr(175) => 603,
- 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(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);
+$type = 'Core';
+$name = 'Symbol';
+$up = -100;
+$ut = 50;
+$cw = array(
+ 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,
+ ','=>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,
+ 'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
+ 'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
+ 'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
+ chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+ chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
+ 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(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);
+?>
Modified: trunk/lib/font/times.php
===================================================================
--- trunk/lib/fpdf/times.php 2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/times.php 2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
<?php
-$fpdf_charwidths['times'] = array(
- 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,
- ',' => 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,
- 'B' => 667, 'C' => 667, 'D' => 722, 'E' => 611, 'F' => 556, 'G' => 722, 'H' => 722, 'I' => 333, 'J' => 389, 'K' => 722, 'L' => 611, 'M' => 889, 'N' => 722, 'O' => 722, 'P' => 556, 'Q' => 722, 'R' => 667, 'S' => 556, 'T' => 611, 'U' => 722, 'V' => 722, 'W' => 944,
- 'X' => 722, 'Y' => 722, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 469, '_' => 500, '`' => 333, 'a' => 444, 'b' => 500, 'c' => 444, 'd' => 500, 'e' => 444, 'f' => 333, 'g' => 500, 'h' => 500, 'i' => 278, 'j' => 278, 'k' => 500, 'l' => 278, 'm' => 778,
- 'n' => 500, 'o' => 500, 'p' => 500, 'q' => 500, 'r' => 333, 's' => 389, 't' => 278, 'u' => 500, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 444, '{' => 480, '|' => 200, '}' => 480, '~' => 541, chr(127) => 350, chr(128) => 500, chr(129) => 350, chr(130) => 333, chr(131) => 500,
- chr(132) => 444, chr(133) => 1000, chr(134) => 500, chr(135) => 500, chr(136) => 333, chr(137) => 1000, chr(138) => 556, chr(139) => 333, chr(140) => 889, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 333, chr(146) => 333, chr(147) => 444, chr(148) => 444, chr(149) => 350, chr(150) => 500, chr(151) => 1000, chr(152) => 333, chr(153) => 980,
- chr(154) => 389, chr(155) => 333, chr(156) => 722, chr(157) => 350, chr(158) => 444, chr(159) => 722, chr(160) => 250, chr(161) => 333, chr(162) => 500, chr(163) => 500, chr(164) => 500, chr(165) => 500, chr(166) => 200, chr(167) => 500, chr(168) => 333, chr(169) => 760, chr(170) => 276, chr(171) => 500, chr(172) => 564, chr(173) => 333, chr(174) => 760, chr(175) => 333,
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|