Changeset 18609 for tmp/version-2_5-test/data/pdf

Timestamp:

2010/03/11 10:35:11 (16 years ago)

Author:

kajiwara

Message:

正式版にナイトリービルド版をマージしてみるテスト

Location:

tmp/version-2_5-test/data/pdf

Files:

• fpdf.php (modified) (2 diffs)
• fpdi.php (modified) (1 diff)
• japanese.php (modified) (8 diffs)

tmp/version-2_5-test/data/pdf/fpdf.php

@@ -1031 +1031 @@
             {
                 //We send to a browser
+                if(isset($_SERVER['HTTP_USER_AGENT']) and strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) { header('Pragma:'); }
                 header('Content-Type: application/pdf');
                 if(headers_sent())
@@ -1043 +1044 @@
             if(ob_get_contents())
                 $this->Error('Some data has already been output, can\'t send PDF file');
-            if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'MSIE'))
+            if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) {
+                header('Pragma:');
                 header('Content-Type: application/force-download');
+            }
             else
                 header('Content-Type: application/octet-stream');

tmp/version-2_5-test/data/pdf/fpdi.php

@@ -461 +461 @@
 
 // for PHP5
-if (!class_exists('fpdi')) {
-    class fpdi extends FPDI {}
+if (version_compare("5", PHP_VERSION, "<")) {
+    if (!class_exists('fpdi')) {
+        class fpdi extends FPDI {}
+    }
 }
 ?>

tmp/version-2_5-test/data/pdf/japanese.php

@@ -1 +1 @@
 <?php
-require('fpdf.php');
 require('fpdi.php');
 
@@ -14 +13 @@
     'x'=>503,'y'=>529,'z'=>453,'{'=>326,'|'=>380,'}'=>326,'~'=>387);
 
-//class PDF_Japanese extends FPDF
-class PDF_Japanese extends FPDI //変更
+class PDF_Japanese extends FPDI
 {
 function AddCIDFont($family,$style,$name,$cw,$CMap,$registry)
@@ -38 +36 @@
     //Add SJIS font with proportional Latin
     $name='KozMinPro-Regular-Acro';
-    //$name='Gothic'; // 変更
+    //$name='Gothic'; // •ÏX
     $cw=$GLOBALS['SJIS_widths'];
     $CMap='90msp-RKSJ-H';
@@ -139 +137 @@
     $l=0;
     $nl=1;
-    $this->rise_h = 0; //高さ計算用
+    $this->rise_h = 0; //‚‚³ŒvŽZ—p
 
     while($i<$nb)
@@ -155 +153 @@
             $l=0;
             $nl++;
-            $this->rise_h += $h; //高さ計算用
+            $this->rise_h += $h; //‚‚³ŒvŽZ—p
             if($border and $nl==2)
                 $b=$b2;
@@ -196 +194 @@
                 $i=($s[$sep]==' ') ? $sep+1 : $sep;
             }
-            $this->rise_h += $h; //高さ計算用
+            $this->rise_h += $h; //‚‚³ŒvŽZ—p
             $sep=-1;
             $j=$i;
@@ -215 +213 @@
         $b.='B';
     $this->Cell($w,$h,substr($s,$j,$i-$j),$b,$ln,$align,$fill);
-    $this->rise_h += $h; //増加分の高さを計算
-    //改行なし設定かつ、高さが規定の高さ以上であればY軸を設定しなおす。
+    $this->rise_h += $h; //‘‰Á•ª‚̍‚‚³‚ðŒvŽZ
+    //‰üs‚È‚µÝ’è‚©‚A‚‚³‚ª‹K’è‚̍‚‚³ˆÈã‚Å‚ ‚ê‚ÎYŽ²‚ðÝ’肵‚È‚¨‚·B
     if($ln == 0 and $h < $this->rise_h) {
       $this->y = $this->y - $this->rise_h + $h;
@@ -528 +526 @@
 function Footer()
 {
-    //下端から1.5 cm に移動
+    //‰º’[‚©‚ç1.5 cm ‚Ɉړ®
     $this->SetY(-15);
-    //フォントを設定。 Arial italic 8
+    //ƒtƒHƒ“ƒg‚ðÝ’èB Arial italic 8
     $this->SetFont('Arial','I',8);
-    //現在のページ番号と総ページ数を出力
+    //Œ»Ý‚̃y[ƒW”ԍ†‚Æ‘ƒy[ƒW”‚ðo—Í
     #$this->Cell(0,10,''.$this->PageNo().' / {nb}',0,0,'C');
 }