Changeset 21024 for branches/version-2_11-dev/data/class/SC_Fpdf.php

Timestamp:

2011/07/07 19:54:37 (15 years ago)

Author:

Seasoft

Message:

#1399 (SC_Fpdf#lfText フォントファミリーの指定を上書きしている)
#1403 (SC_Fpdf#lfText 戻った後も、引数 $size, $style の影響を受ける)
#1404 (SC_Fpdf#lfText で SC_Fpdf#lfConvSjis を使用していない)
#1405 (SC_Fpdf#lfText 第4引数($size)省略可能に)

File:

• branches/version-2_11-dev/data/class/SC_Fpdf.php (modified) (5 diffs)

branches/version-2_11-dev/data/class/SC_Fpdf.php

@@ -58 +58 @@
         // SJISフォント
         $this->pdf->AddSJISFont();
+        $this->pdf->SetFont('SJIS');
 
         //ページ総数取得
@@ -151 +152 @@
 
         // お届け先情報
-        $this->pdf->SetFont('SJIS', '', 10);
+        $this->pdf->SetFontSize(10);
         $this->lfText(25, 125, SC_Utils_Ex::sfDispDBDate($this->arrDisp['create_date']), 10); //ご注文日
         $this->lfText(25, 135, $this->arrDisp['order_id'], 10); //注文番号
 
-        $this->pdf->SetFont('SJIS', 'B', 15);
+        $this->pdf->SetFont('', 'B', 15);
         $this->pdf->Cell(0, 10, $this->lfConvSjis($this->tpl_title), 0, 2, 'C', 0, '');  //文書タイトル（納品書・請求書）
         $this->pdf->Cell(0, 66, '', 0, 2, 'R', 0, '');
@@ -162 +163 @@
         $this->pdf->Cell(0, 45, '', 0, 2, '', 0, '');
 
-        $this->pdf->SetFont('SJIS', '', 8);
+        $this->pdf->SetFontSize(8);
 
         $monetary_unit = $this->lfConvSjis("円");
@@ -256 +257 @@
     function setEtcData() {
         $this->pdf->Cell(0, 10, '', 0, 1, 'C', 0, '');
-        $this->pdf->SetFont('SJIS', '', 9);
+        $this->pdf->SetFontSize(9);
         $this->pdf->MultiCell(0, 6, $this->lfConvSjis("＜ 備 考 ＞"), 'T', 2, 'L', 0, '');  //備考
         $this->pdf->Ln();
-        $this->pdf->SetFont('SJIS', '', 8);
+        $this->pdf->SetFontSize(8);
         $this->pdf->MultiCell(0, 4, $this->lfConvSjis($this->arrData['etc1']."\n".$this->arrData['etc2']."\n".$this->arrData['etc3']), '', 2, 'L', 0, '');  //備考
     }
@@ -282 +283 @@
 
     // PDF_Japanese::Text へのパーサー
-    function lfText($x, $y, $text, $size, $style = '') {
-        $text = mb_convert_encoding($text, "SJIS-win", CHAR_CODE);
-
-        $this->pdf->SetFont('SJIS', $style, $size);
-        $this->pdf->Text($x, $y, $text);
+    function lfText($x, $y, $text, $size = 0, $style = '') {
+        // 退避
+        $bak_font_style = $this->pdf->FontStyle;
+        $bak_font_size = $this->pdf->FontSizePt;
+
+        $this->pdf->SetFont('', $style, $size);
+        $this->pdf->Text($x, $y, $this->lfConvSjis($text));
+
+        // 復元
+        $this->pdf->SetFont('', $bak_font_style, $bak_font_size);
     }