32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-10 15:20:59 +00:00
This commit is contained in:
nicolaasuni 2011-04-26 11:07:42 +02:00
parent 4adf3d7499
commit dc1cbbd5df
5 changed files with 28 additions and 19 deletions

View File

@ -1,3 +1,6 @@
5.9.072 (2011-04-26)
- Method resetColumns() was added to remove multiple columns and reset page margins (example n. 10 was updated).
5.9.071 (2011-04-19)
- Bug #3288574 "<br/> trouble" was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 5.9.071
Release date: 2011-04-19
Version: 5.9.072
Release date: 2011-04-26
Author: Nicola Asuni
Copyright (c) 2002-2011:

View File

@ -2,7 +2,7 @@
//============================================================+
// File name : example_010.php
// Begin : 2008-03-04
// Last Update : 2010-08-11
// Last Update : 2011-04-26
//
// Description : Example 010 for TCPDF class
// Text on multiple columns
@ -45,12 +45,10 @@ class MC_TCPDF extends TCPDF {
* @public
*/
public function PrintChapter($num, $title, $file, $mode=false) {
// disable existing columns
$this->setEqualColumns();
// add a new page
$this->AddPage();
// reset margins
$this->selectColumn();
// disable existing columns
$this->resetColumns();
// print chapter title
$this->ChapterTitle($num, $title);
// set columns

View File

@ -30,7 +30,7 @@ The PDF Core (standard) fonts are:
Setting up a font for usage with TCPDF requires the following steps:
1. Convert all font filenames to lowercase and rename using the following schema:
1. Convert all font filenames to lowercase, remove all spaces and special characters and rename them using the following schema:
* [basic-font-name-in-lowercase].ttf for regular font
* [basic-font-name-in-lowercase]b.ttf for bold variation
* [basic-font-name-in-lowercase]i.ttf for oblique variation
@ -127,9 +127,4 @@ Setting up a font for usage with TCPDF requires the following steps:
include(dirname(__FILE__).'/uni2cid_aj16.php');
o copy the .php file to the TCPDF fonts directory.
5. Rename php font files variations using the following schema:
* [basic-font-name-in-lowercase].php for regular font
* [basic-font-name-in-lowercase]b.php for bold variation
* [basic-font-name-in-lowercase]i.php for oblique variation
* [basic-font-name-in-lowercase]bi.php for bold oblique variation

View File

@ -1,9 +1,9 @@
<?php
//============================================================+
// File name : tcpdf.php
// Version : 5.9.071
// Version : 5.9.072
// Begin : 2002-08-03
// Last Update : 2011-04-19
// Last Update : 2011-04-26
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS.
// -------------------------------------------------------------------
@ -134,7 +134,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @package com.tecnick.tcpdf
* @author Nicola Asuni
* @version 5.9.071
* @version 5.9.072
*/
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@ -146,7 +146,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php');
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
* @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions.
* @version 5.9.071
* @version 5.9.072
* @author Nicola Asuni - info@tecnick.com
*/
class TCPDF {
@ -157,7 +157,7 @@ class TCPDF {
* Current TCPDF version.
* @private
*/
private $tcpdf_version = '5.9.071';
private $tcpdf_version = '5.9.072';
// Protected properties
@ -23853,6 +23853,18 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->num_columns = $numcols;
$this->current_column = 0;
$this->column_start_page = $this->page;
$this->selectColumn(0);
}
/**
* Remove columns and reset page margins.
* @public
* @since 5.9.072 (2011-04-26)
*/
public function resetColumns() {
$this->lMargin = $this->original_lMargin;
$this->rMargin = $this->original_rMargin;
$this->setEqualColumns();
}
/**
@ -23867,6 +23879,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->num_columns = count($columns);
$this->current_column = 0;
$this->column_start_page = $this->page;
$this->selectColumn(0);
}
/**
@ -23881,7 +23894,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} elseif ($col >= $this->num_columns) {
$col = 0;
}
$xshift = 0;
$xshift = array('x' => 0, 's' => array('H' => 0, 'V' => 0), 'p' => array('L' => 0, 'T' => 0, 'R' => 0, 'B' => 0));
$enable_thead = false;
if ($this->num_columns > 1) {
if ($col != $this->current_column) {