TEST
//
//
- $handler =& CSS::get_handler(CSS_TEXT_ALIGN);
+ $handler =& (new CSS())->get_handler(CSS_TEXT_ALIGN);
$handler->css('left', $pipeline);
// Parse table contents
@@ -99,11 +99,11 @@ function &create(&$root, &$pipeline) {
} else {
$child_box =& create_pdf_box($child, $pipeline);
$box->add_child($child_box);
- };
- };
+ }
+ }
$child = $child->next_sibling();
- };
+ }
$box->normalize($pipeline);
$box->normalize_cwc();
@@ -134,8 +134,8 @@ function parse_col(&$root, $index) {
$this->cwc[$index] = new WCFraction(((int)$value) / 100);
} else {
$this->cwc[$index] = new WCConstant(px2pt((int)$value));
- };
- };
+ }
+ }
}
// Traverse the COLGROUP node and save the column-specific information
@@ -154,9 +154,9 @@ function parse_colgroup_tag(&$root, $start_index) {
if ($child->tagname() === 'col') {
$this->parse_col($child, $index);
$index ++;
- };
+ }
$child = $child->next_sibling();
- };
+ }
return $index;
}
@@ -186,7 +186,7 @@ function normalize_rhc() {
$this->rhc = array();
for ($i=0, $size = count($this->content); $i < $size; $i++) {
$this->rhc[$i] = new HCConstraint(null, null, null);
- };
+ }
// Scan all cells
for ($i=0, $num_rows = count($this->content); $i < $num_rows; $i++) {
@@ -204,8 +204,8 @@ function normalize_rhc() {
// Now reset the cell width constraint; cell width should be affected by ceolumn constraint only
$hc = new HCConstraint(null, null, null);
$cell->put_height_constraint($hc);
- };
- };
+ }
+ }
}
// Normalize column width constraints
@@ -220,7 +220,7 @@ function normalize_cwc() {
//
if (!isset($this->cwc[$i])) {
$this->cwc[$i] = new WCNone;
- };
+ }
}
// For each column (we should have table already normalized - so lengths of all rows are equal)
@@ -234,7 +234,7 @@ function normalize_cwc() {
if ($cell->colspan > 1) { continue; }
// Put current cell width constraint as a columns with constraint
- $this->cwc[$i] = merge_width_constraint($this->cwc[$i], $cell->get_css_property(CSS_WIDTH));
+ $this->cwc[$i] = merge_width_constraint($this->cwc[$i], $cell->getCSSProperty(CSS_WIDTH));
// Now reset the cell width constraint; cell width should be affected by ceolumn constraint only
$cell->setCSSProperty(CSS_WIDTH, new WCNone);
@@ -252,8 +252,8 @@ function normalize_cwc() {
if ($wc->isFraction()) {
$wc->fraction = min($rest, $wc->fraction);
$rest -= $wc->fraction;
- };
- };
+ }
+ }
/**
* Now, let's process cells spanninig several columns.
@@ -276,10 +276,10 @@ function normalize_cwc() {
* Note that there should be '>='; '==' is not enough, as sometimes cell is declared to span
* more columns than there are in the table
*/
- $cell_wc = $cell->get_css_property(CSS_WIDTH);
+ $cell_wc = $cell->getCSSProperty(CSS_WIDTH);
if (!$cell->is_fake() &&
$cell_wc->isFraction() &&
- $cell->colspan >= count($this->content[$j])) {
+ $cell->colspan >= (is_object($this->content[$j]) ? 1 : 0)) {
/**
* Clear the constraint; anyway, it should be replaced with 100% in this case, as
@@ -288,8 +288,8 @@ function normalize_cwc() {
$wc = new WCNone;
$cell->setCSSProperty(CSS_WIDTH, $wc);
- };
- };
+ }
+ }
}
/**
@@ -304,15 +304,15 @@ function normalize(&$pipeline) {
$row =& $this->content[$i];
if (count($row->content) == 0) {
$this->content[$i]->add_fake_cell_before(0, $pipeline);
- };
- };
+ }
+ }
/**
* first, normalize colspans
*/
for ($i=0; $icontent); $i++) {
$this->content[$i]->normalize($pipeline);
- };
+ }
/**
* second, normalize rowspans
@@ -362,11 +362,11 @@ function normalize(&$pipeline) {
//
for ($cs = 0; $cs < $row->content[$i_col]->colspan; $cs++) {
$this->content[$k]->add_fake_cell_before($i_col, $pipeline);
- };
- };
- };
- };
- };
+ }
+ }
+ }
+ }
+ }
$i_col ++;
} while ($flag);
@@ -398,7 +398,7 @@ function add_child(&$item) {
if (count($this->content[count($this->content)-1]->content) == 0) {
array_pop($this->content);
}
- };
+ }
// Just add passed row
$this->content[] =& $item;
@@ -407,7 +407,7 @@ function add_child(&$item) {
for ($i=0, $size = count($item->content); $i < $size; $i++) {
$this->add_child($item->content[$i]);
}
- };
+ }
}
// Table-specific functions
@@ -437,15 +437,15 @@ function table_fit_rowspans($heights) {
$baseline = $this->content[$span->row]->get_row_baseline();
// apply vertical-align
- $vertical_align = $cell->get_css_property(CSS_VERTICAL_ALIGN);
+ $vertical_align = $cell->getCSSProperty(CSS_VERTICAL_ALIGN);
- $va_fun = CSSVerticalAlign::value2pdf($vertical_align);
+ $va_fun = (new CSSVerticalAlign())->value2pdf($vertical_align);
$va_fun->apply_cell($cell, array_sum($row_heights), $baseline);
if (array_sum($row_heights) > $cell->get_full_height()) {
// Make cell fill all available vertical space
$cell->put_full_height(array_sum($row_heights));
- };
+ }
}
}
@@ -454,7 +454,7 @@ function get_rowspans() {
for ($i=0; $icontent); $i++) {
$spans = array_merge($spans, $this->content[$i]->get_rowspans($i));
- };
+ }
return $spans;
}
@@ -495,7 +495,7 @@ function _row_heights($minheight) {
$hc = $this->get_rhc($i);
$cheights[] = $hc->apply($heights[$i], $this->content[$i], null);
- };
+ }
// Collapse "constrained" heights of percentage-constrained rows, if they're
// taking more that available space
@@ -504,18 +504,18 @@ function _row_heights($minheight) {
$h = $height;
$ch = 0;
for ($i=0; $i 0) {
$scale = $h / $ch;
if ($scale < 1) {
for ($i=0; $i 0) {
$scale = $h / $ch;
if ($scale < 1) {
for ($i=0; $i 0) {
$scale = $h / $ch;
if ($scale < 1) {
for ($i=0; $iget_top();
- $size = count($heights);
+ $size = is_countable($heights) ? count($heights) : 0;
for ($i=0; $i<$size; $i++) {
$this->content[$i]->table_resize_row($heights[$i], $row_top);
$row_top -= $heights[$i];
@@ -605,8 +605,8 @@ function table_resize_rows(&$heights) {
// // Cell baseline is the baseline of its first line box inside this cell
// if (count($row->content[$i]->content) > 0) {
// $baseline = max($baseline, $row->content[$i]->content[0]->baseline);
- // };
- // };
+ // }
+ // }
// return $baseline;
// }
@@ -654,7 +654,7 @@ function get_min_width(&$context) {
$width = array_sum($widths);
$base_width = $width;
- $wc = $this->get_css_property(CSS_WIDTH);
+ $wc = $this->getCSSProperty(CSS_WIDTH);
if (!$wc->isNull()) {
// Check if constrained table width should be expanded to fit the table contents
//
@@ -670,18 +670,14 @@ function get_min_width(&$context) {
$width = max($width,
min($cwc->apply_inverse($widths[$i], $base_width),
$this->parent->get_available_width($context) - $this->_get_hor_extra()));
- };
- };
+ }
+ }
return $width + $this->_get_hor_extra();
}
- function get_min_width_natural(&$context) {
- return $this->get_min_width($context);
- }
-
- function get_max_width(&$context) {
- $wc = $this->get_css_property(CSS_WIDTH);
+ function get_max_width(&$context, $limit = 10000000) {
+ $wc = $this->getCSSProperty(CSS_WIDTH);
if ($wc->isConstant()) {
return $wc->apply(0, $this->parent->get_available_width($context));
@@ -704,19 +700,19 @@ function get_max_width(&$context) {
$width = max($width,
min($cwc->apply_inverse($widths[$i], $base_width),
$this->parent->get_available_width($context) - $this->_get_hor_extra()));
- };
+ }
return $width + $this->_get_hor_extra();
}
}
- function get_max_width_natural(&$context) {
+ function get_max_width_natural(&$context, $limit = 10000000) {
return $this->get_max_width($context);
}
function get_width() {
- $wc = $this->get_css_property(CSS_WIDTH);
- $pwc = $this->parent->get_css_property(CSS_WIDTH);
+ $wc = $this->getCSSProperty(CSS_WIDTH);
+ $pwc = $this->parent->getCSSProperty(CSS_WIDTH);
if (!$this->parent->isCell() ||
!$pwc->isNull() ||
@@ -724,7 +720,7 @@ function get_width() {
$width = $wc->apply($this->width, $this->parent->width);
} else {
$width = $this->width;
- };
+ }
// Note that table 'padding' property for is handled differently
// by different browsers; for example, IE 6 ignores it completely,
@@ -736,18 +732,18 @@ function get_width() {
}
function table_column_widths(&$context) {
- $table_layout = $this->get_css_property(CSS_TABLE_LAYOUT);
+ $table_layout = $this->getCSSProperty(CSS_TABLE_LAYOUT);
switch ($table_layout) {
case TABLE_LAYOUT_FIXED:
// require_once(HTML2PS_DIR.'strategy.table.layout.fixed.php');
-// $strategy =& new StrategyTableLayoutFixed();
+// $strategy= new StrategyTableLayoutFixed();
// break;
case TABLE_LAYOUT_AUTO:
default:
require_once(HTML2PS_DIR.'strategy.table.layout.auto.php');
- $strategy =& new StrategyTableLayoutAuto();
+ $strategy= new StrategyTableLayoutAuto();
break;
- };
+ }
return $strategy->apply($this, $context);
}
@@ -768,14 +764,11 @@ function _table_apply_colspans($widths, &$context, $width_fun, $minwc, $maxwc) {
// if table width is not constrained, we should not do this, as current value
// of $table->get_width is maximal width (parent width), not the actual
// width of the table
- $wc = $this->get_css_property(CSS_WIDTH);
+ $wc = $this->getCSSProperty(CSS_WIDTH);
if (!$wc->isNull()) {
- $cell_wc = $cell->get_css_property(CSS_WIDTH);
+ $cell_wc = $cell->getCSSProperty(CSS_WIDTH);
$cell_width = $cell_wc->apply($cell_width, $this->get_width());
-
- // On the other side, constrained with cannot be less than cell minimal width
- $cell_width = max($cell_width, $cell->get_min_width($context));
- };
+ }
// now select the pre-calculated widths of columns covered by this cell
// select the list of resizable columns covered by this cell
@@ -794,19 +787,19 @@ function _table_apply_colspans($widths, &$context, $width_fun, $minwc, $maxwc) {
for ($i=0; $icolumn, $colspan->size, $spanned_widths);
- };
+ }
return $widths;
}
@@ -825,7 +818,7 @@ function get_table_columns_max_widths(&$context) {
for ($i=0; $icontent[0]->content); $i++) {
$widths[] = 0;
- };
+ }
for ($i=0; $icontent); $i++) {
// Calculate column widths for a current row
@@ -845,7 +838,7 @@ function get_table_columns_max_widths(&$context) {
//
if (!is_a($cwc,"wcfraction")) {
$widths[$i] = $cwc->apply($widths[$i], $this->get_width());
- };
+ }
}
// TODO: colspans
@@ -859,20 +852,20 @@ function get_table_columns_max_widths(&$context) {
function get_table_columns_min_widths(&$context) {
if (!is_null($this->_cached_min_widths)) {
return $this->_cached_min_widths;
- };
+ }
$widths = array();
for ($i=0; $icontent[0]->content); $i++) {
$widths[] = 0;
- };
+ }
$content_size = count($this->content);
for ($i=0; $i<$content_size; $i++) {
// Calculate column widths for a current row
$roww = $this->content[$i]->get_table_columns_min_widths($context);
- $row_size = count($roww);
+ $row_size = is_countable($roww) ? count($roww) : 0;
for ($j=0; $j<$row_size; $j++) {
$widths[$j] = max($roww[$j], $widths[$j]);
}
@@ -887,7 +880,7 @@ function get_colspans() {
for ($i=0; $icontent); $i++) {
$colspans = array_merge($colspans, $this->content[$i]->get_colspans($i));
- };
+ }
return $colspans;
}
@@ -895,13 +888,13 @@ function get_colspans() {
function check_constrained_colspan($col) {
for ($i=0; $i<$this->rows_count(); $i++) {
$cell =& $this->cell($i, $col);
- $cell_wc = $cell->get_css_property(CSS_WIDTH);
+ $cell_wc = $cell->getCSSProperty(CSS_WIDTH);
if ($cell->colspan > 1 &&
!$cell_wc->isNull()) {
return true;
- };
- };
+ }
+ }
return false;
}
@@ -937,7 +930,7 @@ function normalize_min_widths($width, $minw, $minwc) {
$diff[$i] = $minwc[$i] - $minw[$i];
} else {
$diff[$i] = 0;
- };
+ }
}
// If no difference is found, we can collapse no columns
@@ -960,8 +953,8 @@ function table_have_colspan($x, $y) {
}
// Flow-control
- function reflow(&$parent, &$context) {
- if ($this->get_css_property(CSS_FLOAT) === FLOAT_NONE) {
+ function reflow(&$parent, &$context, $boxes = null) {
+ if ($this->getCSSProperty(CSS_FLOAT) === FLOAT_NONE) {
$status = $this->reflow_static_normal($parent, $context);
} else {
$status = $this->reflow_static_float($parent, $context);
@@ -979,7 +972,7 @@ function reflow_absolute(&$context) {
// Calculate width value if it had been set as a percentage
$this->_calc_percentage_width($parent, $context);
- $wc = $this->get_css_property(CSS_WIDTH);
+ $wc = $this->getCSSProperty(CSS_WIDTH);
if (!$wc->isNull()) {
$col_width = $this->get_table_columns_min_widths($context);
$maxw = $this->get_table_columns_max_widths($context);
@@ -987,10 +980,10 @@ function reflow_absolute(&$context) {
if (array_sum($col_width) > $this->get_width()) {
$wc = new WCConstant(array_sum($col_width));
- };
- };
+ }
+ }
- $position_strategy =& new StrategyPositionAbsolute();
+ $position_strategy= new StrategyPositionAbsolute();
$position_strategy->apply($this);
$this->reflow_content($context);
@@ -1009,7 +1002,7 @@ function reflow_static_normal(&$parent, &$context) {
// Calculate width value if it had been set as a percentage
$this->_calc_percentage_width($parent, $context);
- $wc = $this->get_css_property(CSS_WIDTH);
+ $wc = $this->getCSSProperty(CSS_WIDTH);
if (!$wc->isNull()) {
$col_width = $this->get_table_columns_min_widths($context);
$maxw = $this->get_table_columns_max_widths($context);
@@ -1017,8 +1010,8 @@ function reflow_static_normal(&$parent, &$context) {
if (array_sum($col_width) > $this->get_width()) {
$wc = new WCConstant(array_sum($col_width));
- };
- };
+ }
+ }
// As table width can be deterimined by its contents, we may calculate auto values
// only AFTER the contents have been reflown; thus, we'll offset the table
@@ -1043,8 +1036,8 @@ function reflow_static_normal(&$parent, &$context) {
// Determine upper-left _content_ corner position of current box
// Also see note above regarding margins
- $border = $this->get_css_property(CSS_BORDER);
- $padding = $this->get_css_property(CSS_PADDING);
+ $border = $this->getCSSProperty(CSS_BORDER);
+ $padding = $this->getCSSProperty(CSS_PADDING);
$this->put_left($parent->_current_x +
$border->left->get_width() +
@@ -1063,7 +1056,7 @@ function reflow_static_normal(&$parent, &$context) {
$this->reflow_content($context);
// Update the collapsed margin value with current box bottom margin
- $margin = $this->get_css_property(CSS_MARGIN);
+ $margin = $this->getCSSProperty(CSS_MARGIN);
$context->pop_collapsed_margin();
$context->pop_collapsed_margin();
@@ -1093,7 +1086,7 @@ function get_non_constrained_flags() {
(is_null($hc->constant)) &&
(is_null($hc->min)) &&
(is_null($hc->max));
- };
+ }
return $flags;
}
@@ -1112,7 +1105,7 @@ function get_non_percentage_constrained_height_flags() {
(!is_null($hc->constant) ? !$hc->constant[1] : true) &&
(!is_null($hc->min) ? !$hc->min[1] : true) &&
(!is_null($hc->max) ? !$hc->max[1] : true);
- };
+ }
return $flags;
}
@@ -1124,7 +1117,7 @@ function get_non_constrained_height_flags() {
$hc = $this->get_rhc($i);
$flags[$i] = $hc->is_null();
- };
+ }
return $flags;
}
@@ -1140,7 +1133,7 @@ function get_non_constrained_width_flags() {
for ($i=0; $i<$this->cols_count(); $i++) {
$wc = $this->get_cwc($i);
$flags[$i] = is_a($wc,"wcnone");
- };
+ }
return $flags;
}
@@ -1151,7 +1144,7 @@ function get_non_constant_constrained_width_flags() {
for ($i=0; $i<$this->cols_count(); $i++) {
$wc = $this->get_cwc($i);
$flags[$i] = !is_a($wc,"WCConstant");
- };
+ }
return $flags;
}
@@ -1163,9 +1156,9 @@ function check_if_column_image_constrained($col) {
if (!$cell->content[$j]->is_null() &&
!is_a($cell->content[$j], "GenericImgBox")) {
return false;
- };
- };
- };
+ }
+ }
+ }
return true;
}
@@ -1174,7 +1167,7 @@ function get_non_image_constrained_width_flags() {
for ($i=0; $i<$this->cols_count(); $i++) {
$flags[$i] = !$this->check_if_column_image_constrained($i);
- };
+ }
return $flags;
}
@@ -1190,7 +1183,7 @@ function get_non_constant_constrained_flags() {
for ($i=0; $icontent); $i++) {
$hc = $this->get_rhc($i);
$flags[$i] = is_null($hc->constant);
- };
+ }
return $flags;
}
@@ -1218,7 +1211,7 @@ function reflow_content(&$context) {
//
// if ($this->get_width() < $real_width) {
// // $this->put_width_constraint(new WCConstant($real_width));
- // };
+ // }
// Flow cells horizontally in each table row
for ($i=0; $icontent); $i++) {
@@ -1249,11 +1242,11 @@ function reflow_content(&$context) {
// TODO: check for rowspans
// Flow cell
- $this->content[$i]->content[$j]->reflow($this, $context);
+ @$this->content[$i]->content[$j]->reflow($this, $context);
// Offset current X value by the cell width
$this->_current_x += $cw;
- };
+ }
// Current cell have been processed or skipped
$span = max(0, $span-1);
@@ -1296,7 +1289,7 @@ function reflow_content(&$context) {
$new_heights = expand_to_with_flags($cell_height,
$cell_row_heights,
$flags);
- };
+ }
// Update the rows heights
array_splice($heights,
@@ -1325,22 +1318,13 @@ function reflow_content(&$context) {
$heights = expand_to_with_flags($table_height,
$heights,
$flags);
- };
+ }
// Now we calculated row heights, time to actually resize them
$this->table_resize_rows($heights);
// Update size of cells spanning several rows
$this->table_fit_rowspans($heights);
-
- // Expand total table height, if needed
- $total_height = array_sum($heights);
- if ($total_height > $this->get_height()) {
- $hc = new HCConstraint(array($total_height, false),
- array($total_height, false),
- array($total_height, false));
- $this->put_height_constraint($hc);
- };
}
function isBlockLevel() {
diff --git a/public_html/box.table.row.php b/public_html/box.table.row.php
index 988f60a..3200de3 100644
--- a/public_html/box.table.row.php
+++ b/public_html/box.table.row.php
@@ -7,8 +7,8 @@ class TableRowBox extends GenericContainerBox {
var $rowspans;
function &create(&$root, &$pipeline) {
- $box =& new TableRowBox();
- $box->readCSS($pipeline->get_current_css_state());
+ $box= new TableRowBox();
+ $box->readCSS($pipeline->getCurrentCSSState());
$child = $root->first_child();
while ($child) {
@@ -16,7 +16,7 @@ function &create(&$root, &$pipeline) {
$box->add_child($child_box);
$child = $child->next_sibling();
- };
+ }
return $box;
}
@@ -24,12 +24,12 @@ function &create(&$root, &$pipeline) {
function add_child(&$item) {
if ($item->isCell()) {
GenericContainerBox::add_child($item);
- };
+ }
}
- function TableRowBox() {
+ function __construct() {
// Call parent constructor
- $this->GenericContainerBox();
+ GenericContainerBox::__construct();
}
// Normalize colspans by adding fake cells after the "colspanned" cell
@@ -40,26 +40,29 @@ function TableRowBox() {
// second and third are completely empty
// fourth contains "2"
function normalize(&$pipeline) {
- for ($i=0, $size = count($this->content); $i < $size; $i++) {
+ for ($i=0, $size = count((array) $this->content); $i < $size; $i++) {
for ($j=1; $j<$this->content[$i]->colspan; $j++) {
$this->add_fake_cell_after($i, $pipeline);
// Note that add_fake_cell_after will increase the length of current row by one cell,
// so we must increase $size variable
$size++;
- };
- };
+ }
+ }
}
function add_fake_cell_after($index, &$pipeline) {
- array_splice($this->content, $index+1, 0, array(FakeTableCellBox::create($pipeline)));
+ $root = '';
+ array_splice($this->content, $index+1, 0, array((new FakeTableCellBox())->create($root, $pipeline)));
}
function add_fake_cell_before($index, &$pipeline) {
- array_splice($this->content, $index, 0, array(FakeTableCellBox::create($pipeline)));
+ $root = '';
+ array_splice($this->content, $index, 0, array((new FakeTableCellBox())->create($root, $pipeline)));
}
function append_fake_cell(&$pipeline) {
- $this->content[] = FakeTableCellBox::create($pipeline);
+ $root = '';
+ $this->content[] = (new FakeTableCellBox())->create($root, $pipeline);
}
// Table specific
@@ -71,7 +74,7 @@ function table_resize_row($height, $top) {
$baseline = $this->get_row_baseline();
// Process cells contained in current row
- for ($i=0, $size = count($this->content); $i<$size; $i++) {
+ for ($i=0, $size = count((array) $this->content); $i<$size; $i++) {
$cell =& $this->content[$i];
// Offset cell if needed
@@ -81,8 +84,8 @@ function table_resize_row($height, $top) {
// Vertical-align cell (do not apply to rowspans)
if ($cell->rowspan == 1) {
- $va = $cell->get_css_property(CSS_VERTICAL_ALIGN);
- $va_fun = CSSVerticalAlign::value2pdf($va);
+ $va = $cell->getCSSProperty(CSS_VERTICAL_ALIGN);
+ $va_fun = (new CSSVerticalAlign())->value2pdf($va);
$va_fun->apply_cell($cell, $height, $baseline);
// Expand cell to full row height
@@ -93,11 +96,11 @@ function table_resize_row($height, $top) {
function get_row_baseline() {
$baseline = 0;
- for ($i=0, $size = count($this->content); $i<$size; $i++) {
+ for ($i=0, $size = count((array) $this->content); $i<$size; $i++) {
$cell = $this->content[$i];
if ($cell->rowspan == 1) {
$baseline = max($baseline, $cell->get_cell_baseline());
- };
+ }
}
return $baseline;
}
@@ -105,7 +108,7 @@ function get_row_baseline() {
function get_colspans($row_index) {
$colspans = array();
- for ($i=0, $size = count($this->content); $i<$size; $i++) {
+ for ($i=0, $size = count((array) $this->content); $i<$size; $i++) {
// Check if current colspan will run off the right table edge
if ($this->content[$i]->colspan > 1) {
$colspan = new CellSpan;
@@ -161,7 +164,7 @@ function get_table_columns_min_widths(&$context) {
$widths[] = 0;
} else {
$widths[] = $this->content[$i]->get_min_width($context);
- };
+ }
}
return $widths;
@@ -187,7 +190,7 @@ function row_height() {
*/
function show(&$viewport) {
// draw content
- $size = count($this->content);
+ $size = is_countable($this->content) ? count((array) $this->content) : 0;
for ($i=0; $i < $size; $i++) {
/**
@@ -201,13 +204,13 @@ function show(&$viewport) {
*/
$cell =& $this->content[$i];
- $visibility = $cell->get_css_property(CSS_VISIBILITY);
+ $visibility = $cell->getCSSProperty(CSS_VISIBILITY);
if ($visibility === VISIBILITY_VISIBLE) {
if (is_null($cell->show($viewport))) {
return null;
- };
- };
+ }
+ }
}
return true;
diff --git a/public_html/box.table.section.php b/public_html/box.table.section.php
index b31ec50..365c2f2 100644
--- a/public_html/box.table.section.php
+++ b/public_html/box.table.section.php
@@ -3,8 +3,8 @@
class TableSectionBox extends GenericContainerBox {
function &create(&$root, &$pipeline) {
- $state =& $pipeline->get_current_css_state();
- $box =& new TableSectionBox();
+ $state =& $pipeline->getCurrentCSSState();
+ $box= new TableSectionBox();
$box->readCSS($state);
// Automatically create at least one table row
@@ -18,13 +18,13 @@ function &create(&$root, &$pipeline) {
$child_box =& create_pdf_box($child, $pipeline);
$box->add_child($child_box);
$child = $child->next_sibling();
- };
+ }
return $box;
}
- function TableSectionBox() {
- $this->GenericContainerBox();
+ function __construct() {
+ GenericContainerBox::__construct();
}
// Overrides default 'add_child' in GenericFormattedBox
@@ -41,11 +41,11 @@ function add_child(&$item) {
if (count($this->content[count($this->content)-1]->content) == 0) {
array_pop($this->content);
}
- };
+ }
// Just add passed row
$this->content[] =& $item;
- };
+ }
}
function isTableSection() {
diff --git a/public_html/box.text.php b/public_html/box.text.php
index d9ab259..5ebe6f9 100644
--- a/public_html/box.text.php
+++ b/public_html/box.text.php
@@ -1,11 +1,13 @@
SimpleInlineBox();
+ function __construct() {
+ SimpleInlineBox::__construct();
$this->words = array();
$this->encodings = array();
@@ -52,19 +54,10 @@ function _make_wrappable(&$driver, $base_width, $font_name, $font_size, $subword
$font_size);
$wrappable[] = array($subword_index, $subword_wrappable_index, $subword_wrappable_width, $subword_full_width);
- };
+ }
return $wrappable;
}
- function get_content() {
- return join('', array_map(array($this, 'get_content_callback'), $this->words, $this->encodings));
- }
-
- function get_content_callback($word, $encoding) {
- $manager_encoding =& ManagerEncoding::get();
- return $manager_encoding->to_utf8($word, $encoding);
- }
-
function get_height() {
return $this->height;
}
@@ -85,13 +78,13 @@ function _apply_line_height() {
$height = $this->get_height();
$under = $height - $this->default_baseline;
- $line_height = $this->get_css_property(CSS_LINE_HEIGHT);
+ $line_height = $this->getCSSProperty(CSS_LINE_HEIGHT);
if ($height > 0) {
$scale = $line_height->apply($this->ascender + $this->descender) / ($this->ascender + $this->descender);
} else {
$scale = 0;
- };
+ }
// Calculate the height delta of the text box
@@ -103,13 +96,13 @@ function _apply_line_height() {
function _get_font_name(&$viewport, $subword_index) {
if (isset($this->_cache[CACHE_TYPEFACE][$subword_index])) {
return $this->_cache[CACHE_TYPEFACE][$subword_index];
- };
+ }
$font_resolver =& $viewport->get_font_resolver();
- $font = $this->get_css_property(CSS_FONT);
+ $font = $this->getCSSProperty(CSS_FONT);
- $typeface = $font_resolver->get_typeface_name($font->family,
+ $typeface = $font_resolver->getTypefaceName($font->family,
$font->weight,
$font->style,
$this->encodings[$subword_index]);
@@ -119,40 +112,24 @@ function _get_font_name(&$viewport, $subword_index) {
return $typeface;
}
- function add_subword($raw_subword, $encoding, $hyphens) {
- $text_transform = $this->get_css_property(CSS_TEXT_TRANSFORM);
- switch ($text_transform) {
- case CSS_TEXT_TRANSFORM_CAPITALIZE:
- $subword = ucwords($raw_subword);
- break;
- case CSS_TEXT_TRANSFORM_UPPERCASE:
- $subword = strtoupper($raw_subword);
- break;
- case CSS_TEXT_TRANSFORM_LOWERCASE:
- $subword = strtolower($raw_subword);
- break;
- case CSS_TEXT_TRANSFORM_NONE:
- $subword = $raw_subword;
- break;
- }
-
- $this->words[] = $subword;
+ function add_subword($text, $encoding, $hyphens) {
+ $this->words[] = $text;
$this->encodings[] = $encoding;
$this->hyphens[] = $hyphens;
}
function &create($text, $encoding, &$pipeline) {
- $box =& TextBox::create_empty($pipeline);
+ $box = (new TextBox())->create_empty($pipeline);
$box->add_subword($text, $encoding, array());
return $box;
}
function &create_empty(&$pipeline) {
- $box =& new TextBox();
- $css_state = $pipeline->get_current_css_state();
+ $box= new TextBox();
+ $css_state = $pipeline->getCurrentCSSState();
$box->readCSS($css_state);
- $css_state = $pipeline->get_current_css_state();
+ $css_state = $pipeline->getCurrentCSSState();
return $box;
}
@@ -163,6 +140,37 @@ function readCSS(&$state) {
$this->_readCSSLengths($state,
array(CSS_TEXT_INDENT,
CSS_LETTER_SPACING));
+
+ /**
+ * Now we should apply the 'text-transform' property; we should do
+ * this immediately after reading CSS data, as symbols may (and
+ * probably will) have different widths in upper and lower cases.
+ */
+
+ $text_transform = $this->getCSSProperty(CSS_TEXT_TRANSFORM);
+ switch ($text_transform) {
+ case CSS_TEXT_TRANSFORM_CAPITALIZE:
+ $size = count((array) $this->words);
+ for ($i=0; $i<$size; $i++) {
+ $this->words[$i] = ucwords($this->words[$i]);
+ }
+ break;
+ case CSS_TEXT_TRANSFORM_UPPERCASE:
+ $size = count((array) $this->words);
+ for ($i=0; $i<$size; $i++) {
+ $this->words[$i] = strtoupper($this->words[$i]);
+ }
+ break;
+ case CSS_TEXT_TRANSFORM_LOWERCASE:
+ $size = count((array) $this->words);
+ for ($i=0; $i<$size; $i++) {
+ $this->words[$i] = strtolower($this->words[$i]);
+ }
+ break;
+ break;
+ case CSS_TEXT_TRANSFORM_NONE:
+ break;
+ }
}
// Inherited from GenericFormattedBox
@@ -186,7 +194,7 @@ function get_min_width(&$context) {
return $this->get_full_width();
}
- function get_max_width(&$context) {
+ function get_max_width(&$context, $limit = 10000000) {
return $this->get_full_width();
}
@@ -199,7 +207,7 @@ function get_max_width(&$context) {
function maybe_line_break(&$parent, &$context) {
if (!$parent->line_break_allowed()) {
return false;
- };
+ }
$last =& $parent->last_in_line();
if ($last) {
@@ -208,8 +216,8 @@ function maybe_line_break(&$parent, &$context) {
// while "plain" words may be wrapped.
if ($last->is_note_call() && $this->is_punctuation()) {
return false;
- };
- };
+ }
+ }
// Calculate the x-coordinate of this box right edge
$right_x = $this->get_full_width() + $parent->_current_x;
@@ -221,7 +229,7 @@ function maybe_line_break(&$parent, &$context) {
$float = $context->point_in_floats($right_x, $parent->_current_y);
if ($float) {
$need_break = true;
- };
+ }
// No floats; check if we had run out the right edge of container
// TODO: nobr-before, nobr-after
@@ -231,12 +239,12 @@ function maybe_line_break(&$parent, &$context) {
$first = $parent->get_first();
- $ti = $this->get_css_property(CSS_TEXT_INDENT);
+ $ti = $this->getCSSProperty(CSS_TEXT_INDENT);
$indent_offset = $ti->calculate($parent);
if ($parent->_current_x > $parent->get_left() + $indent_offset + EPSILON) {
$need_break = true;
- };
+ }
}
// As close-line will not change the current-Y parent coordinate if no
@@ -244,19 +252,19 @@ function maybe_line_break(&$parent, &$context) {
//
if ($parent->line_box_empty() && $need_break) {
$parent->_current_y -= $this->get_height();
- };
+ }
if ($need_break) {
// Check if current box contains soft hyphens and use them, breaking word into parts
- $size = count($this->_wrappable);
+ $size = count((array) $this->_wrappable);
if ($size > 0) {
$width_delta = $right_x - $parent->get_right();
if (!is_null($float)) {
$width_delta = $right_x - $float->get_left_margin();
- };
+ }
$this->_find_soft_hyphen($parent, $width_delta);
- };
+ }
$parent->close_line($context);
@@ -265,8 +273,8 @@ function maybe_line_break(&$parent, &$context) {
while (!is_null($element) && is_a($element,"GenericInlineBox")) {
$parent->_current_x += $element->get_extra_left();
$element = $element->parent;
- };
- };
+ }
+ }
return $need_break;
}
@@ -275,15 +283,15 @@ function _find_soft_hyphen(&$parent, $width_delta) {
/**
* Now we search for soft hyphen closest to the right margin
*/
- $size = count($this->_wrappable);
+ $size = count((array) $this->_wrappable);
for ($i=$size-1; $i>=0; $i--) {
$wrappable = $this->_wrappable[$i];
if ($this->get_width() - $wrappable[3] > $width_delta) {
$this->save_wrapped($wrappable, $parent, $context);
$parent->append_line($this);
return;
- };
- };
+ }
+ }
}
function save_wrapped($wrappable, &$parent, &$context) {
@@ -292,7 +300,7 @@ function save_wrapped($wrappable, &$parent, &$context) {
$parent->_current_y - $this->get_extra_top());
}
- function reflow(&$parent, &$context) {
+ function reflow(&$parent, &$context, $boxes = null) {
// Check if we need a line break here (possilble several times in a row, if we
// have a long word and a floating box intersecting with this word
//
@@ -318,7 +326,7 @@ function reflow(&$parent, &$context) {
$parent->_current_x += $this->get_full_width() - $this->wrapped[0][2];
} else {
$parent->_current_x += $this->get_full_width();
- };
+ }
// Extends parents height
$parent->extend_height($this->get_bottom());
@@ -338,42 +346,42 @@ function getWrappedWidth() {
return $this->wrapped[0][2];
}
- function reflow_text(&$driver) {
- $num_words = count($this->words);
+ function reflow_text(&$viewport) {
+ $num_words = count((array) $this->words);
/**
* Empty text box
*/
if ($num_words == 0) {
return true;
- };
+ }
/**
* A simple assumption is made: fonts used for different encodings
* have equal ascender/descender values (while they have the same
* typeface, style and weight).
*/
- $font_name = $this->_get_font_name($driver, 0);
+ $font_name = $this->_get_font_name($viewport, 0);
/**
* Get font vertical metrics
*/
- $ascender = $driver->font_ascender($font_name, $this->encodings[0]);
+ $ascender = $viewport->font_ascender($font_name, $this->encodings[0]);
if (is_null($ascender)) {
error_log("TextBox::reflow_text: cannot get font ascender");
return null;
- };
+ }
- $descender = $driver->font_descender($font_name, $this->encodings[0]);
+ $descender = $viewport->font_descender($font_name, $this->encodings[0]);
if (is_null($descender)) {
error_log("TextBox::reflow_text: cannot get font descender");
return null;
- };
+ }
/**
* Setup box size
*/
- $font = $this->get_css_property(CSS_FONT_SIZE);
+ $font = $this->getCSSProperty(CSS_FONT_SIZE);
$font_size = $font->getPoints();
// Both ascender and descender should make $font_size
@@ -393,26 +401,26 @@ function reflow_text(&$driver) {
$width = 0;
for ($i=0; $i<$num_words; $i++) {
- $font_name = $this->_get_font_name($driver, $i);
+ $font_name = $this->_get_font_name($viewport, $i);
- $current_width = $driver->stringwidth($this->words[$i],
+ $current_width = $viewport->stringwidth($this->words[$i],
$font_name,
$this->encodings[$i],
$font_size);
$this->_word_widths[] = $current_width;
// Add information about soft hyphens
- $this->_wrappable = array_merge($this->_wrappable, $this->_make_wrappable($driver, $width, $font_name, $font_size, $i));
+ $this->_wrappable = array_merge((array) $this->_wrappable, $this->_make_wrappable($viewport, $width, $font_name, $font_size, $i));
$width += $current_width;
- };
+ }
$this->width = $width;
} else {
$this->width = 0;
- };
+ }
- $letter_spacing = $this->get_css_property(CSS_LETTER_SPACING);
+ $letter_spacing = $this->getCSSProperty(CSS_LETTER_SPACING);
if ($letter_spacing->getPoints() != 0) {
$this->_widths = array();
@@ -421,24 +429,24 @@ function reflow_text(&$driver) {
$num_chars = strlen($this->words[$i]);
for ($j=0; $j<$num_chars; $j++) {
- $this->_widths[] = $driver->stringwidth($this->words[$i]{$j},
+ $this->_widths[] = $viewport->stringwidth($this->words[$i][$j],
$font_name,
$this->encodings[$i],
$font_size);
- };
+ }
$this->width += $letter_spacing->getPoints()*$num_chars;
- };
- };
+ }
+ }
return true;
}
- function show(&$driver) {
+ function show(&$viewport) {
/**
* Check if font-size have been set to 0; in this case we should not draw this box at all
*/
- $font_size = $this->get_css_property(CSS_FONT_SIZE);
+ $font_size = $this->getCSSProperty(CSS_FONT_SIZE);
if ($font_size->getPoints() == 0) {
return true;
}
@@ -449,14 +457,14 @@ function show(&$driver) {
// Get Y coordinate of the bottom edge of the box
$bottom = $this->get_bottom_margin();
- $top_inside = $top >= $driver->getPageBottom()-EPSILON;
- $bottom_inside = $bottom >= $driver->getPageBottom()-EPSILON;
+ $top_inside = $top >= $viewport->getPageBottom()-EPSILON;
+ $bottom_inside = $bottom >= $viewport->getPageBottom()-EPSILON;
if (!$top_inside && !$bottom_inside) {
return true;
}
- return $this->_showText($driver);
+ return $this->_showText($viewport);
}
function _showText(&$driver) {
@@ -464,23 +472,23 @@ function _showText(&$driver) {
return $this->_showTextWrapped($driver);
} else {
return $this->_showTextNormal($driver);
- };
+ }
}
function _showTextWrapped(&$driver) {
// draw generic box
parent::show($driver);
- $font_size = $this->get_css_property(CSS_FONT_SIZE);
+ $font_size = $this->getCSSProperty(CSS_FONT_SIZE);
- $decoration = $this->get_css_property(CSS_TEXT_DECORATION);
+ $decoration = $this->getCSSProperty(CSS_TEXT_DECORATION);
// draw text decoration
$driver->decoration($decoration['U'],
$decoration['O'],
$decoration['T']);
- $letter_spacing = $this->get_css_property(CSS_LETTER_SPACING);
+ $letter_spacing = $this->getCSSProperty(CSS_LETTER_SPACING);
// Output text with the selected font
// note that we're using $default_baseline;
@@ -491,7 +499,7 @@ function _showTextWrapped(&$driver) {
$left = $this->wrapped[1];
$top = $this->get_top() - $this->default_baseline;
- $num_words = count($this->words);
+ $num_words = count((array) $this->words);
/**
* First part of wrapped word (before hyphen)
@@ -504,13 +512,13 @@ function _showTextWrapped(&$driver) {
if (is_null($status)) {
error_log("TextBox::show: setfont call failed");
return null;
- };
+ }
$driver->show_xy($this->words[$i],
$left,
$this->wrapped[2] - $this->default_baseline);
$left += $this->_word_widths[$i];
- };
+ }
$index = $this->wrapped[0][0];
@@ -520,7 +528,7 @@ function _showTextWrapped(&$driver) {
if (is_null($status)) {
error_log("TextBox::show: setfont call failed");
return null;
- };
+ }
$driver->show_xy(substr($this->words[$index],0,$this->wrapped[0][1])."-",
$left,
@@ -536,7 +544,7 @@ function _showTextWrapped(&$driver) {
$left,
$top - $this->default_baseline);
- $size = count($this->words);
+ $size = count((array) $this->words);
for ($i = $this->wrapped[0][0]+1; $i<$size; $i++) {
// Activate font
$status = $driver->setfont($this->_get_font_name($driver, $i),
@@ -545,14 +553,14 @@ function _showTextWrapped(&$driver) {
if (is_null($status)) {
error_log("TextBox::show: setfont call failed");
return null;
- };
+ }
$driver->show_xy($this->words[$i],
$left,
$top - $this->default_baseline);
$left += $this->_word_widths[$i];
- };
+ }
return true;
}
@@ -561,16 +569,16 @@ function _showTextNormal(&$driver) {
// draw generic box
parent::show($driver);
- $font_size = $this->get_css_property(CSS_FONT_SIZE);
+ $font_size = $this->getCSSProperty(CSS_FONT_SIZE);
- $decoration = $this->get_css_property(CSS_TEXT_DECORATION);
+ $decoration = $this->getCSSProperty(CSS_TEXT_DECORATION);
// draw text decoration
$driver->decoration($decoration['U'],
$decoration['O'],
$decoration['T']);
- $letter_spacing = $this->get_css_property(CSS_LETTER_SPACING);
+ $letter_spacing = $this->getCSSProperty(CSS_LETTER_SPACING);
if ($letter_spacing->getPoints() == 0) {
// Output text with the selected font
@@ -578,7 +586,7 @@ function _showTextNormal(&$driver) {
// the alignment offset - the difference between baseline and default_baseline values
// is taken into account inside the get_top/get_bottom functions
//
- $size = count($this->words);
+ $size = count((array) $this->words);
$left = $this->get_left();
for ($i=0; $i<$size; $i++) {
@@ -589,20 +597,20 @@ function _showTextNormal(&$driver) {
if (is_null($status)) {
error_log("TextBox::show: setfont call failed");
return null;
- };
+ }
$driver->show_xy($this->words[$i],
$left,
$this->get_top() - $this->default_baseline);
$left += $this->_word_widths[$i];
- };
+ }
} else {
$current_char = 0;
$left = $this->get_left();
$top = $this->get_top() - $this->default_baseline;
- $num_words = count($this->words);
+ $num_words = count((array) $this->words);
for ($i=0; $i<$num_words; $i++) {
$num_chars = strlen($this->words[$i]);
@@ -612,25 +620,25 @@ function _showTextNormal(&$driver) {
$this->encodings[$i],
$font_size->getPoints());
- $driver->show_xy($this->words[$i]{$j}, $left, $top);
+ $driver->show_xy($this->words[$i][$j], $left, $top);
$left += $this->_widths[$current_char] + $letter_spacing->getPoints();
$current_char++;
- };
- };
- };
+ }
+ }
+ }
return true;
}
- function show_fixed(&$driver) {
- $font_size = $this->get_css_property(CSS_FONT_SIZE);
+ function show_fixed(&$viewport) {
+ $font_size = $this->getCSSProperty(CSS_FONT_SIZE);
// Check if font-size have been set to 0; in this case we should not draw this box at all
if ($font_size->getPoints() == 0) {
return true;
}
- return $this->_showText($driver);
+ return $this->_showText($viewport);
}
function offset($dx, $dy) {
@@ -641,7 +649,7 @@ function offset($dx, $dy) {
// wrapped and non-wrapped parts).
if (!is_null($this->wrapped)) {
$this->offset_wrapped($dx, $dy);
- };
+ }
}
function offset_wrapped($dx, $dy) {
diff --git a/public_html/box.text.string.php b/public_html/box.text.string.php
index 2b15762..93e51de 100644
--- a/public_html/box.text.string.php
+++ b/public_html/box.text.string.php
@@ -5,15 +5,15 @@
// instead of using globally visible functions in 'show'.
class TextBoxString extends TextBox {
- function &create($text, $encoding) {
- $box =& new TextBoxString($text, $encoding);
- $box->readCSS($pipeline->get_current_css_state());
+ function &create($text, $encoding, &$pipeline) {
+ $box= new TextBoxString($text, $encoding);
+ $box->readCSS($pipeline->getCurrentCSSState());
return $box;
}
- function TextBoxString($word, $encoding) {
+ function __construct($word, $encoding) {
// Call parent constructor
- $this->TextBox();
+ TextBox::__construct();
$this->add_subword($word, $encoding, array());
}
@@ -47,7 +47,7 @@ function get_min_width(&$context) {
return $this->width;
}
- function get_max_width(&$context) {
+ function get_max_width(&$context, $limit = 10000000) {
return $this->width;
}
diff --git a/public_html/box.utils.text-align.inc.php b/public_html/box.utils.text-align.inc.php
index d2252c3..729df96 100644
--- a/public_html/box.utils.text-align.inc.php
+++ b/public_html/box.utils.text-align.inc.php
@@ -8,29 +8,29 @@ function ta_left(&$box, &$context, $lastline) {
function ta_center(&$box, &$context, $lastline) {
$delta = $box->_line_length_delta($context) / 2;
- $size = count($box->_line);
+ $size = count((array) $box->_line);
for ($i=0; $i< $size; $i++) {
$box->_line[$i]->offset($delta, 0);
- };
+ }
$first_box =& $box->_line[0];
if (isset($first_box->wrapped) && !is_null($first_box->wrapped)) {
$first_box->offset_wrapped(-$delta, 0);
- };
+ }
}
function ta_right(&$box, &$context, $lastline) {
$delta = $box->_line_length_delta($context);
- $size = count($box->_line);
+ $size = count((array) $box->_line);
for ($i=0; $i<$size; $i++) {
$box->_line[$i]->offset($delta, 0);
- };
+ }
$first_box =& $box->_line[0];
if (isset($first_box->wrapped) && !is_null($first_box->wrapped)) {
$first_box->offset_wrapped(-$delta, 0);
- };
+ }
}
function ta_justify(&$box, &$context, $lastline) {
@@ -52,17 +52,17 @@ function ta_justify(&$box, &$context, $lastline) {
if (count($box->content) > 0) {
if ($box->content[0]->uid === $box->_line[0]->uid) {
$delta -= $box->text_indent->calculate($box);
- };
- };
+ }
+ }
// if line takes less that MAX_JUSTIFY_FRACTION of available space, no justtification should be done
if ($delta > $box->_line_length() * MAX_JUSTIFY_FRACTION) {
return;
- };
+ }
// Calculate offset for each whitespace box
$whitespace_count = 0;
- $size = count($box->_line);
+ $size = count((array) $box->_line);
// Why $size-1? Ignore whitespace box, if it is located at the very end of
// line box
@@ -71,18 +71,18 @@ function ta_justify(&$box, &$context, $lastline) {
for ($i=1; $i<$size-1; $i++) {
if (is_a($box->_line[$i],"WhitespaceBox")) {
$whitespace_count++;
- };
- };
+ }
+ }
if ($whitespace_count > 0) {
$offset = $delta / $whitespace_count;
} else {
$offset = 0;
- };
+ }
// Offset all boxes in current line box
$num_whitespaces = 0;
- $size = count($box->_line);
+ $size = count((array) $box->_line);
for ($i=1; $i < $size; $i++) {
/*
* Note that order is important: additional horizontal space
@@ -94,8 +94,8 @@ function ta_justify(&$box, &$context, $lastline) {
if (is_a($box->_line[$i],"WhitespaceBox")) {
$num_whitespaces++;
- };
- };
+ }
+ }
// The very first box is not offset in this case, so we don't need to
// call offset_wrapped to compensate this.
diff --git a/public_html/box.whitespace.php b/public_html/box.whitespace.php
index 9453951..b642392 100644
--- a/public_html/box.whitespace.php
+++ b/public_html/box.whitespace.php
@@ -2,9 +2,9 @@
// $Header: /cvsroot/html2ps/box.whitespace.php,v 1.33 2007/01/24 18:55:46 Konstantin Exp $
class WhitespaceBox extends TextBox {
- function &create(&$pipeline) {
- $box =& new WhitespaceBox();
- $box->readCSS($pipeline->get_current_css_state());
+ function &create($text, $encoding, &$pipeline) {
+ $box= new WhitespaceBox();
+ $box->readCSS($pipeline->getCurrentCSSState());
$box->add_subword(" ", 'iso-8859-1', array());
return $box;
}
@@ -46,20 +46,20 @@ function get_min_width(&$context) {
return $this->width;
}
- function get_max_width(&$context) {
+ function get_max_width(&$context, $limit = 10000000) {
return $this->width;
}
- function WhitespaceBox() {
+ function __construct() {
// Call parent constructor
- $this->TextBox();
+ TextBox::__construct();
}
// (!) SIDE EFFECT: current whitespace box can be replaced by a null box during reflow.
// callers of reflow should take this into account and possilby check for this
// after reflow returns. This can be detected by UID change.
//
- function reflow(&$parent, &$context) {
+ function reflow(&$parent, &$context, $boxes = null) {
// Check if there are any boxes in parent's line box
if ($parent->line_box_empty()) {
// The very first whitespace in the line box should not affect neither height nor baseline of the line box;
@@ -76,7 +76,7 @@ function reflow(&$parent, &$context) {
} elseif ($this->maybe_line_break($parent, $context)) {
$this->width = 0;
$this->height = 0;
- };
+ }
parent::reflow($parent, $context);
}
@@ -84,11 +84,11 @@ function reflow(&$parent, &$context) {
function reflow_text(&$driver) {
if (is_null(parent::reflow_text($driver))) {
return null;
- };
+ }
// Override widths
- $letter_spacing = $this->get_css_property(CSS_LETTER_SPACING);
- $word_spacing = $this->get_css_property(CSS_WORD_SPACING);
+ $letter_spacing = $this->getCSSProperty(CSS_LETTER_SPACING);
+ $word_spacing = $this->getCSSProperty(CSS_WORD_SPACING);
$this->width =
$this->height * WHITESPACE_FONT_SIZE_FRACTION +
@@ -102,16 +102,15 @@ function reflow_whitespace(&$linebox_started, &$previous_whitespace) {
if (!$linebox_started ||
($linebox_started && $previous_whitespace)) {
- $link_destination = $this->get_css_property(CSS_HTML2PS_LINK_DESTINATION);
- if (is_null($link_destination)) {
+ $link_destination = $this->getCSSProperty(CSS_HTML2PS_LINK_DESTINATION);
+ if ($link_destination == "") {
$this->parent->remove($this);
- return;
- };
-
- $this->font_height = 0.001;
- $this->height = 0;
- $this->width = 0;
- };
+ } else {
+ $this->font_height = 0.001;
+ $this->height = 0;
+ $this->width = 0;
+ }
+ }
$previous_whitespace = true;
@@ -119,4 +118,4 @@ function reflow_whitespace(&$linebox_started, &$previous_whitespace) {
// we could not modify a flag until we met a real text box
}
}
-?>
\ No newline at end of file
+?>
diff --git a/public_html/cache/.gitignore b/public_html/cache/.gitignore
new file mode 100644
index 0000000..156e2d9
--- /dev/null
+++ b/public_html/cache/.gitignore
@@ -0,0 +1 @@
+# add folder
\ No newline at end of file
diff --git a/public_html/cache/readme.txt b/public_html/cache/readme.txt
deleted file mode 100644
index e9bec3a..0000000
--- a/public_html/cache/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder should be writable.
\ No newline at end of file
diff --git a/public_html/classes/org/active-link/doc/DocHTML.php b/public_html/classes/org/active-link/doc/DocHTML.php
index 97824d7..1d3f18a 100644
--- a/public_html/classes/org/active-link/doc/DocHTML.php
+++ b/public_html/classes/org/active-link/doc/DocHTML.php
@@ -48,7 +48,7 @@ class DocHTML {
* Constructor, runs when new object instance is created, sets default values
* @method DocHTML
*/
- function DocHTML() {
+ function __construct() {
$this->CSSStringDefault = "
body {background-color: white;}
a {font-family: monospace;}
@@ -99,7 +99,7 @@ function getClassDocFromClass($objClass) {
$headXML->setTagContent($objClass->getInfo("name"), "head/title");
$headXML->setTagContent("", "head/meta");
$headXML->setTagAttribute("http-equiv", "content-type", "head/meta");
- $headXML->setTagAttribute("content", "text/html; charset=ISO-8859-1", "head/meta");
+ $headXML->setTagAttribute("content", "text/html; charset=UTF-8", "head/meta");
$headXML->setTagContent($this->CSSStringDefault, "head/style");
$headXML->setTagAttribute("type", "text/css", "head/style");
// ---------------------- BODY ---------------------- //
@@ -160,7 +160,7 @@ function getClassDocFromClass($objClass) {
$spanXMLName->setTagContent($methodName);
$spanXMLArgs = new XMLBranch("span");
$tagContentArgs = " ( ";
- if(is_array($method->params) && count($method->params) > 0) {
+ if(is_array($method->params) && count((array) $method->params) > 0) {
$paramCount = 0;
foreach($method->params as $key => $value) {
if($paramCount > 0)
@@ -198,7 +198,7 @@ function getClassDocFromClass($objClass) {
$bodyXML->addXMLBranch($pXML);
}
}
- if(is_array($method->params) && count($method->params) > 0) {
+ if(is_array($method->params) && count((array) $method->params) > 0) {
$pParamXML = new XMLBranch("p");
//$pParamXML->setTagAttribute("class", "param");
$paramTitleXML = new XMLBranch("span");
diff --git a/public_html/classes/org/active-link/doc/Method.php b/public_html/classes/org/active-link/doc/Method.php
index 171f493..7caff65 100644
--- a/public_html/classes/org/active-link/doc/Method.php
+++ b/public_html/classes/org/active-link/doc/Method.php
@@ -41,7 +41,7 @@ class Method {
* @method Method
* @param string name
*/
- function Method($name) {
+ function __construct($name) {
$this->info = array();
$this->params = array();
$this->setInfo("name", $name);
diff --git a/public_html/classes/org/active-link/doc/PHPClass.php b/public_html/classes/org/active-link/doc/PHPClass.php
index 8ad47e9..74a58ef 100644
--- a/public_html/classes/org/active-link/doc/PHPClass.php
+++ b/public_html/classes/org/active-link/doc/PHPClass.php
@@ -46,7 +46,7 @@ class PHPClass {
* @param optional string filename
* @returns none
*/
- function PHPClass($filename = "") {
+ function __construct($filename = "") {
$this->methods = array();
$this->properties = array();
$this->info = array();
diff --git a/public_html/classes/org/active-link/net/HTTPClient.php b/public_html/classes/org/active-link/net/HTTPClient.php
index 773fcd0..3a655a8 100644
--- a/public_html/classes/org/active-link/net/HTTPClient.php
+++ b/public_html/classes/org/active-link/net/HTTPClient.php
@@ -58,8 +58,8 @@ class HTTPClient extends Socket {
* @param string host
* @param optional int port
*/
- function HTTPClient($host, $port = 80) {
- $this->Socket($host, $port);
+ function __construct($host, $port = 80) {
+ Socket::__construct($host, $port);
$this->defaultRequestMethod = "GET";
$this->defaultRequestURI = "/";
$this->defaultRequestVersion = "HTTP/1.0";
diff --git a/public_html/classes/org/active-link/net/HTTPServer.php b/public_html/classes/org/active-link/net/HTTPServer.php
index b04f26a..23ad430 100644
--- a/public_html/classes/org/active-link/net/HTTPServer.php
+++ b/public_html/classes/org/active-link/net/HTTPServer.php
@@ -43,7 +43,7 @@ class HTTPServer extends Socket {
// protected properties
var $defaultServer;
- function HTTPServer () {
+ function __construct() {
$this->defaultServer = "ActiveLink NET Object/0.1";
}
diff --git a/public_html/classes/org/active-link/net/Socket.php b/public_html/classes/org/active-link/net/Socket.php
index 6baa9cd..2c92876 100644
--- a/public_html/classes/org/active-link/net/Socket.php
+++ b/public_html/classes/org/active-link/net/Socket.php
@@ -44,7 +44,7 @@ class Socket {
* @param host
* @param port
*/
- function Socket($host, $port) {
+ function __construct($host, $port) {
$this->host = $host;
$this->port = $port;
$this->connected = false;
diff --git a/public_html/classes/org/active-link/sys/File.php b/public_html/classes/org/active-link/sys/File.php
index 795ee62..f8c120f 100644
--- a/public_html/classes/org/active-link/sys/File.php
+++ b/public_html/classes/org/active-link/sys/File.php
@@ -51,7 +51,7 @@ class File {
* @param optional string filename
* @param optional string fileOpenMode
*/
- function File($filename = "", $fileOpenMode = "r") {
+ function __construct($filename = "", $fileOpenMode = "r") {
$success = true;
$this->filename = $filename;
$this->fileOpenMode = $fileOpenMode;
diff --git a/public_html/classes/org/active-link/xml/Leaf.php b/public_html/classes/org/active-link/xml/Leaf.php
index fdb9e14..8e87014 100644
--- a/public_html/classes/org/active-link/xml/Leaf.php
+++ b/public_html/classes/org/active-link/xml/Leaf.php
@@ -42,7 +42,7 @@ class Leaf {
* @param optional mixed value
* @returns none
*/
- function Leaf($value = "") {
+ function __construct($value = "") {
$this->setValue($value);
}
diff --git a/public_html/classes/org/active-link/xml/RSS.php b/public_html/classes/org/active-link/xml/RSS.php
index b5dfd28..a3464af 100644
--- a/public_html/classes/org/active-link/xml/RSS.php
+++ b/public_html/classes/org/active-link/xml/RSS.php
@@ -46,7 +46,7 @@ class RSS {
* @param string parseString
* @returns none
*/
- function RSS($parseString) {
+ function __construct($parseString) {
$this->xml = new XML($parseString);
$this->rootTags = array("rss", "rdf:RDF");
$this->itemBranches = array();
diff --git a/public_html/classes/org/active-link/xml/Tag.php b/public_html/classes/org/active-link/xml/Tag.php
index 3727eda..d7ed680 100644
--- a/public_html/classes/org/active-link/xml/Tag.php
+++ b/public_html/classes/org/active-link/xml/Tag.php
@@ -61,7 +61,7 @@ class Tag {
* @param optional string content
* @returns none
*/
- function Tag($name = "", $content = "") {
+ function __construct($name = "", $content = "") {
$this->tagStartOpen = "<";
$this->tagStartClose = ">";
$this->tagClose = "/>";
@@ -279,13 +279,13 @@ function setTagFromString($tagString) {
// search where tag name would end
// search for a space separator to account for attributes
$separatorPos = array();
- for($counter = 0; $counter < count($this->tagAttributeSeparators); $counter ++) {
+ for($counter = 0; $counter < count((array) $this->tagAttributeSeparators); $counter ++) {
$separatorPosTemp = strpos($tagString, $this->tagAttributeSeparators[$counter], $tagStartOpen);
if($separatorPosTemp !== false)
$separatorPos[] = $separatorPosTemp;
}
//$i = strpos($tagString, $this->tagAttributeSeparator, $tagStartOpen);
- if(count($separatorPos) > 0)
+ if (is_countable($separatorPos) && count($separatorPos) > 0)
$i = min($separatorPos);
else
$i = false;
diff --git a/public_html/classes/org/active-link/xml/Tree.php b/public_html/classes/org/active-link/xml/Tree.php
index e3466ac..29064c0 100644
--- a/public_html/classes/org/active-link/xml/Tree.php
+++ b/public_html/classes/org/active-link/xml/Tree.php
@@ -42,7 +42,7 @@ class Tree {
* @method Tree
* @returns none
*/
- function Tree() {
+ function __construct() {
$this->nodes = array();
}
diff --git a/public_html/classes/org/active-link/xml/XML.php b/public_html/classes/org/active-link/xml/XML.php
index 0d92ac7..8b1b0ab 100644
--- a/public_html/classes/org/active-link/xml/XML.php
+++ b/public_html/classes/org/active-link/xml/XML.php
@@ -50,9 +50,9 @@ class XML extends Tree {
* @param optional string argument
* @returns none
*/
- function XML($argument = "") {
+ function __construct($argument = "") {
$success = false;
- $this->Tree();
+ Tree::__construct();
$this->pathSeparator = "/";
$this->tag = new Tag();
if(is_string($argument)) {
@@ -139,7 +139,7 @@ function getBranches($tagPath = "", $tagName = "", $attrName = "", $attrValue =
$tagPath = $this->tag->getTagName();
$tags = explode($this->pathSeparator, $tagPath);
if($this->tag->getTagName() == $tags[0]) {
- if(count($tags) == 1) {
+ if (is_countable($tags) && count($tags) == 1) {
$arrKeys = array_keys($this->nodes);
for($index = 0; $index < count($arrKeys); $index ++) {
if(gettype($this->nodes[$arrKeys[$index]]) == "object" && strtolower(get_class($this->nodes[$arrKeys[$index]])) == "xmlbranch") {
@@ -165,7 +165,7 @@ function getBranches($tagPath = "", $tagName = "", $attrName = "", $attrValue =
}
}
}
- if(count($branchArray) == 0)
+ if (is_countable($branchArray) && count($branchArray) == 0)
$branchArray = false;
return $branchArray;
}
@@ -182,7 +182,7 @@ function getLeafs($tagPath = "") {
$tagPath = $this->tag->getTagName();
$tags = explode($this->pathSeparator, $tagPath);
if($this->tag->getTagName() == $tags[0]) {
- if(count($tags) == 1) {
+ if (is_countable($tags) && count($tags) == 1) {
$arrKeys = array_keys($this->nodes);
for($index = 0; $index < count($arrKeys); $index ++) {
if(gettype($this->nodes[$arrKeys[$index]]) == "object" && strtolower(get_class($this->nodes[$arrKeys[$index]])) == "xmlleaf") {
@@ -204,7 +204,7 @@ function getLeafs($tagPath = "") {
}
}
}
- if(count($leafArray) == 0)
+ if (is_countable($leafArray) && count($leafArray) == 0)
$leafArray = false;
return $leafArray;
}
@@ -436,7 +436,7 @@ function removeBranches($tagPath = "", $tagName = "", $attrName = "", $attrValue
$branchesDeleted = 0;
$referencedBranches = array();
$tags = explode($this->pathSeparator, $tagPath);
- if(count($tags) > 1) {
+ if (is_countable($tags) && count($tags) > 1) {
$parentTagName = array_pop($tags);
$parentTagPath = implode($this->pathSeparator, $tags);
$referencedBranches = $this->getBranches($parentTagPath, $parentTagName);
diff --git a/public_html/classes/org/active-link/xml/XMLDocument.php b/public_html/classes/org/active-link/xml/XMLDocument.php
index 0221785..87df5b9 100644
--- a/public_html/classes/org/active-link/xml/XMLDocument.php
+++ b/public_html/classes/org/active-link/xml/XMLDocument.php
@@ -54,8 +54,8 @@ class XMLDocument extends File {
* @param optional string filename
* @param optional string fileOpenMode
*/
- function XMLDocument($filename = "", $fileOpenMode = "r") {
- $success = $this->File($filename, $fileOpenMode);
+ function __construct($filename = "", $fileOpenMode = "r") {
+ $success = File::__construct($filename, $fileOpenMode);
$this->tag = new Tag();
$this->tag->tagStartOpen = "tag->tagClose = "?>";
diff --git a/public_html/classes/org/active-link/xml/XMLRPCClient.php b/public_html/classes/org/active-link/xml/XMLRPCClient.php
index c2af62d..290bbd8 100644
--- a/public_html/classes/org/active-link/xml/XMLRPCClient.php
+++ b/public_html/classes/org/active-link/xml/XMLRPCClient.php
@@ -53,8 +53,8 @@ class XMLRPCClient extends HTTPClient {
* @param string host
* @param optional int port
*/
- function XMLRPCClient($host, $port = 80) {
- $this->HTTPClient($host, $port);
+ function __construct($host, $port = 80) {
+ HTTPClient::__construct($host, $port);
$this->setRequestMethod("POST");
$this->addRequestHeaderRaw("Content-type: text/xml");
$this->xml = new XML("methodCall");
diff --git a/public_html/color.php b/public_html/color.php
new file mode 100644
index 0000000..09fae08
--- /dev/null
+++ b/public_html/color.php
@@ -0,0 +1,41 @@
+r = max($rgb[0] / 255.0, 0);
+ $this->g = max($rgb[1] / 255.0, 0);
+ $this->b = max($rgb[2] / 255.0, 0);
+ $this->transparent = $transparent;
+ }
+
+ function apply(&$viewport) {
+ $viewport->setrgbcolor($this->r, $this->g, $this->b);
+ }
+
+ function blend($color, $alpha) {
+ $this->r += ($color->r - $this->r)*$alpha;
+ $this->g += ($color->g - $this->g)*$alpha;
+ $this->b += ($color->b - $this->b)*$alpha;
+ }
+
+ function copy() {
+ $color = new Color();
+
+ $color->r = $this->r;
+ $color->g = $this->g;
+ $color->b = $this->b;
+ $color->transparent = $this->transparent;
+
+ return $color;
+ }
+
+ function equals($rgb) {
+ return
+ $this->r == $rgb->r &&
+ $this->g == $rgb->g &&
+ $this->b == $rgb->b;
+ }
+}
+?>
\ No newline at end of file
diff --git a/public_html/config.inc.php b/public_html/config.inc.php
index 7e262dc..e698ab9 100644
--- a/public_html/config.inc.php
+++ b/public_html/config.inc.php
@@ -1,5 +1,5 @@
node_type() == XML_ELEMENT_NODE) {
switch ($child->tagname()) {
case "normal":
- if ($root->has_attribute('name')) {
- $names = explode(',', $root->get_attribute('name'));
- foreach ($names as $name) {
- $resolver->add_normal_encoding_override($name,
- $child->get_attribute('normal'),
- $child->get_attribute('italic'),
- $child->get_attribute('oblique'));
- };
- };
-
- if ($root->has_attribute('mask')) {
- foreach ($names as $name) {
- $resolver->add_normal_encoding_override_mask($root->get_attribute('mask'),
- $child->get_attribute('normal'),
- $child->get_attribute('italic'),
- $child->get_attribute('oblique'));
- };
- };
-
+ $names = explode(',',$root->get_attribute('name'));
+ foreach ($names as $name) {
+ $resolver->add_normal_encoding_override($name,
+ $child->get_attribute('normal'),
+ $child->get_attribute('italic'),
+ $child->get_attribute('oblique'));
+ }
break;
case "bold":
- if ($root->has_attribute('name')) {
- $names = explode(',', $root->get_attribute('name'));
- foreach ($names as $name) {
- $resolver->add_bold_encoding_override($name,
- $child->get_attribute('normal'),
- $child->get_attribute('italic'),
- $child->get_attribute('oblique'));
- };
- };
-
- if ($root->has_attribute('mask')) {
- foreach ($names as $name) {
- $resolver->add_bold_encoding_override_mask($root->get_attribute('mask'),
- $child->get_attribute('normal'),
- $child->get_attribute('italic'),
- $child->get_attribute('oblique'));
- };
- };
-
+ $names = explode(',',$root->get_attribute('name'));
+ foreach ($names as $name) {
+ $resolver->add_bold_encoding_override($name,
+ $child->get_attribute('normal'),
+ $child->get_attribute('italic'),
+ $child->get_attribute('oblique'));
+ }
break;
- };
- };
+ }
+ }
} while ($child = $child->next_sibling());
}
@@ -72,21 +48,9 @@ function parse_metrics_node_config_file($root, &$resolver) {
}
function parse_ttf_node_config_file($root, &$resolver) {
- switch (FONT_EMBEDDING_MODE) {
- case 'all':
- $embed_flag = true;
- break;
- case 'none':
- $embed_flag = false;
- break;
- case 'config':
- $embed_flag = (bool)$root->get_attribute('embed');
- break;
- }
-
$resolver->add_ttf_mapping($root->get_attribute('typeface'),
$root->get_attribute('file'),
- $embed_flag);
+ (bool)$root->get_attribute('embed'));
}
function parse_family_encoding_override_node_config_file($family, $root, &$resolver) {
@@ -102,7 +66,7 @@ function parse_family_encoding_override_node_config_file($family, $root, &$resol
$child->get_attribute('normal'),
$child->get_attribute('italic'),
$child->get_attribute('oblique'));
- };
+ }
break;
case "bold":
$names = explode(",",$root->get_attribute('name'));
@@ -112,10 +76,10 @@ function parse_family_encoding_override_node_config_file($family, $root, &$resol
$child->get_attribute('normal'),
$child->get_attribute('italic'),
$child->get_attribute('oblique'));
- };
+ }
break;
- };
- };
+ }
+ }
} while ($child = $child->next_sibling());
}
@@ -141,8 +105,8 @@ function parse_fonts_family_node_config_file($root, &$resolver) {
case "encoding-override":
parse_family_encoding_override_node_config_file($font_family_name, $child, $resolver);
break;
- };
- };
+ }
+ }
} while ($child = $child->next_sibling());
}
@@ -152,7 +116,7 @@ function parse_fonts_node_config_file($root, &$resolver) {
if ($child->node_type() == XML_ELEMENT_NODE) {
switch ($child->tagname()) {
case "alias":
- $resolver->add_alias(strtolower($child->get_attribute('alias')), $child->get_attribute('family'));
+ $resolver->add_alias($child->get_attribute('alias'), $child->get_attribute('family'));
break;
case "family":
parse_fonts_family_node_config_file($child, $resolver);
@@ -166,22 +130,18 @@ function parse_fonts_node_config_file($root, &$resolver) {
case "metrics":
parse_metrics_node_config_file($child, $resolver);
break;
- };
- };
+ }
+ }
} while ($child = $child->next_sibling());
}
function parse_config_file($filename) {
- // Save old magic_quotes_runtime value and disable it
- $mq_runtime = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
-
- $doc = TreeBuilder::build(file_get_contents($filename));
+ $doc = (new TreeBuilder())->build(file_get_contents($filename));
$root=$doc->document_element();
$child = $root->first_child();
do {
- if ($child->node_type() == XML_ELEMENT_NODE) {
+ if (is_object($child) && $child->node_type() == XML_ELEMENT_NODE) {
switch ($child->tagname()) {
case "fonts":
global $g_font_resolver;
@@ -196,11 +156,8 @@ function parse_config_file($filename) {
(float)$child->get_attribute('height'),
(float)$child->get_attribute('width'));
break;
- };
- };
- } while ($child = $child->next_sibling());
-
- // Restore old magic_quotes_runtime values
- set_magic_quotes_runtime($mq_runtime);
+ }
+ }
+ } while ($child = is_object($child) ? $child->next_sibling() : null);
}
?>
\ No newline at end of file
diff --git a/public_html/content_type.class.php b/public_html/content_type.class.php
index ba4ac3e..ef8db85 100644
--- a/public_html/content_type.class.php
+++ b/public_html/content_type.class.php
@@ -3,7 +3,7 @@ class ContentType {
var $default_extension;
var $mime_type;
- function ContentType($extension, $mime) {
+ function __construct($extension = 'pdf', $mime = 'application/pdf') {
$this->default_extension = $extension;
$this->mime_type = $mime;
}
diff --git a/public_html/converter.class.php b/public_html/converter.class.php
index 6d1cf55..6489518 100644
--- a/public_html/converter.class.php
+++ b/public_html/converter.class.php
@@ -3,11 +3,11 @@
class Converter {
function create() {
-// if (function_exists('iconv')) {
-// return new IconvConverter;
-// } else {
+ if (function_exists('iconv')) {
+ return new IconvConverter;
+ } else {
return new PurePHPConverter;
-// }
+ }
}
}
@@ -34,24 +34,24 @@ function to_utf8($html, $encoding) {
$encoding = $this->apply_aliases($encoding);
if ($encoding === 'iso-8859-1') {
- return utf8_encode($html);
+ return $html;
} elseif ($encoding === 'utf-8') {
return $html;
} elseif(isset($g_utf8_converters[$encoding])) {
return $this->something_to_utf8($html, $g_utf8_converters[$encoding][0]);
} else {
die("Unsupported encoding detected: '$encoding'");
- };
+ }
}
function something_to_utf8($html, &$mapping) {
for ($i=0; $i < strlen($html); $i++) {
- $replacement = code_to_utf8($mapping[$html{$i}]);
- if ($replacement != $html{$i}) {
+ $replacement = code_to_utf8($mapping[$html[$i]]);
+ if ($replacement != $html[$i]) {
$html = substr_replace($html, $replacement, $i, 1);
$i += strlen($replacement) - 1;
- };
- };
+ }
+ }
return $html;
}
}
diff --git a/public_html/css.apply.inc.php b/public_html/css.apply.inc.php
new file mode 100644
index 0000000..93eeb83
--- /dev/null
+++ b/public_html/css.apply.inc.php
@@ -0,0 +1,98 @@
+push_base_url($baseurl);
+
+ foreach ($properties as $key => $value) {
+ switch ($key) {
+ case 'border':
+ css_border($value, $root);
+ break;
+ case 'border-color':
+ css_border_color($value, $root);
+ break;
+ case 'border-top':
+ css_border_top($value, $root);
+ break;
+ case 'border-right':
+ css_border_right($value, $root);
+ break;
+ case 'border-bottom':
+ css_border_bottom($value, $root);
+ break;
+ case 'border-left':
+ css_border_left($value, $root);
+ break;
+ case 'border-style':
+ css_border_style($value, $root);
+ break;
+ case 'border-top-style':
+ css_border_top_style($value, $root);
+ break;
+ case 'border-right-style':
+ css_border_right_style($value, $root);
+ break;
+ case 'border-bottom-style':
+ css_border_bottom_style($value, $root);
+ break;
+ case 'border-left-style':
+ css_border_left_style($value, $root);
+ break;
+ case 'border-top-color':
+ css_border_top_color($value, $root);
+ break;
+ case 'border-right-color':
+ css_border_right_color($value, $root);
+ break;
+ case 'border-bottom-color':
+ css_border_bottom_color($value, $root);
+ break;
+ case 'border-left-color':
+ css_border_left_color($value, $root);
+ break;
+ case 'border-width':
+ css_border_width($value, $root);
+ break;
+ case 'border-top-width':
+ css_border_top_width($value, $root);
+ break;
+ case 'border-right-width':
+ css_border_right_width($value, $root);
+ break;
+ case 'border-bottom-width':
+ css_border_bottom_width($value, $root);
+ break;
+ case 'border-left-width':
+ css_border_left_width($value, $root);
+ break;
+ case 'font':
+ css_font($value, $root);
+ break;
+ case 'font-family':
+ css_font_family($value, $root);
+ break;
+ case 'font-size':
+ css_font_size($value, $root);
+ break;
+ case 'font-style':
+ css_font_style($value, $root);
+ break;
+ case 'font-weight':
+ css_font_weight($value, $root);
+ break;
+ case 'line-height':
+ css_line_height($value, $root);
+ break;
+ default:
+ $handler =& get_css_handler($key);
+ if ($handler) {
+ $handler->replace($value, $pipeline);
+ }
+ break;
+ }
+ }
+
+ $pipeline->pop_base_url();
+}
+
+?>
diff --git a/public_html/css.background.attachment.inc.php b/public_html/css.background.attachment.inc.php
index 82bf94b..69f904f 100644
--- a/public_html/css.background.attachment.inc.php
+++ b/public_html/css.background.attachment.inc.php
@@ -19,7 +19,7 @@ function default_value() {
function &parse($value_string) {
if ($value_string === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
if (preg_match('/\bscroll\b/', $value_string)) {
$value = BACKGROUND_ATTACHMENT_SCROLL;
@@ -27,7 +27,7 @@ function &parse($value_string) {
$value = BACKGROUND_ATTACHMENT_FIXED;
} else {
$value = BACKGROUND_ATTACHMENT_SCROLL;
- };
+ }
return $value;
}
diff --git a/public_html/css.background.color.inc.php b/public_html/css.background.color.inc.php
index e8f9bf4..77c45a1 100644
--- a/public_html/css.background.color.inc.php
+++ b/public_html/css.background.color.inc.php
@@ -4,11 +4,11 @@
// 'background-color' and color part of 'background' CSS properies handler
class CSSBackgroundColor extends CSSSubFieldProperty {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BACKGROUND_COLOR;
}
- function get_property_name() {
+ function getPropertyName() {
return 'background-color';
}
@@ -26,7 +26,7 @@ function parse($value) {
//
// As whitespace could be preceeded by another whitespace, we should prevent breaking
// value in the middle of long whitespace too
- $terms = preg_split('/(?default_value();
}
function get_visible_background_color() {
$owner =& $this->owner();
- for ($i=0, $size = count($owner->_stack); $i<$size; $i++) {
+ for ($i=0, $size = count((array) $owner->_stack); $i<$size; $i++) {
if ($owner->_stack[$i][0]->color[0] >= 0) {
return $owner->_stack[$i][0]->color;
- };
- };
+ }
+ }
return array(255,255,255);
}
}
diff --git a/public_html/css.background.image.inc.php b/public_html/css.background.image.inc.php
index c875ffe..527835f 100644
--- a/public_html/css.background.image.inc.php
+++ b/public_html/css.background.image.inc.php
@@ -2,11 +2,11 @@
// $Header: /cvsroot/html2ps/css.background.image.inc.php,v 1.16 2006/07/09 09:07:44 Konstantin Exp $
class CSSBackgroundImage extends CSSSubFieldProperty {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BACKGROUND_IMAGE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'background-image';
}
@@ -17,24 +17,24 @@ function default_value() {
function parse($value, &$pipeline) {
global $g_config;
if (!$g_config['renderimages']) {
- return CSSBackgroundImage::default_value();
- };
+ return (new CSSBackgroundImage())->default_value();
+ }
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
}
-
+
// 'url' value
if (preg_match("/url\((.*[^\\\\]?)\)/is",$value,$matches)) {
$url = $matches[1];
$full_url = $pipeline->guess_url(css_remove_value_quotes($url));
return new BackgroundImage($full_url,
- ImageFactory::get($full_url, $pipeline));
+ (new Image())->get($full_url, $pipeline));
}
// 'none' and unrecognzed values
- return CSSBackgroundImage::default_value();
+ return (new CSSBackgroundImage())->default_value();
}
}
diff --git a/public_html/css.background.inc.php b/public_html/css.background.inc.php
index 997de6c..f31c4ca 100644
--- a/public_html/css.background.inc.php
+++ b/public_html/css.background.inc.php
@@ -1,27 +1,28 @@
default_value = new Background(CSSBackgroundColor::default_value(),
- CSSBackgroundImage::default_value(),
- CSSBackgroundRepeat::default_value(),
- CSSBackgroundPosition::default_value(),
- CSSBackgroundAttachment::default_value());
+ function __construct() {
+ $this->default_value = new Background(
+ (new CSSBackgroundColor())->default_value(),
+ (new CSSBackgroundImage())->default_value(),
+ (new CSSBackgroundRepeat())->default_value(),
+ (new CSSBackgroundPosition())->default_value()
+ );
- $this->CSSPropertyHandler(true, false);
+ CSSPropertyHandler::__construct(true, false);
}
function inherit($state, &$new_state) {
@@ -42,11 +43,10 @@ function parse($value, &$pipeline) {
return CSS_PROPERTY_INHERIT;
}
- $background = new Background(CSSBackgroundColor::parse($value),
- CSSBackgroundImage::parse($value, $pipeline),
- CSSBackgroundRepeat::parse($value),
- CSSBackgroundPosition::parse($value),
- CSSBackgroundAttachment::parse($value));
+ $background = new Background((new CSSBackgroundColor())->parse($value),
+ (new CSSBackgroundImage())->parse($value, $pipeline),
+ (new CSSBackgroundRepeat())->parse($value),
+ (new CSSBackgroundPosition())->parse($value));
return $background;
}
@@ -54,11 +54,10 @@ function parse($value, &$pipeline) {
$bg = new CSSBackground;
-CSS::register_css_property($bg);
-CSS::register_css_property(new CSSBackgroundColor($bg, '_color'));
-CSS::register_css_property(new CSSBackgroundImage($bg, '_image'));
-CSS::register_css_property(new CSSBackgroundRepeat($bg, '_repeat'));
-CSS::register_css_property(new CSSBackgroundPosition($bg, '_position'));
-CSS::register_css_property(new CSSBackgroundAttachment($bg, '_attachment'));
+(new CSS())->register_css_property($bg);
+(new CSS())->register_css_property(new CSSBackgroundColor($bg, '_color'));
+(new CSS())->register_css_property(new CSSBackgroundImage($bg, '_image'));
+(new CSS())->register_css_property(new CSSBackgroundRepeat($bg, '_repeat'));
+(new CSS())->register_css_property(new CSSBackgroundPosition($bg, '_position'));
?>
\ No newline at end of file
diff --git a/public_html/css.background.position.inc.php b/public_html/css.background.position.inc.php
index 9ee3c9d..6426435 100644
--- a/public_html/css.background.position.inc.php
+++ b/public_html/css.background.position.inc.php
@@ -12,11 +12,11 @@
define('BG_POSITION_SUBVALUE_TYPE_VERT',2);
class CSSBackgroundPosition extends CSSSubFieldProperty {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BACKGROUND_POSITION;
}
- function get_property_name() {
+ function getPropertyName() {
return 'background-position';
}
@@ -29,32 +29,32 @@ function build_subvalue($value) {
if ($value === "left" ||
$value === "top") {
return array(0, true);
- };
+ }
if ($value === "right" ||
$value === "bottom") {
return array(100, true);
- };
+ }
if ($value === "center") {
return array(50, true);
- };
+ }
if (substr($value, strlen($value)-1,1) === "%") {
return array((int)$value, true);
} else {
return array($value, false);
- };
+ }
}
function build_value($x, $y) {
- return array(CSSBackgroundPosition::build_subvalue($x),
- CSSBackgroundPosition::build_subvalue($y));
+ return array((new CSSBackgroundPosition())->build_subvalue($x),
+ (new CSSBackgroundPosition())->build_subvalue($y));
}
function detect_type($value) {
- if ($value === "left" || $value === "right") { return BG_POSITION_SUBVALUE_TYPE_HORZ; };
- if ($value === "top" || $value === "bottom") { return BG_POSITION_SUBVALUE_TYPE_VERT; };
+ if ($value === "left" || $value === "right") { return BG_POSITION_SUBVALUE_TYPE_HORZ; }
+ if ($value === "top" || $value === "bottom") { return BG_POSITION_SUBVALUE_TYPE_VERT; }
return null;
}
@@ -65,32 +65,32 @@ function parse_in($value) {
$x = $matches[1];
$y = $matches[2];
- $type_x = CSSBackgroundPosition::detect_type($x);
- $type_y = CSSBackgroundPosition::detect_type($y);
+ $type_x = (new CSSBackgroundPosition())->detect_type($x);
+ $type_y = (new CSSBackgroundPosition())->detect_type($y);
if (is_null($type_x) && is_null($type_y)) {
- return CSSBackgroundPosition::build_value($x,$y);
- };
+ return (new CSSBackgroundPosition())->build_value($x,$y);
+ }
if ($type_x == BG_POSITION_SUBVALUE_TYPE_HORZ ||
$type_y == BG_POSITION_SUBVALUE_TYPE_VERT) {
- return CSSBackgroundPosition::build_value($x,$y);
- };
+ return (new CSSBackgroundPosition())->build_value($x,$y);
+ }
- return CSSBackgroundPosition::build_value($y,$x);
- };
+ return (new CSSBackgroundPosition())->build_value($y,$x);
+ }
// These values should be processed separately at lastt
- if (preg_match("/\b(top)\b/",$value)) { return array(array(50, true), array(0, true)); };
- if (preg_match("/\b(center)\b/",$value)) { return array(array(50, true), array(50, true)); };
- if (preg_match("/\b(bottom)\b/",$value)) { return array(array(50, true), array(100, true)); };
- if (preg_match("/\b(left)\b/",$value)) { return array(array(0, true), array(50, true)); };
- if (preg_match("/\b(right)\b/",$value)) { return array(array(100, true), array(50, true)); };
+ if (preg_match("/\b(top)\b/",$value)) { return array(array(50, true), array(0, true)); }
+ if (preg_match("/\b(center)\b/",$value)) { return array(array(50, true), array(50, true)); }
+ if (preg_match("/\b(bottom)\b/",$value)) { return array(array(50, true), array(100, true)); }
+ if (preg_match("/\b(left)\b/",$value)) { return array(array(0, true), array(50, true)); }
+ if (preg_match("/\b(right)\b/",$value)) { return array(array(100, true), array(50, true)); }
if (preg_match("/".LENGTH_REGEXP."|".PERCENTAGE_REGEXP."/", $value, $matches)) {
$x = $matches[0];
- return CSSBackgroundPosition::build_value($x,"50%");
- };
+ return (new CSSBackgroundPosition())->build_value($x,"50%");
+ }
return null;
}
@@ -98,11 +98,11 @@ function parse_in($value) {
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
- $value = CSSBackgroundPosition::parse_in($value);
- return new BackgroundPosition($value[0][0], $value[0][1],
- $value[1][0], $value[1][1]);
+ $value = (new CSSBackgroundPosition())->parse_in($value);
+ return new BackgroundPosition($value[0][0] ?? 0, $value[0][1] ?? 0,
+ $value[1][0] ?? 0, $value[1][1] ?? 0);
}
}
?>
\ No newline at end of file
diff --git a/public_html/css.background.repeat.inc.php b/public_html/css.background.repeat.inc.php
index 8d0852d..79cafc3 100644
--- a/public_html/css.background.repeat.inc.php
+++ b/public_html/css.background.repeat.inc.php
@@ -7,11 +7,11 @@
define('BR_NO_REPEAT',3);
class CSSBackgroundRepeat extends CSSSubFieldProperty {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BACKGROUND_REPEAT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'background-repeat';
}
@@ -32,11 +32,11 @@ function parse($value) {
// to avoid these problems, we'll add spaced to the beginning and to the end of value,
// and will search for space-padded values, instead of raw substrings
$value = " ".$value." ";
- if (strpos($value, ' repeat-x ') !== false) { return BR_REPEAT_X; };
- if (strpos($value, ' repeat-y ') !== false) { return BR_REPEAT_Y; };
- if (strpos($value, ' no-repeat ') !== false) { return BR_NO_REPEAT; };
- if (strpos($value, ' repeat ') !== false) { return BR_REPEAT; };
- return CSSBackgroundRepeat::default_value();
+ if (strpos($value, ' repeat-x ') !== false) { return BR_REPEAT_X; }
+ if (strpos($value, ' repeat-y ') !== false) { return BR_REPEAT_Y; }
+ if (strpos($value, ' no-repeat ') !== false) { return BR_NO_REPEAT; }
+ if (strpos($value, ' repeat ') !== false) { return BR_REPEAT; }
+ return (new CSSBackgroundRepeat())->default_value();
}
}
diff --git a/public_html/css.border.bottom.color.inc.php b/public_html/css.border.bottom.color.inc.php
index 437db74..9810879 100644
--- a/public_html/css.border.bottom.color.inc.php
+++ b/public_html/css.border.bottom.color.inc.php
@@ -2,24 +2,24 @@
// $Header: /cvsroot/html2ps/css.border.bottom.color.inc.php,v 1.2 2006/11/16 03:32:56 Konstantin Exp $
class CSSBorderBottomColor extends CSSSubProperty {
- function CSSBorderBottomColor(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$owner_value->bottom->setColor($value);
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
$value = $owner_value->bottom->color->copy();
return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_BOTTOM_COLOR;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-bottom-color';
}
diff --git a/public_html/css.border.bottom.inc.php b/public_html/css.border.bottom.inc.php
index 36aa493..d5557f2 100644
--- a/public_html/css.border.bottom.inc.php
+++ b/public_html/css.border.bottom.inc.php
@@ -2,20 +2,20 @@
// $Header: /cvsroot/html2ps/css.border.bottom.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderBottom extends CSSSubFieldProperty {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_BOTTOM;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-bottom';
}
function parse($value) {
if ($value == 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
- $border = CSSBorder::parse($value);
+ $border = (new CSSBorder())->parse($value);
return $border->bottom;
}
}
diff --git a/public_html/css.border.bottom.style.inc.php b/public_html/css.border.bottom.style.inc.php
index d0a1165..4d18149 100644
--- a/public_html/css.border.bottom.style.inc.php
+++ b/public_html/css.border.bottom.style.inc.php
@@ -2,23 +2,23 @@
// $Header: /cvsroot/html2ps/css.border.bottom.style.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderBottomStyle extends CSSSubProperty {
- function CSSBorderBottomStyle(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$owner_value->bottom->style = $value;
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->bottom->style;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_BOTTOM_STYLE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-bottom-style';
}
diff --git a/public_html/css.border.bottom.width.inc.php b/public_html/css.border.bottom.width.inc.php
index dd5afe7..e5c5432 100644
--- a/public_html/css.border.bottom.width.inc.php
+++ b/public_html/css.border.bottom.width.inc.php
@@ -2,27 +2,27 @@
// $Header: /cvsroot/html2ps/css.border.bottom.width.inc.php,v 1.2 2007/02/04 17:08:18 Konstantin Exp $
class CSSBorderBottomWidth extends CSSSubProperty {
- function CSSBorderBottomWidth(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
if ($value != CSS_PROPERTY_INHERIT) {
$owner_value->bottom->width = $value->copy();
} else {
$owner_value->bottom->width = $value;
- };
+ }
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->bottom->width;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_BOTTOM_WIDTH;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-bottom-width';
}
@@ -31,7 +31,7 @@ function parse($value) {
return CSS_PROPERTY_INHERIT;
}
- $width_handler = CSS::get_handler(CSS_BORDER_WIDTH);
+ $width_handler = (new CSS())->get_handler(CSS_BORDER_WIDTH);
$width = $width_handler->parse_value($value);
return $width;
}
diff --git a/public_html/css.border.collapse.inc.php b/public_html/css.border.collapse.inc.php
index 346f81e..1ed07c4 100644
--- a/public_html/css.border.collapse.inc.php
+++ b/public_html/css.border.collapse.inc.php
@@ -5,8 +5,8 @@
define('BORDER_SEPARATE', 2);
class CSSBorderCollapse extends CSSPropertyStringSet {
- function CSSBorderCollapse() {
- $this->CSSPropertyStringSet(true,
+ function __construct() {
+ CSSPropertyStringSet::__construct(true,
true,
array('inherit' => CSS_PROPERTY_INHERIT,
'collapse' => BORDER_COLLAPSE,
@@ -17,15 +17,15 @@ function default_value() {
return BORDER_SEPARATE;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_COLLAPSE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-collapse';
}
}
-CSS::register_css_property(new CSSBorderCollapse);
+(new CSS())->register_css_property(new CSSBorderCollapse);
?>
\ No newline at end of file
diff --git a/public_html/css.border.color.inc.php b/public_html/css.border.color.inc.php
index 5759826..a9e797f 100644
--- a/public_html/css.border.color.inc.php
+++ b/public_html/css.border.color.inc.php
@@ -6,8 +6,8 @@
class CSSBorderColor extends CSSSubProperty {
var $_defaultValue;
- function CSSBorderColor(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
$this->_defaultValue = new BorderColor(new Color(array(0,0,0), true),
new Color(array(0,0,0), true),
@@ -15,7 +15,7 @@ function CSSBorderColor(&$owner) {
new Color(array(0,0,0), true));
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
if ($value != CSS_PROPERTY_INHERIT) {
$owner_value->top->setColor($value->top);
$owner_value->right->setColor($value->right);
@@ -26,21 +26,21 @@ function set_value(&$owner_value, &$value) {
$owner_value->right->setColor(CSS_PROPERTY_INHERIT);
$owner_value->bottom->setColor(CSS_PROPERTY_INHERIT);
$owner_value->left->setColor(CSS_PROPERTY_INHERIT);
- };
+ }
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return new BorderColor($owner_value->top->color,
$owner_value->right->color,
$owner_value->bottom->color,
$owner_value->left->color);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_COLOR;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-color';
}
@@ -72,7 +72,7 @@ function parse_in($value) {
return array($v1, $v2, $v3, $v4);
default:
return $this->default_value();
- };
+ }
}
function parse($value) {
diff --git a/public_html/css.border.inc.php b/public_html/css.border.inc.php
index f869057..96c6232 100644
--- a/public_html/css.border.inc.php
+++ b/public_html/css.border.inc.php
@@ -36,19 +36,19 @@
class CSSBorder extends CSSPropertyHandler {
var $_defaultValue;
- function CSSBorder() {
- $this->CSSPropertyHandler(false, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
- $this->_defaultValue = BorderPDF::create(array('top' => array('width' => Value::fromString('2px'),
+ $this->_defaultValue = (new BorderPDF())->create(array('top' => array('width' => (new Value())->fromString('2px'),
'color' => array(0,0,0),
'style' => BS_NONE),
- 'right' => array('width' => Value::fromString('2px'),
+ 'right' => array('width' => (new Value())->fromString('2px'),
'color' => array(0,0,0),
'style' => BS_NONE),
- 'bottom' => array('width' => Value::fromString('2px'),
+ 'bottom' => array('width' => (new Value())->fromString('2px'),
'color' => array(0,0,0),
'style' => BS_NONE),
- 'left' => array('width' => Value::fromString('2px'),
+ 'left' => array('width' => (new Value())->fromString('2px'),
'color' => array(0,0,0),
'style' => BS_NONE)));
}
@@ -60,7 +60,7 @@ function default_value() {
function parse($value) {
if ($value == 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
// Remove spaces between color values in rgb() color definition; this will allow us to tread
// this declaration as a single value
@@ -71,81 +71,81 @@ function parse($value) {
$subvalues = explode(" ", $value);
- $border = CSS::getDefaultValue(CSS_BORDER);
+ $border = (new CSS())->getDefaultValue(CSS_BORDER);
foreach ($subvalues as $subvalue) {
$subvalue = trim(strtolower($subvalue));
- switch (CSSBorder::detect_border_value_type($subvalue)) {
+ switch ((new CSSBorder())->detect_border_value_type($subvalue)) {
case BORDER_VALUE_COLOR:
- $color_handler = CSS::get_handler(CSS_BORDER_COLOR);
+ $color_handler = (new CSS())->get_handler(CSS_BORDER_COLOR);
$border_color = $color_handler->parse($subvalue);
- $color_handler->set_value($border, $border_color);
+ $color_handler->setValue($border, $border_color);
break;
case BORDER_VALUE_WIDTH:
- $width_handler = CSS::get_handler(CSS_BORDER_WIDTH);
+ $width_handler = (new CSS())->get_handler(CSS_BORDER_WIDTH);
$border_width = $width_handler->parse($subvalue);
- $width_handler->set_value($border, $border_width);
+ $width_handler->setValue($border, $border_width);
break;
case BORDER_VALUE_STYLE:
- $style_handler = CSS::get_handler(CSS_BORDER_STYLE);
+ $style_handler = (new CSS())->get_handler(CSS_BORDER_STYLE);
$border_style = $style_handler->parse($subvalue);
- $style_handler->set_value($border, $border_style);
+ $style_handler->setValue($border, $border_style);
break;
- };
- };
+ }
+ }
return $border;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border';
}
function detect_border_value_type($value) {
$color = _parse_color_declaration($value, $success);
- if ($success) { return BORDER_VALUE_COLOR; };
+ if ($success) { return BORDER_VALUE_COLOR; }
-// if (preg_match("/\b(transparent|black|silver|gray|white|maroon|red|purple|fuchsia|green|lime|olive|yellow|navy|blue|teal|aqua|rgb(.*?))\b/i",$value)) { return BORDER_VALUE_COLOR; };
+// if (preg_match("/\b(transparent|black|silver|gray|white|maroon|red|purple|fuchsia|green|lime|olive|yellow|navy|blue|teal|aqua|rgb(.*?))\b/i",$value)) { return BORDER_VALUE_COLOR; }
// // We must detect hecadecimal values separately, as #-sign will not match the \b metacharacter at the beginning of previous regexp
-// if (preg_match("/#([[:xdigit:]]{3}|[[:xdigit:]]{6})\b/i",$value)) { return BORDER_VALUE_COLOR; };
+// if (preg_match("/#([[:xdigit:]]{3}|[[:xdigit:]]{6})\b/i",$value)) { return BORDER_VALUE_COLOR; }
// Note that unit name is in general not required, so that we can meet rule like "border: 0" in CSS!
- if (preg_match("/\b(thin|medium|thick|[+-]?\d+(.\d*)?(em|ex|px|in|cm|mm|pt|pc)?)\b/i",$value)) { return BORDER_VALUE_WIDTH; };
- if (preg_match("/\b(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset)\b/",$value)) { return BORDER_VALUE_STYLE; };
+ if (preg_match("/\b(thin|medium|thick|[+-]?\d+(.\d*)?(em|ex|px|in|cm|mm|pt|pc)?)\b/i",$value)) { return BORDER_VALUE_WIDTH; }
+ if (preg_match("/\b(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset)\b/",$value)) { return BORDER_VALUE_STYLE; }
return;
}
}
$border = new CSSBorder();
-CSS::register_css_property($border);
-
-CSS::register_css_property(new CSSBorderColor($border));
-CSS::register_css_property(new CSSBorderWidth($border));
-CSS::register_css_property(new CSSBorderStyle($border));
-
-CSS::register_css_property(new CSSBorderTop($border, 'top'));
-CSS::register_css_property(new CSSBorderRight($border, 'right'));
-CSS::register_css_property(new CSSBorderBottom($border, 'bottom'));
-CSS::register_css_property(new CSSBorderLeft($border, 'left'));
-
-CSS::register_css_property(new CSSBorderLeftColor($border));
-CSS::register_css_property(new CSSBorderTopColor($border));
-CSS::register_css_property(new CSSBorderRightColor($border));
-CSS::register_css_property(new CSSBorderBottomColor($border));
-
-CSS::register_css_property(new CSSBorderLeftStyle($border));
-CSS::register_css_property(new CSSBorderTopStyle($border));
-CSS::register_css_property(new CSSBorderRightStyle($border));
-CSS::register_css_property(new CSSBorderBottomStyle($border));
-
-CSS::register_css_property(new CSSBorderLeftWidth($border));
-CSS::register_css_property(new CSSBorderTopWidth($border));
-CSS::register_css_property(new CSSBorderRightWidth($border));
-CSS::register_css_property(new CSSBorderBottomWidth($border));
+(new CSS())->register_css_property($border);
+
+(new CSS())->register_css_property(new CSSBorderColor($border));
+(new CSS())->register_css_property(new CSSBorderWidth($border));
+(new CSS())->register_css_property(new CSSBorderStyle($border));
+
+(new CSS())->register_css_property(new CSSBorderTop($border, 'top'));
+(new CSS())->register_css_property(new CSSBorderRight($border, 'right'));
+(new CSS())->register_css_property(new CSSBorderBottom($border, 'bottom'));
+(new CSS())->register_css_property(new CSSBorderLeft($border, 'left'));
+
+(new CSS())->register_css_property(new CSSBorderLeftColor($border));
+(new CSS())->register_css_property(new CSSBorderTopColor($border));
+(new CSS())->register_css_property(new CSSBorderRightColor($border));
+(new CSS())->register_css_property(new CSSBorderBottomColor($border));
+
+(new CSS())->register_css_property(new CSSBorderLeftStyle($border));
+(new CSS())->register_css_property(new CSSBorderTopStyle($border));
+(new CSS())->register_css_property(new CSSBorderRightStyle($border));
+(new CSS())->register_css_property(new CSSBorderBottomStyle($border));
+
+(new CSS())->register_css_property(new CSSBorderLeftWidth($border));
+(new CSS())->register_css_property(new CSSBorderTopWidth($border));
+(new CSS())->register_css_property(new CSSBorderRightWidth($border));
+(new CSS())->register_css_property(new CSSBorderBottomWidth($border));
?>
\ No newline at end of file
diff --git a/public_html/css.border.left.color.inc.php b/public_html/css.border.left.color.inc.php
index 44c3e05..b9b205a 100644
--- a/public_html/css.border.left.color.inc.php
+++ b/public_html/css.border.left.color.inc.php
@@ -2,23 +2,23 @@
// $Header: /cvsroot/html2ps/css.border.left.color.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderLeftColor extends CSSSubProperty {
- function CSSBorderLeftColor(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$owner_value->left->setColor($value);
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->left->color->copy();
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_LEFT_COLOR;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-left-color';
}
diff --git a/public_html/css.border.left.inc.php b/public_html/css.border.left.inc.php
index 5c4d138..b46a366 100644
--- a/public_html/css.border.left.inc.php
+++ b/public_html/css.border.left.inc.php
@@ -2,20 +2,20 @@
// $Header: /cvsroot/html2ps/css.border.left.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderLeft extends CSSSubFieldProperty {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_LEFT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-left';
}
function parse($value) {
if ($value == 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
- $border = CSSBorder::parse($value);
+ $border = (new CSSBorder())->parse($value);
return $border->left;
}
}
diff --git a/public_html/css.border.left.style.inc.php b/public_html/css.border.left.style.inc.php
index 2abd0cc..d62e531 100644
--- a/public_html/css.border.left.style.inc.php
+++ b/public_html/css.border.left.style.inc.php
@@ -2,23 +2,23 @@
// $Header: /cvsroot/html2ps/css.border.left.style.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderLeftStyle extends CSSSubProperty {
- function CSSBorderLeftStyle(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$owner_value->left->style = $value;
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->left->style;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_LEFT_STYLE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-left-style';
}
diff --git a/public_html/css.border.left.width.inc.php b/public_html/css.border.left.width.inc.php
index ee060ca..3a5be84 100644
--- a/public_html/css.border.left.width.inc.php
+++ b/public_html/css.border.left.width.inc.php
@@ -2,27 +2,27 @@
// $Header: /cvsroot/html2ps/css.border.left.width.inc.php,v 1.2 2007/02/04 17:08:18 Konstantin Exp $
class CSSBorderLeftWidth extends CSSSubProperty {
- function CSSBorderLeftWidth(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
if ($value != CSS_PROPERTY_INHERIT) {
$owner_value->left->width = $value->copy();
} else {
$owner_value->left->width = $value;
- };
+ }
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->left->width;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_LEFT_WIDTH;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-left-width';
}
@@ -31,7 +31,7 @@ function parse($value) {
return CSS_PROPERTY_INHERIT;
}
- $width_handler = CSS::get_handler(CSS_BORDER_WIDTH);
+ $width_handler = (new CSS())->get_handler(CSS_BORDER_WIDTH);
$width = $width_handler->parse_value($value);
return $width;
}
diff --git a/public_html/css.border.right.color.inc.php b/public_html/css.border.right.color.inc.php
index fbc8a0c..8aebf4c 100644
--- a/public_html/css.border.right.color.inc.php
+++ b/public_html/css.border.right.color.inc.php
@@ -2,23 +2,23 @@
// $Header: /cvsroot/html2ps/css.border.right.color.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderRightColor extends CSSSubProperty {
- function CSSBorderRightColor(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$owner_value->right->setColor($value);
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->right->color->copy();
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_RIGHT_COLOR;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-right-color';
}
diff --git a/public_html/css.border.right.inc.php b/public_html/css.border.right.inc.php
index 70eeb0a..454a53c 100644
--- a/public_html/css.border.right.inc.php
+++ b/public_html/css.border.right.inc.php
@@ -2,20 +2,20 @@
// $Header: /cvsroot/html2ps/css.border.right.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderRight extends CSSSubFieldProperty {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_RIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-right';
}
function parse($value) {
if ($value == 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
- $border = CSSBorder::parse($value);
+ $border = (new CSSBorder())->parse($value);
return $border->right;
}
}
diff --git a/public_html/css.border.right.style.inc.php b/public_html/css.border.right.style.inc.php
index 5179b9d..fc83fe1 100644
--- a/public_html/css.border.right.style.inc.php
+++ b/public_html/css.border.right.style.inc.php
@@ -2,23 +2,23 @@
// $Header: /cvsroot/html2ps/css.border.right.style.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderRightStyle extends CSSSubProperty {
- function CSSBorderRightStyle(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$owner_value->right->style = $value;
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->right->style;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_RIGHT_STYLE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-right-style';
}
diff --git a/public_html/css.border.right.width.inc.php b/public_html/css.border.right.width.inc.php
index 9558641..7c06f1e 100644
--- a/public_html/css.border.right.width.inc.php
+++ b/public_html/css.border.right.width.inc.php
@@ -2,27 +2,27 @@
// $Header: /cvsroot/html2ps/css.border.right.width.inc.php,v 1.2 2007/02/04 17:08:18 Konstantin Exp $
class CSSBorderRightWidth extends CSSSubProperty {
- function CSSBorderRightWidth(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
if ($value != CSS_PROPERTY_INHERIT) {
$owner_value->right->width = $value->copy();
} else {
$owner_value->right->width = $value;
- };
+ }
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->right->width;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_RIGHT_WIDTH;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-right-width';
}
@@ -31,7 +31,7 @@ function parse($value) {
return CSS_PROPERTY_INHERIT;
}
- $width_handler = CSS::get_handler(CSS_BORDER_WIDTH);
+ $width_handler = (new CSS())->get_handler(CSS_BORDER_WIDTH);
$width = $width_handler->parse_value($value);
return $width;
}
diff --git a/public_html/css.border.style.inc.php b/public_html/css.border.style.inc.php
index df80628..1aa3b3f 100644
--- a/public_html/css.border.style.inc.php
+++ b/public_html/css.border.style.inc.php
@@ -6,8 +6,8 @@
class CSSBorderStyle extends CSSSubProperty {
var $_defaultValue;
- function CSSBorderStyle(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
$this->_defaultValue = new BorderStyle(BS_NONE,
BS_NONE,
@@ -15,7 +15,7 @@ function CSSBorderStyle(&$owner) {
BS_NONE);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
if ($value != CSS_PROPERTY_INHERIT) {
$owner_value->top->style = $value->top;
$owner_value->right->style = $value->right;
@@ -26,21 +26,21 @@ function set_value(&$owner_value, &$value) {
$owner_value->right->style = CSS_PROPERTY_INHERIT;
$owner_value->bottom->style = CSS_PROPERTY_INHERIT;
$owner_value->left->style = CSS_PROPERTY_INHERIT;
- };
+ }
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return new BorderStyle($owner_value->top->style,
$owner_value->right->style,
$owner_value->bottom->style,
$owner_value->left->style);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_STYLE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-style';
}
@@ -48,7 +48,7 @@ function default_value() {
return $this->_defaultValue;
}
- function parse_style($value) {
+ static function parse_style($value) {
switch ($value) {
case "solid":
return BS_SOLID;
@@ -68,7 +68,7 @@ function parse_style($value) {
return BS_RIDGE;
default:
return BS_NONE;
- };
+ }
}
function parse_in($value) {
@@ -95,7 +95,7 @@ function parse_in($value) {
return array($v1, $v2, $v3, $v4);
default:
return $this->default_value();
- };
+ }
}
function parse($value) {
diff --git a/public_html/css.border.top.color.inc.php b/public_html/css.border.top.color.inc.php
index 72d3929..c00b886 100644
--- a/public_html/css.border.top.color.inc.php
+++ b/public_html/css.border.top.color.inc.php
@@ -2,23 +2,23 @@
// $Header: /cvsroot/html2ps/css.border.top.color.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderTopColor extends CSSSubProperty {
- function CSSBorderTopColor(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$owner_value->top->setColor($value);
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->top->color->copy();
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_TOP_COLOR;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-top-color';
}
diff --git a/public_html/css.border.top.inc.php b/public_html/css.border.top.inc.php
index 28855c3..bce9dc0 100644
--- a/public_html/css.border.top.inc.php
+++ b/public_html/css.border.top.inc.php
@@ -2,20 +2,20 @@
// $Header: /cvsroot/html2ps/css.border.top.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderTop extends CSSSubFieldProperty {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_TOP;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-top';
}
function parse($value) {
if ($value == 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
- $border = CSSBorder::parse($value);
+ $border = (new CSSBorder())->parse($value);
return $border->left;
}
}
diff --git a/public_html/css.border.top.style.inc.php b/public_html/css.border.top.style.inc.php
index 42dba7c..c6254fa 100644
--- a/public_html/css.border.top.style.inc.php
+++ b/public_html/css.border.top.style.inc.php
@@ -2,23 +2,23 @@
// $Header: /cvsroot/html2ps/css.border.top.style.inc.php,v 1.1 2006/09/07 18:38:13 Konstantin Exp $
class CSSBorderTopStyle extends CSSSubProperty {
- function CSSBorderTopStyle(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$owner_value->top->style = $value;
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->top->style;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_TOP_STYLE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-top-style';
}
diff --git a/public_html/css.border.top.width.inc.php b/public_html/css.border.top.width.inc.php
index f9b7c9f..c198788 100644
--- a/public_html/css.border.top.width.inc.php
+++ b/public_html/css.border.top.width.inc.php
@@ -2,27 +2,27 @@
// $Header: /cvsroot/html2ps/css.border.top.width.inc.php,v 1.2 2007/02/04 17:08:18 Konstantin Exp $
class CSSBorderTopWidth extends CSSSubProperty {
- function CSSBorderTopWidth(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
if ($value != CSS_PROPERTY_INHERIT) {
$owner_value->top->width = $value->copy();
} else {
$owner_value->top->width = $value;
- };
+ }
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value->top->width;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_TOP_WIDTH;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-top-width';
}
@@ -31,7 +31,7 @@ function parse($value) {
return CSS_PROPERTY_INHERIT;
}
- $width_handler = CSS::get_handler(CSS_BORDER_WIDTH);
+ $width_handler = (new CSS())->get_handler(CSS_BORDER_WIDTH);
$width = $width_handler->parse_value($value);
return $width;
}
diff --git a/public_html/css.border.width.inc.php b/public_html/css.border.width.inc.php
index 69f5f5b..8e891cd 100644
--- a/public_html/css.border.width.inc.php
+++ b/public_html/css.border.width.inc.php
@@ -6,16 +6,16 @@
class CSSBorderWidth extends CSSSubProperty {
var $_defaultValue;
- function CSSBorderWidth(&$owner) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner) {
+ CSSSubProperty::__construct($owner);
- $this->_defaultValue = new BorderWidth(Value::fromData(0, UNIT_PT),
- Value::fromData(0, UNIT_PT),
- Value::fromData(0, UNIT_PT),
- Value::fromData(0, UNIT_PT));
+ $this->_defaultValue = new BorderWidth((new Value())->fromData(0, UNIT_PT),
+ (new Value())->fromData(0, UNIT_PT),
+ (new Value())->fromData(0, UNIT_PT),
+ (new Value())->fromData(0, UNIT_PT));
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
if ($value != CSS_PROPERTY_INHERIT) {
$owner_value->top->width = $value->top;
$owner_value->right->width = $value->right;
@@ -26,21 +26,21 @@ function set_value(&$owner_value, &$value) {
$owner_value->right->width = CSS_PROPERTY_INHERIT;
$owner_value->bottom->width = CSS_PROPERTY_INHERIT;
$owner_value->left->width = CSS_PROPERTY_INHERIT;
- };
+ }
}
- function get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return new BorderWidth($owner_value->top->width,
$owner_value->right->width,
$owner_value->bottom->width,
$owner_value->left->width);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BORDER_WIDTH;
}
- function get_property_name() {
+ function getPropertyName() {
return 'border-width';
}
@@ -51,45 +51,53 @@ function default_value() {
function parse_value($value) {
switch (strtolower($value)) {
case 'thin':
- return Value::fromString('1px');
+ return (new Value())->fromString('1px');
case 'medium':
- return Value::fromString('3px');
+ return (new Value())->fromString('3px');
case 'thick':
- return Value::fromString('5px');
+ return (new Value())->fromString('5px');
default:
- return Value::fromString($value);
- };
- }
-
- function parse($value) {
- if ($value == 'inherit') {
- return CSS_PROPERTY_INHERIT;
+ return (new Value())->fromString($value);
}
+ }
+ function parse_in($value) {
$values = explode(' ', $value);
switch (count($values)) {
case 1:
$v1 = $this->parse_value($values[0]);
- return new BorderWidth($v1, $v1, $v1, $v1);
+ return array($v1, $v1, $v1, $v1);
case 2:
$v1 = $this->parse_value($values[0]);
$v2 = $this->parse_value($values[1]);
- return new BorderWidth($v1, $v2, $v1, $v2);
+ return array($v1, $v2, $v1, $v2);
case 3:
$v1 = $this->parse_value($values[0]);
$v2 = $this->parse_value($values[1]);
$v3 = $this->parse_value($values[2]);
- return new BorderWidth($v1, $v2, $v3, $v2);
+ return array($v1, $v2, $v3, $v2);
case 4:
$v1 = $this->parse_value($values[0]);
$v2 = $this->parse_value($values[1]);
$v3 = $this->parse_value($values[2]);
$v4 = $this->parse_value($values[3]);
- return new BorderWidth($v1, $v2, $v3, $v4);
+ return array($v1, $v2, $v3, $v4);
default:
return $this->default_value();
- };
+ }
+ }
+
+ function parse($value) {
+ if ($value == 'inherit') {
+ return CSS_PROPERTY_INHERIT;
+ }
+
+ $values = $this->parse_in($value);
+ return new BorderWidth($values[0],
+ $values[1],
+ $values[2],
+ $values[3]);
}
}
diff --git a/public_html/css.bottom.inc.php b/public_html/css.bottom.inc.php
index 27e0faa..f45fb06 100644
--- a/public_html/css.bottom.inc.php
+++ b/public_html/css.bottom.inc.php
@@ -25,9 +25,9 @@
*/
class CSSBottom extends CSSPropertyHandler {
- function CSSBottom() {
- $this->CSSPropertyHandler(false, false);
- $this->_autoValue = ValueBottom::fromString('auto');
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
+ $this->_autoValue = (new ValueBottom())->fromString('auto');
}
function _getAutoValue() {
@@ -38,19 +38,19 @@ function default_value() {
return $this->_getAutoValue();
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_BOTTOM;
}
- function get_property_name() {
+ function getPropertyName() {
return 'bottom';
}
function parse($value) {
- return ValueBottom::fromString($value);
+ return (new ValueBottom())->fromString($value);
}
}
-CSS::register_css_property(new CSSBottom);
+(new CSS())->register_css_property(new CSSBottom);
?>
\ No newline at end of file
diff --git a/public_html/css.cache.class.php b/public_html/css.cache.class.php
index 20ce7ab..6efe6a4 100644
--- a/public_html/css.cache.class.php
+++ b/public_html/css.cache.class.php
@@ -9,7 +9,7 @@ function get() {
if (!isset($__g_css_manager)) {
$__g_css_manager = new CSSCache();
- };
+ }
return $__g_css_manager;
}
@@ -23,25 +23,24 @@ function _isCached($url) {
return is_readable($cache_filename);
}
- function &_readCached($url) {
+ function _readCached($url) {
$cache_filename = $this->_getCacheFilename($url);
- $obj = unserialize(file_get_contents($cache_filename));
- return $obj;
+ return unserialize(file_get_contents($cache_filename));
}
function _putCached($url, $css) {
file_put_contents($this->_getCacheFilename($url), serialize($css));
}
- function &compile($url, $css, &$pipeline) {
+ function compile($url, $css) {
if ($this->_isCached($url)) {
return $this->_readCached($url);
} else {
$cssruleset = new CSSRuleset();
- $cssruleset->parse_css($css, $pipeline);
+ $cssruleset->parse_css($css, new Pipeline());
$this->_putCached($url, $cssruleset);
return $cssruleset;
- };
+ }
}
}
diff --git a/public_html/css.clear.inc.php b/public_html/css.clear.inc.php
index b963fd8..72694bd 100644
--- a/public_html/css.clear.inc.php
+++ b/public_html/css.clear.inc.php
@@ -7,8 +7,8 @@
define('CLEAR_BOTH',3);
class CSSClear extends CSSPropertyStringSet {
- function CSSClear() {
- $this->CSSPropertyStringSet(false,
+ function __construct() {
+ CSSPropertyStringSet::__construct(false,
false,
array('inherit' => CSS_PROPERTY_INHERIT,
'left' => CLEAR_LEFT,
@@ -21,15 +21,15 @@ function default_value() {
return CLEAR_NONE;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_CLEAR;
}
- function get_property_name() {
+ function getPropertyName() {
return 'clear';
}
}
-CSS::register_css_property(new CSSClear);
+(new CSS())->register_css_property(new CSSClear);
?>
\ No newline at end of file
diff --git a/public_html/css.color.inc.php b/public_html/css.color.inc.php
index 7cb8d7d..3ef6ba9 100644
--- a/public_html/css.color.inc.php
+++ b/public_html/css.color.inc.php
@@ -2,31 +2,31 @@
// $Header: /cvsroot/html2ps/css.color.inc.php,v 1.13 2007/01/24 18:55:51 Konstantin Exp $
class CSSColor extends CSSPropertyHandler {
- function CSSColor() {
- $this->CSSPropertyHandler(true, true);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, true);
}
function default_value() {
return new Color(array(0,0,0),false);
}
- function parse($value) {
+ static function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
return parse_color_declaration($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_COLOR;
}
- function get_property_name() {
+ function getPropertyName() {
return 'color';
}
}
-CSS::register_css_property(new CSSColor);
+(new CSS())->register_css_property(new CSSColor);
?>
\ No newline at end of file
diff --git a/public_html/css.colors.inc.php b/public_html/css.colors.inc.php
index 2012517..a90b509 100644
--- a/public_html/css.colors.inc.php
+++ b/public_html/css.colors.inc.php
@@ -149,16 +149,16 @@
function &parse_color_declaration($decl) {
$color = _parse_color_declaration($decl, $success);
- $color_obj =& new Color($color, is_transparent($color));
+ $color_obj= new Color($color, is_transparent($color));
return $color_obj;
-};
+}
function _parse_color_declaration($decl, &$success) {
$success = true;
global $g_colors;
- if (isset($g_colors[strtolower($decl)])) { return $g_colors[strtolower($decl)]; };
+ if (isset($g_colors[strtolower($decl)])) { return $g_colors[strtolower($decl)]; }
// Parse color keywords
switch (strtolower($decl)) {
@@ -172,7 +172,7 @@ function _parse_color_declaration($decl, &$success) {
$g = min(255,max(0,$matches[2]));
$b = min(255,max(0,$matches[3]));
return array($r,$g,$b);
- };
+ }
// rgb(0%,0%,0%) form
if (preg_match("/rgb\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/",$decl,$matches)) {
@@ -180,15 +180,15 @@ function _parse_color_declaration($decl, &$success) {
$g = min(255,max(0,$matches[2]*255/100));
$b = min(255,max(0,$matches[3]*255/100));
return array($r,$g,$b);
- };
+ }
// We've already checked every non-hexadecimal forms; now only color declarations starting
// with # left; nevertheless, sometimes designers forget to put #-sign before the
// color declaration. Thus, we'll add sharp sign automatically if it is missing
//
if (strlen($decl) > 0) {
- if ($decl{0} !== "#") { $decl = "#" . $decl; };
- };
+ if ($decl[0] !== "#") { $decl = "#" . $decl; }
+ }
// #000000 form
if (preg_match("/^#([[:xdigit:]]{2})([[:xdigit:]]{2})([[:xdigit:]]{2})$/",$decl,$matches)) {
@@ -204,7 +204,7 @@ function _parse_color_declaration($decl, &$success) {
$b = array_pop($arrb);
return array($r,$g,$b);
- };
+ }
// #000 form
if (preg_match("/^#([[:xdigit:]])([[:xdigit:]])([[:xdigit:]])$/",$decl,$matches)) {
@@ -220,7 +220,7 @@ function _parse_color_declaration($decl, &$success) {
$b = array_pop($arrb);
return array($r,$g,$b);
- };
+ }
// Transparent color - by default
$success = false;
diff --git a/public_html/css.constants.inc.php b/public_html/css.constants.inc.php
index 9df7fd6..a65f8a4 100644
--- a/public_html/css.constants.inc.php
+++ b/public_html/css.constants.inc.php
@@ -86,8 +86,6 @@
define('CSS_TABLE_LAYOUT', 112);
define('CSS_DIRECTION', 113);
define('CSS_PAGE', 114);
-define('CSS_BACKGROUND_ATTACHMENT', 115);
-define('CSS_SIZE', 116);
define('CSS_HTML2PS_ALIGN', 900);
define('CSS_HTML2PS_CELLPADDING', 901);
@@ -104,7 +102,6 @@
define('CSS_HTML2PS_HTML_CONTENT', 911);
define('CSS_HTML2PS_PSEUDOELEMENTS', 912);
define('CSS_HTML2PS_COMPOSITE_WIDTH', 913);
-define('CSS_HTML2PS_PIXELS', 914);
// Selectors
@@ -170,17 +167,4 @@
define('CACHE_TYPEFACE', 2);
define('CACHE_MIN_WIDTH_NATURAL', 3);
-// CSS regular expressions
-
-define('CSS_NL_REGEXP', '(?:\n|\r\n|\r|\f)');
-define('CSS_UNICODE_REGEXP', '\\[0-9a-f]{1,6}(?:\r\n|[ \n\r\t\f])?');
-define('CSS_NONASCII_REGEXP', '[^\0-\177]');
-define('CSS_ESCAPE_REGEXP', CSS_UNICODE_REGEXP.'|\\[^\n\r\f0-9a-f]');
-define('CSS_NMSTART_REGEXP', '(?:[_a-z]|'.CSS_NONASCII_REGEXP.'|'.CSS_ESCAPE_REGEXP.')');
-define('CSS_NMCHAR_REGEXP', '(?:[_a-z0-9-]|'.CSS_NONASCII_REGEXP.'|'.CSS_ESCAPE_REGEXP.')');
-define('CSS_IDENT_REGEXP', '-?'.CSS_NMSTART_REGEXP.CSS_NMCHAR_REGEXP.'*');
-define('CSS_FUNCTION_REGEXP', '(?:'.CSS_IDENT_REGEXP.'\()');
-define('CSS_STRING1_REGEXP', '\"(?:[^\n\r\f\\"]|\\\\'.CSS_NL_REGEXP.'|'.CSS_ESCAPE_REGEXP.')*\"');
-define('CSS_STRING2_REGEXP', '\\'."'".'(?:[^\n\r\f\\'."'".']|\\\\'.CSS_NL_REGEXP.'|'.CSS_ESCAPE_REGEXP.')*\\'."'");
-
?>
\ No newline at end of file
diff --git a/public_html/css.content.inc.php b/public_html/css.content.inc.php
index 1ef1890..0f9aae2 100644
--- a/public_html/css.content.inc.php
+++ b/public_html/css.content.inc.php
@@ -1,7 +1,5 @@
CSSPropertyHandler(false, false);
- }
+ function __construct() { CSSPropertyHandler::__construct(false, false); }
- function &default_value() {
- $data =& new ValueContent();
- return $data;
- }
+ function default_value() { return ''; }
// CSS 2.1 p 12.2:
// Value: [ | | | attr(X) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit
//
// TODO: process values other than
//
- function &parse($value) {
+ function parse($value) {
if ($value == 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
+
+ if ($value == 'normal') {
+ return '';
+ }
- $value_obj =& ValueContent::parse($value);
- return $value_obj;
+ return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_CONTENT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'content';
}
}
-CSS::register_css_property(new CSSContent);
+(new CSS())->register_css_property(new CSSContent);
?>
\ No newline at end of file
diff --git a/public_html/css.counter.collection.php b/public_html/css.counter.collection.php
index 2c49012..fde9700 100644
--- a/public_html/css.counter.collection.php
+++ b/public_html/css.counter.collection.php
@@ -3,7 +3,7 @@
class CSSCounterCollection {
var $_counters;
- function CSSCounterCollection() {
+ function __construct() {
$this->_counters = array();
}
@@ -15,7 +15,7 @@ function &get($name) {
if (!isset($this->_counters[$name])) {
$null = null;
return $null;
- };
+ }
return $this->_counters[$name];
}
diff --git a/public_html/css.counter.php b/public_html/css.counter.php
index ec44795..8bb259d 100644
--- a/public_html/css.counter.php
+++ b/public_html/css.counter.php
@@ -4,7 +4,7 @@ class CSSCounter {
var $_name;
var $_value;
- function CSSCounter($name) {
+ function __construct($name) {
$this->set_name($name);
$this->reset();
}
diff --git a/public_html/css.defaults.inc.php b/public_html/css.defaults.inc.php
new file mode 100644
index 0000000..691af5e
--- /dev/null
+++ b/public_html/css.defaults.inc.php
@@ -0,0 +1,274 @@
+ "blue", "text-decoration" => "underline")),
+ array(array(SELECTOR_TAG, "address"), array("display" => "block",
+ "font-style" => "italic")),
+ array(array(SELECTOR_TAG, "applet") , array("display" => "none")),
+ array(array(SELECTOR_TAG, "area") , array("display" => "none")),
+ array(array(SELECTOR_TAG, "b") , array("font-weight" => "bold")),
+ array(array(SELECTOR_TAG, "big"), array("font-size" => "1.2em")),
+ array(array(SELECTOR_TAG, "blockquote"),array("display" => "block",
+ "margin" => "1em 40px")),
+ array(array(SELECTOR_TAG, "body"), array("display" => "-body",
+ "margin" => "8px",
+ "line-height" => "1.1",
+ "border" => "none")),
+ array(array(SELECTOR_TAG, "center"), array("display" => "block",
+ "text-align" => "center",
+ "-align" => "center")),
+ array(array(SELECTOR_TAG, "cite") ,array("font-style" => "italic")),
+ array(array(SELECTOR_TAG, "code") ,array("font-family" => "monospace")),
+ array(array(SELECTOR_TAG, "col") ,array("display" => "none")),
+ array(array(SELECTOR_TAG, "colgroup") ,array("display" => "none")),
+ array(array(SELECTOR_TAG, "dd"), array("display" => "block",
+ "padding-left" => "40px")),
+ array(array(SELECTOR_TAG, "dfn") ,array("font-style" => "italic")),
+ array(array(SELECTOR_TAG, "div"), array("display" => "block")),
+ array(array(SELECTOR_TAG, "dir"), array("margin-left" => "1em")),
+ array(array(SELECTOR_TAG, "dl"), array("display" => "block",
+ "margin" => "1em 0")),
+ array(array(SELECTOR_TAG, "dt"), array("display" => "block")),
+ array(array(SELECTOR_TAG, "em") ,array("font-style" => "italic")),
+ array(array(SELECTOR_TAG, "embed") ,array("display" => "block")),
+ array(array(SELECTOR_TAG, "fieldset") ,array("display" => "block",
+ "border" => "solid black 1px",
+ "margin-left" => "2px", "margin-right" => "2px", "padding" => "0.35em 0.625em 0.75em")),
+ array(array(SELECTOR_TAG, "form"), array("display" => "-form")),
+ array(array(SELECTOR_TAG, "frame"), array("display" => "-frame",
+ "position" => "absolute",
+ "border" => "solid black 2px")),
+ array(array(SELECTOR_TAG, "frameset"), array("display" => "-frameset")),
+ array(array(SELECTOR_TAG, "h1") ,array("display" => "block",
+ "font-size" => "2em",
+ "font-weight" => "bold",
+ "margin" => ".67em 0")),
+ array(array(SELECTOR_TAG, "h2") ,array("display" => "block",
+ "font-size" => "1.5em",
+ "font-weight" => "bold",
+ "margin" => ".83em 0")),
+ array(array(SELECTOR_TAG, "h3") ,array("display" => "block",
+ "font-size" => "1.17em",
+ "font-weight" => "bold",
+ "margin" => "1em 0")),
+ array(array(SELECTOR_TAG, "h4") ,array("display" => "block",
+ "font-weight" => "bold",
+ "margin" => "1.33em 0")),
+ array(array(SELECTOR_TAG, "h5") ,array("display" => "block",
+ "font-size" => "0.83em",
+ "font-weight" => "bold",
+ "margin" => "1.67m 0")),
+ array(array(SELECTOR_TAG, "h6") ,array("display" => "block",
+ "font-size" => "0.67em",
+ "font-weight" => "bold",
+ "margin" => "2.33em 0")),
+ array(array(SELECTOR_TAG, "head") ,array("display" => "none")),
+ array(array(SELECTOR_TAG, "hr") ,array("display" => "block",
+ "margin" => "0.5em auto 0.5em auto",
+ "height" => "1px",
+ "border" => "0.1pt solid black")),
+ // We use this non-standard display value to avoid generating box for HTML tag;
+ // display: none and visibility: hidden are not the alternatives, as they cause the whole
+ // content of the page to be hidden
+ array(array(SELECTOR_TAG, "html") ,array("display" => "-html")),
+ array(array(SELECTOR_TAG, "i") , array("font-style" => "italic",
+ "display" => "inline")),
+ array(array(SELECTOR_TAG, "iframe"), array("display" => "-iframe",
+ "border" => "solid black 2px",
+ "padding" => "3px",
+ "overflow" => "hidden",
+ "width" => "300px",
+ "height" => "150px")),
+ array(array(SELECTOR_TAG, "img"), array("display" => "-image")),
+ array(array(SELECTOR_TAG, "input"), array("display" => "-text",
+ "padding" => "1pt",
+ "margin" => "1px",
+ "background-color" => "white",
+ "border" => "black inset 2px",
+ "line-height" => 1)),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "password"))),
+ array("display" => "-password")),
+ array(array(SELECTOR_TAG, "button"),
+ array("display" => "-button",
+ "text-align" => "center",
+ "border" => "outset 2px",
+ "background-color" => "#eeeeee")),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "button"))),
+ array("display" => "-button",
+ "text-align" => "center",
+ "border" => "outset 2px",
+ "background-color" => "#eeeeee")),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "checkbox"))),
+ array("display" => "-checkbox")),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "hidden"))),
+ array("display" => "none")),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "image"))),
+ array("display" => "-button-image",
+ "border" => "none 0px",
+ "background-color" => "transparent")),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "radio"))),
+ array("display" => "-radio")),
+ array(array(SELECTOR_SEQUENCE,
+ array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "reset"))),
+ array("display" => "-button-reset",
+ "text-align" => "center",
+ "border" => "outset 2px",
+ "background-color" => "#eeeeee")),
+ array(array(SELECTOR_SEQUENCE,
+ array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "submit"))),
+ array("display" => "-button-submit",
+ "text-align" => "center",
+ "border" => "outset 2px",
+ "background-color" => "#eeeeee")),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "input"),
+ array(SELECTOR_ATTR_VALUE, "type", "text"))),
+ array("display" => "-text")),
+ array(array(SELECTOR_TAG, "ins"), array("text-decoration" => "underline")),
+ array(array(SELECTOR_TAG, "isindex"), array("display" => "block")),
+ array(array(SELECTOR_TAG, "kbd") ,array("font-family" => "monospace")),
+ // FIXME: generated boxes are too long...
+ array(array(SELECTOR_TAG, "legend"), array("display" => "-legend",
+ "background-color" => "white")),
+ array(array(SELECTOR_TAG, "li") ,array("display" => "list-item")),
+ array(array(SELECTOR_TAG, "marquee"), array("display" => "block",
+ "overflow" => "hidden")),
+ array(array(SELECTOR_TAG, "menu"), array("margin-left" => "1em")),
+ array(array(SELECTOR_TAG, "nobr"), array("display" => "inline",
+ "white-space" => "nowrap")),
+ array(array(SELECTOR_TAG, "noframes"), array("display" => "none")),
+ array(array(SELECTOR_TAG, "object"), array("display" => "block")),
+ array(array(SELECTOR_TAG, "ol"), array("display" => "block",
+ "margin-left" => "1em",
+ "margin-top" => "1em",
+ "margin-bottom" => "1em")),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "ol"),
+ array(SELECTOR_PARENT,array(SELECTOR_TAG, "li")))), array("margin-top" => "0px", "margin-bottom" => "0px")),
+ array(array(SELECTOR_TAG, "option"), array("display" => "none")),
+ array(array(SELECTOR_TAG, "p"), array("display" => "block", "margin" => "1em 0")),
+ array(array(SELECTOR_TAG, "pagebreak") ,array("display" => "block")),
+ array(array(SELECTOR_TAG, "param") ,array("display" => "none")),
+ array(array(SELECTOR_TAG, "pre"), array("display" => "block",
+ "font-family" => "monospace",
+ "white-space" => "pre")),
+ array(array(SELECTOR_TAG, "samp"), array("font-family" => "monospace")),
+ array(array(SELECTOR_TAG, "script"), array("display" => "none")),
+ array(array(SELECTOR_TAG, "select"), array("background-color" => "white",
+ "border" => "inset black 2px",
+ "display" => "-select",
+ "overflow" => "hidden",
+ "padding" => "1pt",
+ "margin" => "1px",
+ "line-height" => 1)),
+ array(array(SELECTOR_TAG, "small"), array("font-size" => "smaller")),
+ array(array(SELECTOR_TAG, "span"), array("display" => "inline")),
+ array(array(SELECTOR_TAG, "strong"), array("font-weight" => "bold")),
+ array(array(SELECTOR_TAG, "style"), array("display" => "none")),
+ array(array(SELECTOR_TAG, "sup"), array("display" => "inline",
+ "font-size" => "50%",
+ "vertical-align" => "super")),
+ array(array(SELECTOR_TAG, "sub"), array("display" => "inline",
+ "font-size" => "50%",
+ "vertical-align" => "sub")),
+ array(array(SELECTOR_TAG, "table"), array("display" => "table",
+ "line-height" => 1.1)),
+ array(array(SELECTOR_TAG, "textarea"), array("display" => "-textarea",
+ "border" => "solid black 2px",
+ "padding" => "3px",
+ "overflow" => "hidden",
+ "width" => "15.3em",
+ "height" => "3em")),
+ array(array(SELECTOR_TAG, "tbody"), array("display" => "-table-section")),
+ array(array(SELECTOR_TAG, "thead"), array("display" => "-table-section")),
+ array(array(SELECTOR_TAG, "tfoot"), array("display" => "-table-section")),
+ array(array(SELECTOR_TAG, "td"), array("display" => "table-cell")),
+ array(array(SELECTOR_TAG, "th"), array("display" => "table-cell",
+ "font-weight" => "bold")),
+ array(array(SELECTOR_TAG, "tr"), array("display" => "table-row",
+ "vertical-align" => "middle")),
+ array(array(SELECTOR_TAG, "tt"), array("font-family" => "monospace")),
+ array(array(SELECTOR_TAG, "u") , array("text-decoration" => "underline")),
+ array(array(SELECTOR_TAG, "ul"), array("display" => "block",
+ "list-style-type" => "disc",
+ "padding-left" => "40px",
+ "margin-top" => "1em",
+ "margin-bottom" => "1em")),
+ array(array(SELECTOR_TAG, "ol"), array("display" => "block",
+ "list-style-type" => "decimal",
+ "padding-left" => "40px",
+ "margin-top" => "1em",
+ "margin-bottom" => "1em")),
+ array(array(SELECTOR_TAG, "pagebreak"), array("display" => "block",
+ "visibility" => "hidden",
+ "page-break-after"=> "always")),
+ array(array(SELECTOR_TAG, "var") , array("font-style" => "italic")),
+ array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, "img"),
+ array(SELECTOR_PARENT_LOW_PRIORITY,array(SELECTOR_TAG, "a")))), array("border" => "solid blue 1px"))
+ );
+
+$css = <<add_rule($rule, new Pipeline());
+}
+
+?>
\ No newline at end of file
diff --git a/public_html/css.direction.inc.php b/public_html/css.direction.inc.php
index 1445eeb..77de2f6 100644
--- a/public_html/css.direction.inc.php
+++ b/public_html/css.direction.inc.php
@@ -5,8 +5,8 @@
define('DIRECTION_RTF', 1);
class CSSDirection extends CSSPropertyStringSet {
- function CSSDirection() {
- $this->CSSPropertyStringSet(true,
+ function __construct() {
+ CSSPropertyStringSet::__construct(true,
true,
array('lrt' => DIRECTION_LTR,
'rtl' => DIRECTION_RTF));
@@ -16,15 +16,15 @@ function default_value() {
return DIRECTION_LTR;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_DIRECTION;
}
- function get_property_name() {
+ function getPropertyName() {
return 'direction';
}
}
-CSS::register_css_property(new CSSDirection);
+(new CSS())->register_css_property(new CSSDirection);
?>
\ No newline at end of file
diff --git a/public_html/css.display.inc.php b/public_html/css.display.inc.php
index 67353e1..831c150 100644
--- a/public_html/css.display.inc.php
+++ b/public_html/css.display.inc.php
@@ -2,23 +2,23 @@
// $Header: /cvsroot/html2ps/css.display.inc.php,v 1.21 2006/09/07 18:38:13 Konstantin Exp $
class CSSDisplay extends CSSPropertyHandler {
- function CSSDisplay() { $this->CSSPropertyHandler(false, false); }
+ function __construct() { CSSPropertyHandler::__construct(false, false); }
function get_parent() {
if (isset($this->_stack[1])) {
return $this->_stack[1][0];
} else {
return 'block';
- };
+ }
}
function default_value() { return "inline"; }
- function get_property_code() {
+ function getPropertyCode() {
return CSS_DISPLAY;
}
- function get_property_name() {
+ function getPropertyName() {
return 'display';
}
@@ -27,7 +27,7 @@ function parse($value) {
}
}
-CSS::register_css_property(new CSSDisplay);
+(new CSS())->register_css_property(new CSSDisplay);
function is_inline_element($display) {
return
diff --git a/public_html/css.float.inc.php b/public_html/css.float.inc.php
index f7b825d..a83fd57 100644
--- a/public_html/css.float.inc.php
+++ b/public_html/css.float.inc.php
@@ -6,8 +6,8 @@
define('FLOAT_RIGHT',2);
class CSSFloat extends CSSPropertyStringSet {
- function CSSFloat() {
- $this->CSSPropertyStringSet(false,
+ function __construct() {
+ CSSPropertyStringSet::__construct(false,
false,
array('left' => FLOAT_LEFT,
'right' => FLOAT_RIGHT,
@@ -18,15 +18,15 @@ function default_value() {
return FLOAT_NONE;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_FLOAT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'float';
}
}
-CSS::register_css_property(new CSSFloat);
+(new CSS())->register_css_property(new CSSFloat);
?>
\ No newline at end of file
diff --git a/public_html/css.font-family.inc.php b/public_html/css.font-family.inc.php
index 3436e22..12862ae 100644
--- a/public_html/css.font-family.inc.php
+++ b/public_html/css.font-family.inc.php
@@ -19,29 +19,29 @@ function parse($value) {
if ($subvalue !== "") {
// Some multi-word font family names can be enclosed in quotes; remove them
- if ($subvalue{0} == "'") {
+ if ($subvalue[0] == "'") {
$subvalue = substr($subvalue,1,strlen($subvalue)-2);
- } elseif ($subvalue{0} == '"') {
+ } elseif ($subvalue[0] == '"') {
$subvalue = substr($subvalue,1,strlen($subvalue)-2);
- };
+ }
global $g_font_resolver;
- if ($g_font_resolver->have_font_family($subvalue)) { return $subvalue; };
+ if ($g_font_resolver->have_font_family($subvalue)) { return $subvalue; }
global $g_font_resolver_pdf;
- if ($g_font_resolver_pdf->have_font_family($subvalue)) { return $subvalue; };
- };
- };
+ if ($g_font_resolver_pdf->have_font_family($subvalue)) { return $subvalue; }
+ }
+ }
// Unknown family type
return "times";
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_FONT_FAMILY;
}
- function get_property_name() {
+ function getPropertyName() {
return 'font-family';
}
diff --git a/public_html/css.font-size.inc.php b/public_html/css.font-size.inc.php
index 87ac511..bba9e60 100644
--- a/public_html/css.font-size.inc.php
+++ b/public_html/css.font-size.inc.php
@@ -3,17 +3,17 @@
class CSSFontSize extends CSSSubFieldProperty {
var $_defaultValue;
- function CSSFontSize(&$owner, $field) {
- $this->CSSSubFieldProperty($owner, $field);
+ function __construct(&$owner, $field) {
+ CSSSubFieldProperty::__construct($owner, $field);
- $this->_defaultValue = Value::fromData(BASE_FONT_SIZE_PT, UNIT_PT);
+ $this->_defaultValue = (new Value())->fromData(BASE_FONT_SIZE_PT, UNIT_PT);
}
function default_value() {
return $this->_defaultValue;
}
- function parse($value) {
+ static function parse($value) {
if ($value == 'inherit') {
return CSS_PROPERTY_INHERIT;
}
@@ -22,40 +22,40 @@ function parse($value) {
switch(strtolower($value)) {
case "xx-small":
- return Value::fromData(BASE_FONT_SIZE_PT*3/5, UNIT_PT);
+ return (new Value())->fromData(BASE_FONT_SIZE_PT*3/5, UNIT_PT);
case "x-small":
- return Value::fromData(BASE_FONT_SIZE_PT*3/4, UNIT_PT);
+ return (new Value())->fromData(BASE_FONT_SIZE_PT*3/4, UNIT_PT);
case "small":
- return Value::fromData(BASE_FONT_SIZE_PT*8/9, UNIT_PT);
+ return (new Value())->fromData(BASE_FONT_SIZE_PT*8/9, UNIT_PT);
case "medium":
- return Value::fromData(BASE_FONT_SIZE_PT, UNIT_PT);
+ return (new Value())->fromData(BASE_FONT_SIZE_PT, UNIT_PT);
case "large":
- return Value::fromData(BASE_FONT_SIZE_PT*6/5, UNIT_PT);
+ return (new Value())->fromData(BASE_FONT_SIZE_PT*6/5, UNIT_PT);
case "x-large":
- return Value::fromData(BASE_FONT_SIZE_PT*3/2, UNIT_PT);
+ return (new Value())->fromData(BASE_FONT_SIZE_PT*3/2, UNIT_PT);
case "xx-large":
- return Value::fromData(BASE_FONT_SIZE_PT*2/1, UNIT_PT);
- };
+ return (new Value())->fromData(BASE_FONT_SIZE_PT*2/1, UNIT_PT);
+ }
switch(strtolower($value)) {
case "larger":
- return Value::fromData(1.2, UNIT_EM);
+ return (new Value())->fromData(1.2, UNIT_EM);
case "smaller":
- return Value::fromData(0.83, UNIT_EM); // 0.83 = 1/1.2
- };
+ return (new Value())->fromData(0.83, UNIT_EM); // 0.83 = 1/1.2
+ }
if (preg_match("/(\d+\.?\d*)%/i", $value, $matches)) {
- return Value::fromData($matches[1]/100, UNIT_EM);
- };
+ return (new Value())->fromData($matches[1]/100, UNIT_EM);
+ }
- return Value::fromString($value);
+ return (new Value())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_FONT_SIZE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'font-size';
}
}
diff --git a/public_html/css.font-style.inc.php b/public_html/css.font-style.inc.php
index 4957585..1c22506 100644
--- a/public_html/css.font-style.inc.php
+++ b/public_html/css.font-style.inc.php
@@ -16,14 +16,14 @@ function parse($value) {
return FS_ITALIC;
case 'oblique':
return FS_OBLIQUE;
- };
+ }
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_FONT_STYLE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'font-style';
}
diff --git a/public_html/css.font-weight.inc.php b/public_html/css.font-weight.inc.php
index 7340a94..afb4372 100644
--- a/public_html/css.font-weight.inc.php
+++ b/public_html/css.font-weight.inc.php
@@ -25,14 +25,14 @@ function parse($value) {
case '600':
default:
return WEIGHT_NORMAL;
- };
+ }
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_FONT_WEIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'font-weight';
}
}
diff --git a/public_html/css.font.inc.php b/public_html/css.font.inc.php
index 9252fe8..ddc2b78 100644
--- a/public_html/css.font.inc.php
+++ b/public_html/css.font.inc.php
@@ -36,8 +36,8 @@ function detect_font_value_type($value) {
class CSSFont extends CSSPropertyHandler {
var $_defaultValue;
- function CSSFont() {
- $this->CSSPropertyHandler(true, true);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, true);
$this->_defaultValue = null;
}
@@ -46,21 +46,21 @@ function default_value() {
if (is_null($this->_defaultValue)) {
$this->_defaultValue = new ValueFont;
- $size_handler = CSS::get_handler(CSS_FONT_SIZE);
+ $size_handler = (new CSS())->get_handler(CSS_FONT_SIZE);
$default_size = $size_handler->default_value();
$this->_defaultValue->size = $default_size->copy();
- $this->_defaultValue->weight = CSSFontWeight::default_value();
- $this->_defaultValue->style = CSSFontStyle::default_value();
- $this->_defaultValue->family = CSSFontFamily::default_value();
- $this->_defaultValue->line_height = CSS::getDefaultValue(CSS_LINE_HEIGHT);
- };
+ $this->_defaultValue->weight = (new CSSFontWeight())->default_value();
+ $this->_defaultValue->style = (new CSSFontStyle())->default_value();
+ $this->_defaultValue->family = (new CSSFontFamily())->default_value();
+ $this->_defaultValue->line_height = (new CSS())->getDefaultValue(CSS_LINE_HEIGHT);
+ }
return $this->_defaultValue;
}
function parse($value) {
- $font = CSS::getDefaultValue(CSS_FONT);
+ $font = (new CSS())->getDefaultValue(CSS_FONT);
if ($value === 'inherit') {
$font->style = CSS_PROPERTY_INHERIT;
@@ -70,7 +70,7 @@ function parse($value) {
$font->line_height = CSS_PROPERTY_INHERIT;
return $font;
- };
+ }
// according to CSS 2.1 standard,
@@ -98,7 +98,7 @@ function parse($value) {
$family_running = false;
$family_double_quote = false;;
- for ($i=0, $num_subvalues = count($subvalues); $i < $num_subvalues; $i++) {
+ for ($i=0, $num_subvalues = count((array) $subvalues); $i < $num_subvalues; $i++) {
$current_value = $subvalues[$i];
if ($family_running) {
@@ -126,7 +126,7 @@ function parse($value) {
$family_start = $i;
$family_double_quote = true;
}
- };
+ }
// Now process subvalues one-by-one.
foreach ($subvalues as $subvalue) {
@@ -135,52 +135,52 @@ function parse($value) {
switch ($subvalue_type) {
case FONT_VALUE_STYLE:
- $font->style = CSSFontStyle::parse($subvalue);
+ $font->style = (new CSSFontStyle())->parse($subvalue);
break;
case FONT_VALUE_WEIGHT:
- $font->weight = CSSFontWeight::parse($subvalue);
+ $font->weight = (new CSSFontWeight())->parse($subvalue);
break;
case FONT_VALUE_SIZE:
$size_subvalues = explode('/', $subvalue);
$font->size = CSSFontSize::parse($size_subvalues[0]);
if (isset($size_subvalues[1])) {
- $handler =& CSS::get_handler(CSS_LINE_HEIGHT);
+ $handler =& (new CSS())->get_handler(CSS_LINE_HEIGHT);
$font->line_height = $handler->parse($size_subvalues[1]);
- };
+ }
break;
case FONT_VALUE_FAMILY:
- $font->family = CSSFontFamily::parse($subvalue);
+ $font->family = (new CSSFontFamily())->parse($subvalue);
break;
- };
- };
+ }
+ }
return $font;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_FONT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'font';
}
function clearDefaultFlags(&$state) {
parent::clearDefaultFlags($state);
- $state->set_propertyDefaultFlag(CSS_FONT_SIZE, false);
- $state->set_propertyDefaultFlag(CSS_FONT_STYLE, false);
- $state->set_propertyDefaultFlag(CSS_FONT_WEIGHT, false);
- $state->set_propertyDefaultFlag(CSS_FONT_FAMILY, false);
- $state->set_propertyDefaultFlag(CSS_LINE_HEIGHT, false);
+ $state->setPropertyDefaultFlag(CSS_FONT_SIZE, false);
+ $state->setPropertyDefaultFlag(CSS_FONT_STYLE, false);
+ $state->setPropertyDefaultFlag(CSS_FONT_WEIGHT, false);
+ $state->setPropertyDefaultFlag(CSS_FONT_FAMILY, false);
+ $state->setPropertyDefaultFlag(CSS_LINE_HEIGHT, false);
}
}
$font = new CSSFont;
-CSS::register_css_property($font);
-CSS::register_css_property(new CSSFontSize($font, 'size'));
-CSS::register_css_property(new CSSFontStyle($font, 'style'));
-CSS::register_css_property(new CSSFontWeight($font, 'weight'));
-CSS::register_css_property(new CSSFontFamily($font, 'family'));
-CSS::register_css_property(new CSSLineHeight($font, 'line_height'));
+(new CSS())->register_css_property($font);
+(new CSS())->register_css_property(new CSSFontSize($font, 'size'));
+(new CSS())->register_css_property(new CSSFontStyle($font, 'style'));
+(new CSS())->register_css_property(new CSSFontWeight($font, 'weight'));
+(new CSS())->register_css_property(new CSSFontFamily($font, 'family'));
+(new CSS())->register_css_property(new CSSLineHeight($font, 'line_height'));
?>
\ No newline at end of file
diff --git a/public_html/css.height.inc.php b/public_html/css.height.inc.php
index 6652fa8..8ac3a56 100644
--- a/public_html/css.height.inc.php
+++ b/public_html/css.height.inc.php
@@ -6,9 +6,9 @@
class CSSHeight extends CSSPropertyHandler {
var $_autoValue;
- function CSSHeight() {
- $this->CSSPropertyHandler(true, false);
- $this->_autoValue = ValueHeight::fromString('auto');
+ function __construct() {
+ CSSPropertyHandler::__construct(true, false);
+ $this->_autoValue = (new ValueHeight())->fromString('auto');
}
/**
@@ -29,18 +29,18 @@ function default_value() {
}
function parse($value) {
- return ValueHeight::fromString($value);
+ return (new ValueHeight())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HEIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'height';
}
}
-CSS::register_css_property(new CSSHeight);
+(new CSS())->register_css_property(new CSSHeight);
?>
\ No newline at end of file
diff --git a/public_html/css.html2ps.html.content.inc.php b/public_html/css.html2ps.html.content.inc.php
index 595fac3..7acad73 100644
--- a/public_html/css.html2ps.html.content.inc.php
+++ b/public_html/css.html2ps.html.content.inc.php
@@ -1,41 +1,29 @@
CSSPropertyHandler(false, false);
- }
+ function __construct() { CSSPropertyHandler::__construct(false, false); }
- function &default_value() {
- $data =& new ValueContent();
- return $data;
- }
+ function default_value() { return ""; }
// CSS 2.1 p 12.2:
// Value: [ | | | attr(X) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit
//
// TODO: process values other than
//
- function &parse($value) {
- if ($value === 'inherit') {
- return CSS_PROPERTY_INHERIT;
- };
-
- $value_obj =& ValueContent::parse($value);
- return $value_obj;
+ function parse($value) {
+ return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_HTML_CONTENT;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-html-content';
}
}
-CSS::register_css_property(new CSSHTML2PSHTMLContent);
+(new CSS())->register_css_property(new CSSHTML2PSHTMLContent);
?>
\ No newline at end of file
diff --git a/public_html/css.html2ps.pixels.php b/public_html/css.html2ps.pixels.php
index 2dbf767..2365742 100644
--- a/public_html/css.html2ps.pixels.php
+++ b/public_html/css.html2ps.pixels.php
@@ -1,8 +1,8 @@
CSSPropertyHandler(false, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
}
function &default_value() {
@@ -24,6 +24,6 @@ function get_property_name() {
}
}
-CSS::register_css_property(new CSSHTML2PSPixels);
+(new CSS())->register_css_property(new CSSHTML2PSPixels);
?>
\ No newline at end of file
diff --git a/public_html/css.html2ps.pseudoelements.inc.php b/public_html/css.html2ps.pseudoelements.inc.php
index 2e49053..99a48fb 100644
--- a/public_html/css.html2ps.pseudoelements.inc.php
+++ b/public_html/css.html2ps.pseudoelements.inc.php
@@ -6,8 +6,8 @@
define('CSS_HTML2PS_PSEUDOELEMENTS_AFTER' ,2);
class CSSHTML2PSPseudoelements extends CSSPropertyHandler {
- function CSSHTML2PSPseudoelements() {
- $this->CSSPropertyHandler(false, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
}
function default_value() {
@@ -18,15 +18,15 @@ function parse($value) {
return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_PSEUDOELEMENTS;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-pseudoelements';
}
}
-CSS::register_css_property(new CSSHTML2PSPseudoelements);
+(new CSS())->register_css_property(new CSSHTML2PSPseudoelements);
?>
\ No newline at end of file
diff --git a/public_html/css.inc.php b/public_html/css.inc.php
index 3313064..7828399 100644
--- a/public_html/css.inc.php
+++ b/public_html/css.inc.php
@@ -1,5 +1,5 @@
getHandlers();
foreach ($handlers as $property => $handler) {
$this->_defaultState[$property] = $handler->default_value();
- };
- };
+ }
+ }
return $this->_defaultState;
}
@@ -27,8 +27,8 @@ function _getDefaultStateFlags() {
$handlers = $this->getHandlers();
foreach ($handlers as $property => $handler) {
$this->_defaultStateFlags[$property] = true;
- };
- };
+ }
+ }
return $this->_defaultStateFlags;
}
@@ -43,7 +43,7 @@ function getInheritableTextHandlers() {
foreach ($this->_handlers as $property => $handler) {
if ($handler->isInheritableText()) {
$this->_handlersInheritableText[$property] =& $this->_handlers[$property];
- };
+ }
}
}
@@ -56,7 +56,7 @@ function getInheritableHandlers() {
foreach ($this->_handlers as $property => $handler) {
if ($handler->isInheritable()) {
$this->_handlersInheritable[$property] =& $this->_handlers[$property];
- };
+ }
}
}
@@ -68,18 +68,18 @@ function &get() {
if (!isset($__g_css_handler_set)) {
$__g_css_handler_set = new CSS();
- };
+ }
return $__g_css_handler_set;
}
- function CSS() {
+ function __construct() {
$this->_handlers = array();
$this->_mapping = array();
}
function getDefaultValue($property) {
- $css =& CSS::get();
+ $css =& (new CSS())->get();
$handler =& $css->_get_handler($property);
$value = $handler->default_value();
@@ -87,11 +87,11 @@ function getDefaultValue($property) {
return $value->copy();
} else {
return $value;
- };
+ }
}
function &get_handler($property) {
- $css =& CSS::get();
+ $css =& (new CSS())->get();
$handler =& $css->_get_handler($property);
return $handler;
}
@@ -102,27 +102,27 @@ function &_get_handler($property) {
} else {
$dumb = null;
return $dumb;
- };
+ }
}
- function _name2code($key) {
+ function _word2code($key) {
if (!isset($this->_mapping[$key])) {
return null;
- };
+ }
return $this->_mapping[$key];
}
- function name2code($key) {
- $css =& CSS::get();
- return $css->_name2code($key);
+ function word2code($key) {
+ $css =& (new CSS())->get();
+ return $css->_word2code($key);
}
function register_css_property(&$handler) {
- $property = $handler->get_property_code();
- $name = $handler->get_property_name();
+ $property = $handler->getPropertyCode();
+ $name = $handler->getPropertyName();
- $css =& CSS::get();
+ $css =& (new CSS())->get();
$css->_handlers[$property] =& $handler;
$css->_mapping[$name] = $property;
}
@@ -137,40 +137,8 @@ function register_css_property(&$handler) {
* nmchar [_a-z0-9-]|{nonascii}|{escape}
* ident -?{nmstart}{nmchar}*
*/
- function get_identifier_regexp() {
- return '-?(?:[_a-z]|[\200-\377]|\\[0-9a-f]{1,6}(?:\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])(?:[_a-z0-9-]|[\200-\377]|\\[0-9a-f]{1,6}(?:\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])*';
- }
-
function is_identifier($string) {
- return preg_match(sprintf('/%s/',
- CSS::get_identifier_regexp()),
- $string);
- }
-
- function parse_string($string) {
- if (preg_match(sprintf('/^(%s)\s*(.*)$/s', CSS_STRING1_REGEXP), $string, $matches)) {
- $value = $matches[1];
- $rest = $matches[2];
-
- $value = CSS::remove_backslash_at_newline($value);
-
- return array($value, $rest);
- };
-
- if (preg_match(sprintf('/^(%s)\s*(.*)$/s', CSS_STRING2_REGEXP), $string, $matches)) {
- $value = $matches[1];
- $rest = $matches[2];
-
- $value = CSS::remove_backslash_at_newline($value);
-
- return array($value, $rest);
- };
-
- return array(null, $string);
- }
-
- function remove_backslash_at_newline($value) {
- return preg_replace("/\\\\\n/", '', $value);
+ return preg_match('/-?([_a-z]|[\200-\377]|\\[0-9a-f]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])([_a-z0-9-]|[\200-\377]|\\[0-9a-f]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])*/', $string);
}
}
diff --git a/public_html/css.left.inc.php b/public_html/css.left.inc.php
index 28e11f1..a7c957d 100644
--- a/public_html/css.left.inc.php
+++ b/public_html/css.left.inc.php
@@ -4,9 +4,9 @@
require_once(HTML2PS_DIR.'value.left.php');
class CSSLeft extends CSSPropertyHandler {
- function CSSLeft() {
- $this->CSSPropertyHandler(false, false);
- $this->_autoValue = ValueLeft::fromString('auto');
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
+ $this->_autoValue = (new ValueLeft())->fromString('auto');
}
function _getAutoValue() {
@@ -18,18 +18,18 @@ function default_value() {
}
function parse($value) {
- return ValueLeft::fromString($value);
+ return (new ValueLeft())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_LEFT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'left';
}
}
-CSS::register_css_property(new CSSLeft);
+(new CSS())->register_css_property(new CSSLeft);
?>
\ No newline at end of file
diff --git a/public_html/css.letter-spacing.inc.php b/public_html/css.letter-spacing.inc.php
index 716aa5e..925b24a 100644
--- a/public_html/css.letter-spacing.inc.php
+++ b/public_html/css.letter-spacing.inc.php
@@ -4,10 +4,10 @@
class CSSLetterSpacing extends CSSPropertyHandler {
var $_default_value;
- function CSSLetterSpacing() {
- $this->CSSPropertyHandler(false, true);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, true);
- $this->_default_value = Value::fromString("0");
+ $this->_default_value = (new Value())->fromString("0");
}
function default_value() {
@@ -19,24 +19,24 @@ function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
if ($value === 'normal') {
return $this->_default_value;
- };
+ }
- return Value::fromString($value);
+ return (new Value())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_LETTER_SPACING;
}
- function get_property_name() {
+ function getPropertyName() {
return 'letter-spacing';
}
}
-CSS::register_css_property(new CSSLetterSpacing);
+(new CSS())->register_css_property(new CSSLetterSpacing);
?>
diff --git a/public_html/css.line-height.inc.php b/public_html/css.line-height.inc.php
index 38a4adf..319057a 100644
--- a/public_html/css.line-height.inc.php
+++ b/public_html/css.line-height.inc.php
@@ -10,8 +10,8 @@
class CSSLineHeight extends CSSSubFieldProperty {
var $_defaultValue;
- function CSSLineHeight(&$owner, $field) {
- $this->CSSSubFieldProperty($owner, $field);
+ function __construct(&$owner, $field) {
+ CSSSubFieldProperty::__construct($owner, $field);
$this->_defaultValue = new LineHeight_Relative(1.1);
}
@@ -23,21 +23,21 @@ function default_value() {
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
//
// The used value of the property is this number multiplied by the element's font size.
// Negative values are illegal. The computed value is the same as the specified value.
if (preg_match("/^\d+(\.\d+)?$/",$value)) {
return new LineHeight_Relative((float)$value);
- };
+ }
//
// The computed value of the property is this percentage multiplied by the element's
// computed font size. Negative values are illegal.
if (preg_match("/^\d+%$/",$value)) {
return new LineHeight_Relative(((float)$value)/100);
- };
+ }
// normal
// Tells user agents to set the used value to a "reasonable" value based on the font of the element.
@@ -45,7 +45,7 @@ function parse($value) {
// The computed value is 'normal'.
if (trim($value) === "normal") {
return $this->default_value();
- };
+ }
//
// The specified length is used in the calculation of the line box height.
@@ -53,11 +53,11 @@ function parse($value) {
return new LineHeight_Absolute($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_LINE_HEIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'line-height';
}
}
diff --git a/public_html/css.list-style-image.inc.php b/public_html/css.list-style-image.inc.php
index 8189044..a25c998 100644
--- a/public_html/css.list-style-image.inc.php
+++ b/public_html/css.list-style-image.inc.php
@@ -12,32 +12,32 @@ function default_value() {
function parse($value, &$pipeline) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
global $g_config;
if (!$g_config['renderimages']) {
- return CSSListStyleImage::default_value();
- };
+ return (new CSSListStyleImage())->default_value();
+ }
if (preg_match('/url\(([^)]+)\)/',$value, $matches)) {
$url = $matches[1];
$full_url = $pipeline->guess_url(css_remove_value_quotes($url));
return new ListStyleImage($full_url,
- ImageFactory::get($full_url, $pipeline));
- };
+ (new Image())->get($full_url, $pipeline));
+ }
/**
* 'none' value and all unrecognized values
*/
- return CSSListStyleImage::default_value();
+ return (new CSSListStyleImage())->default_value();
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_LIST_STYLE_IMAGE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'list-style-image';
}
}
diff --git a/public_html/css.list-style-position.inc.php b/public_html/css.list-style-position.inc.php
index 953f46b..1680f9c 100644
--- a/public_html/css.list-style-position.inc.php
+++ b/public_html/css.list-style-position.inc.php
@@ -11,20 +11,20 @@ function default_value() { return LSP_OUTSIDE; }
function parse($value) {
if (preg_match('/\binside\b/',$value)) {
return LSP_INSIDE;
- };
+ }
if (preg_match('/\boutside\b/',$value)) {
return LSP_OUTSIDE;
- };
+ }
return null;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_LIST_STYLE_POSITION;
}
- function get_property_name() {
+ function getPropertyName() {
return 'list-style-position';
}
}
diff --git a/public_html/css.list-style-type.inc.php b/public_html/css.list-style-type.inc.php
index 44e4833..756e98e 100644
--- a/public_html/css.list-style-type.inc.php
+++ b/public_html/css.list-style-type.inc.php
@@ -18,12 +18,12 @@ class CSSListStyleType extends CSSSubFieldProperty {
function default_value() { return LST_DISC; }
function parse($value) {
- if (preg_match('/\bnone\b/',$value)) { return LST_NONE; };
- if (preg_match('/\bdisc\b/',$value)) { return LST_DISC; };
- if (preg_match('/\bcircle\b/',$value)) { return LST_CIRCLE; };
- if (preg_match('/\bsquare\b/',$value)) { return LST_SQUARE; };
+ if (preg_match('/\bnone\b/',$value)) { return LST_NONE; }
+ if (preg_match('/\bdisc\b/',$value)) { return LST_DISC; }
+ if (preg_match('/\bcircle\b/',$value)) { return LST_CIRCLE; }
+ if (preg_match('/\bsquare\b/',$value)) { return LST_SQUARE; }
if (preg_match('/\bdecimal-leading-zero\b/',$value)) { return LST_DECIMAL_LEADING_ZERO; }
- if (preg_match('/\bdecimal\b/',$value)) { return LST_DECIMAL; };
+ if (preg_match('/\bdecimal\b/',$value)) { return LST_DECIMAL; }
if (preg_match('/\blower-roman\b/',$value)) { return LST_LOWER_ROMAN; }
if (preg_match('/\bupper-roman\b/',$value)) { return LST_UPPER_ROMAN; }
if (preg_match('/\blower-latin\b/',$value)) { return LST_LOWER_LATIN; }
@@ -33,15 +33,15 @@ function parse($value) {
// Unsupported CSS values:
// According to CSS 2.1 specs 12.6.2, a user agent that does not recognize a numbering system should use 'decimal'.
- if (preg_match('/\bhebrew\b/',$value)) { return LST_DECIMAL; };
- if (preg_match('/\bgeorgian\b/',$value)) { return LST_DECIMAL; };
- if (preg_match('/\barmenian\b/',$value)) { return LST_DECIMAL; };
- if (preg_match('/\bcjk-ideographic\b/',$value)) { return LST_DECIMAL; };
- if (preg_match('/\bhiragana\b/',$value)) { return LST_DECIMAL; };
- if (preg_match('/\bkarakana\b/',$value)) { return LST_DECIMAL; };
- if (preg_match('/\bhiragana-iroha\b/',$value)) { return LST_DECIMAL; };
- if (preg_match('/\bkatakana-iroha\b/',$value)) { return LST_DECIMAL; };
- if (preg_match('/\blower-greek\b/',$value)) { return LST_DECIMAL; };
+ if (preg_match('/\bhebrew\b/',$value)) { return LST_DECIMAL; }
+ if (preg_match('/\bgeorgian\b/',$value)) { return LST_DECIMAL; }
+ if (preg_match('/\barmenian\b/',$value)) { return LST_DECIMAL; }
+ if (preg_match('/\bcjk-ideographic\b/',$value)) { return LST_DECIMAL; }
+ if (preg_match('/\bhiragana\b/',$value)) { return LST_DECIMAL; }
+ if (preg_match('/\bkarakana\b/',$value)) { return LST_DECIMAL; }
+ if (preg_match('/\bhiragana-iroha\b/',$value)) { return LST_DECIMAL; }
+ if (preg_match('/\bkatakana-iroha\b/',$value)) { return LST_DECIMAL; }
+ if (preg_match('/\blower-greek\b/',$value)) { return LST_DECIMAL; }
return null;
}
@@ -75,11 +75,11 @@ function format_number($type,$num) {
}
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_LIST_STYLE_TYPE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'list-style-type';
}
}
diff --git a/public_html/css.list-style.inc.php b/public_html/css.list-style.inc.php
index dcdec4d..9d1b9b7 100644
--- a/public_html/css.list-style.inc.php
+++ b/public_html/css.list-style.inc.php
@@ -5,39 +5,39 @@
class CSSListStyle extends CSSPropertyHandler {
// CSS 2.1: list-style is inherited
- function CSSListStyle() {
+ function __construct() {
$this->default_value = new ListStyleValue;
- $this->default_value->image = CSSListStyleImage::default_value();
- $this->default_value->position = CSSListStylePosition::default_value();
- $this->default_value->type = CSSListStyleType::default_value();
+ $this->default_value->image = (new CSSListStyleImage())->default_value();
+ $this->default_value->position = (new CSSListStylePosition())->default_value();
+ $this->default_value->type = (new CSSListStyleType())->default_value();
- $this->CSSPropertyHandler(true, true);
+ CSSPropertyHandler::__construct(true, true);
}
function parse($value, &$pipeline) {
$style = new ListStyleValue;
- $style->image = CSSListStyleImage::parse($value, $pipeline);
- $style->position = CSSListStylePosition::parse($value);
- $style->type = CSSListStyleType::parse($value);
+ $style->image = (new CSSListStyleImage())->parse($value, $pipeline);
+ $style->position = (new CSSListStylePosition())->parse($value);
+ $style->type = (new CSSListStyleType())->parse($value);
return $style;
}
function default_value() { return $this->default_value; }
- function get_property_code() {
+ function getPropertyCode() {
return CSS_LIST_STYLE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'list-style';
}
}
$ls = new CSSListStyle;
-CSS::register_css_property($ls);
-CSS::register_css_property(new CSSListStyleImage($ls, 'image'));
-CSS::register_css_property(new CSSListStylePosition($ls, 'position'));
-CSS::register_css_property(new CSSListStyleType($ls, 'type'));
+(new CSS())->register_css_property($ls);
+(new CSS())->register_css_property(new CSSListStyleImage($ls, 'image'));
+(new CSS())->register_css_property(new CSSListStylePosition($ls, 'position'));
+(new CSS())->register_css_property(new CSSListStyleType($ls, 'type'));
?>
\ No newline at end of file
diff --git a/public_html/css.margin.inc.php b/public_html/css.margin.inc.php
index 4f776b8..104b42c 100644
--- a/public_html/css.margin.inc.php
+++ b/public_html/css.margin.inc.php
@@ -5,9 +5,9 @@
class CSSMargin extends CSSPropertyHandler {
var $default_value;
- function CSSMargin() {
+ function __construct() {
$this->default_value = $this->parse("0");
- $this->CSSPropertyHandler(false, false);
+ CSSPropertyHandler::__construct(false, false);
}
function default_value() {
@@ -15,7 +15,7 @@ function default_value() {
}
function parse_in($value) {
- $values = preg_split('/\s+/', trim($value));
+ $values = explode(" ",trim($value));
switch (count($values)) {
case 1:
@@ -39,92 +39,92 @@ function parse_in($value) {
default:
// We newer should get there, because 'margin' value can contain from 1 to 4 widths
return array(0,0,0,0);
- };
+ }
}
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
- $value = MarginValue::init($this->parse_in($value));
+ $value = (new MarginValue())->init($this->parse_in($value));
return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_MARGIN;
}
- function get_property_name() {
+ function getPropertyName() {
return 'margin';
}
}
class CSSMarginTop extends CSSSubFieldProperty {
function parse($value) {
- if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; };
- return MarginSideValue::init($value);
+ if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; }
+ return (new MarginSideValue())->init($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_MARGIN_TOP;
}
- function get_property_name() {
+ function getPropertyName() {
return 'margin-top';
}
}
class CSSMarginRight extends CSSSubFieldProperty {
function parse($value) {
- if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; };
- return MarginSideValue::init($value);
+ if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; }
+ return (new MarginSideValue())->init($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_MARGIN_RIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'margin-right';
}
}
class CSSMarginLeft extends CSSSubFieldProperty {
function parse($value) {
- if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; };
- return MarginSideValue::init($value);
+ if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; }
+ return (new MarginSideValue())->init($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_MARGIN_LEFT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'margin-left';
}
}
class CSSMarginBottom extends CSSSubFieldProperty {
function parse($value) {
- if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; };
- return MarginSideValue::init($value);
+ if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; }
+ return (new MarginSideValue())->init($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_MARGIN_BOTTOM;
}
- function get_property_name() {
+ function getPropertyName() {
return 'margin-bottom';
}
}
$mh = new CSSMargin;
-CSS::register_css_property($mh);
-CSS::register_css_property(new CSSMarginLeft($mh, 'left'));
-CSS::register_css_property(new CSSMarginRight($mh, 'right'));
-CSS::register_css_property(new CSSMarginTop($mh, 'top'));
-CSS::register_css_property(new CSSMarginBottom($mh, 'bottom'));
+(new CSS())->register_css_property($mh);
+(new CSS())->register_css_property(new CSSMarginLeft($mh, 'left'));
+(new CSS())->register_css_property(new CSSMarginRight($mh, 'right'));
+(new CSS())->register_css_property(new CSSMarginTop($mh, 'top'));
+(new CSS())->register_css_property(new CSSMarginBottom($mh, 'bottom'));
?>
diff --git a/public_html/css.max-height.inc.php b/public_html/css.max-height.inc.php
index 46b8c07..47a9f34 100644
--- a/public_html/css.max-height.inc.php
+++ b/public_html/css.max-height.inc.php
@@ -6,9 +6,9 @@
class CSSMaxHeight extends CSSPropertyHandler {
var $_defaultValue;
- function CSSMaxHeight() {
- $this->CSSPropertyHandler(true, false);
- $this->_defaultValue = ValueMaxHeight::fromString("auto");
+ function __construct() {
+ CSSPropertyHandler::__construct(true, false);
+ $this->_defaultValue = (new ValueMaxHeight())->fromString("auto");
}
/**
@@ -38,20 +38,20 @@ function default_value() {
function parse($value) {
if ($value == 'none') {
- return ValueMaxHeight::fromString('auto');
- };
- return ValueMaxHeight::fromString($value);
+ return (new ValueMaxHeight())->fromString('auto');
+ }
+ return (new ValueMaxHeight())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_MAX_HEIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'max-height';
}
}
-CSS::register_css_property(new CSSMaxHeight);
+(new CSS())->register_css_property(new CSSMaxHeight);
?>
\ No newline at end of file
diff --git a/public_html/css.min-height.inc.php b/public_html/css.min-height.inc.php
index 75ad3c1..1db35ee 100644
--- a/public_html/css.min-height.inc.php
+++ b/public_html/css.min-height.inc.php
@@ -6,9 +6,9 @@
class CSSMinHeight extends CSSPropertyHandler {
var $_defaultValue;
- function CSSMinHeight() {
- $this->CSSPropertyHandler(true, false);
- $this->_defaultValue = ValueMinHeight::fromString("0px");
+ function __construct() {
+ CSSPropertyHandler::__construct(true, false);
+ $this->_defaultValue = (new ValueMinHeight())->fromString("0px");
}
/**
@@ -37,18 +37,18 @@ function default_value() {
}
function parse($value) {
- return ValueMinHeight::fromString($value);
+ return (new ValueMinHeight())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_MIN_HEIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'min-height';
}
}
-CSS::register_css_property(new CSSMinHeight);
+(new CSS())->register_css_property(new CSSMinHeight);
?>
\ No newline at end of file
diff --git a/public_html/css.min-width.inc.php b/public_html/css.min-width.inc.php
index 0c5e5c3..79eafc1 100644
--- a/public_html/css.min-width.inc.php
+++ b/public_html/css.min-width.inc.php
@@ -2,15 +2,15 @@
// $Header: /cvsroot/html2ps/css.min-width.inc.php,v 1.1 2006/09/07 18:38:14 Konstantin Exp $
class CSSMinWidth extends CSSSubFieldProperty {
- function CSSMinWidth(&$owner, $field) {
- $this->CSSSubFieldProperty($owner, $field);
+ function __construct(&$owner, $field) {
+ CSSSubFieldProperty::__construct($owner, $field);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_MIN_WIDTH;
}
- function get_property_name() {
+ function getPropertyName() {
return 'min-width';
}
@@ -19,7 +19,7 @@ function parse($value) {
return CSS_PROPERTY_INHERIT;
}
- return Value::fromString($value);
+ return (new Value())->fromString($value);
}
}
diff --git a/public_html/css.orphans.inc.php b/public_html/css.orphans.inc.php
index ea40735..e69a587 100644
--- a/public_html/css.orphans.inc.php
+++ b/public_html/css.orphans.inc.php
@@ -1,8 +1,8 @@
CSSPropertyHandler(true, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, false);
}
function default_value() {
@@ -13,15 +13,15 @@ function parse($value) {
return (int)$value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_ORPHANS;
}
- function get_property_name() {
+ function getPropertyName() {
return 'orphans';
}
}
-CSS::register_css_property(new CSSOrphans);
+(new CSS())->register_css_property(new CSSOrphans);
?>
\ No newline at end of file
diff --git a/public_html/css.overflow.inc.php b/public_html/css.overflow.inc.php
index 9b3330c..df7f4fb 100644
--- a/public_html/css.overflow.inc.php
+++ b/public_html/css.overflow.inc.php
@@ -5,8 +5,8 @@
define('OVERFLOW_HIDDEN',1);
class CSSOverflow extends CSSPropertyStringSet {
- function CSSOverflow() {
- $this->CSSPropertyStringSet(false,
+ function __construct() {
+ CSSPropertyStringSet::__construct(false,
false,
array('inherit' => CSS_PROPERTY_INHERIT,
'hidden' => OVERFLOW_HIDDEN,
@@ -19,15 +19,15 @@ function default_value() {
return OVERFLOW_VISIBLE;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_OVERFLOW;
}
- function get_property_name() {
+ function getPropertyName() {
return 'overflow';
}
}
-CSS::register_css_property(new CSSOverflow);
+(new CSS())->register_css_property(new CSSOverflow);
?>
diff --git a/public_html/css.padding.inc.php b/public_html/css.padding.inc.php
index cf06095..57c7bc8 100644
--- a/public_html/css.padding.inc.php
+++ b/public_html/css.padding.inc.php
@@ -5,15 +5,15 @@
class CSSPadding extends CSSPropertyHandler {
var $default_value;
- function CSSPadding() {
+ function __construct() {
$this->default_value = $this->parse("0");
- $this->CSSPropertyHandler(false, false);
+ CSSPropertyHandler::__construct(false, false);
}
function default_value() { return $this->default_value->copy(); }
function parse_in($value) {
- $values = preg_split('/\s+/', trim($value));
+ $values = explode(" ",trim($value));
switch (count($values)) {
case 1:
$v1 = $values[0];
@@ -36,71 +36,70 @@ function parse_in($value) {
default:
// We newer should get there, because 'padding' value can contain from 1 to 4 widths
return array(0,0,0,0);
- };
+ }
}
function parse($string) {
if ($string === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
- $values = $this->parse_in($string);
- $padding = PaddingValue::init($values);
+ $padding = (new PaddingValue())->init($this->parse_in($string));
return $padding;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PADDING;
}
- function get_property_name() {
+ function getPropertyName() {
return 'padding';
}
}
class CSSPaddingTop extends CSSSubFieldProperty {
function parse($value) {
- if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; };
- return PaddingSideValue::init($value);
+ if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; }
+ return (new PaddingSideValue())->init($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PADDING_TOP;
}
- function get_property_name() {
+ function getPropertyName() {
return 'padding-top';
}
}
class CSSPaddingRight extends CSSSubFieldProperty {
function parse($value) {
- if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; };
- $result = PaddingSideValue::init($value);
+ if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; }
+ $result = (new PaddingSideValue())->init($value);
return $result;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PADDING_RIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'padding-right';
}
}
class CSSPaddingLeft extends CSSSubFieldProperty {
function parse($value) {
- if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; };
- return PaddingSideValue::init($value);
+ if ($value === 'inherit') { return CSS_PROPERTY_INHERIT; }
+ return (new PaddingSideValue())->init($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PADDING_LEFT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'padding-left';
}
}
@@ -109,25 +108,25 @@ class CSSPaddingBottom extends CSSSubFieldProperty {
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
- return PaddingSideValue::init($value);
+ return (new PaddingSideValue())->init($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PADDING_BOTTOM;
}
- function get_property_name() {
+ function getPropertyName() {
return 'padding-bottom';
}
}
$ph = new CSSPadding;
-CSS::register_css_property($ph);
-CSS::register_css_property(new CSSPaddingLeft($ph, 'left'));
-CSS::register_css_property(new CSSPaddingRight($ph, 'right'));
-CSS::register_css_property(new CSSPaddingTop($ph, 'top'));
-CSS::register_css_property(new CSSPaddingBottom($ph, 'bottom'));
+(new CSS())->register_css_property($ph);
+(new CSS())->register_css_property(new CSSPaddingLeft($ph, 'left'));
+(new CSS())->register_css_property(new CSSPaddingRight($ph, 'right'));
+(new CSS())->register_css_property(new CSSPaddingTop($ph, 'top'));
+(new CSS())->register_css_property(new CSSPaddingBottom($ph, 'bottom'));
?>
diff --git a/public_html/css.page-break-after.inc.php b/public_html/css.page-break-after.inc.php
index 51063cb..773ba8f 100644
--- a/public_html/css.page-break-after.inc.php
+++ b/public_html/css.page-break-after.inc.php
@@ -2,15 +2,15 @@
// $Header: /cvsroot/html2ps/css.page-break-after.inc.php,v 1.3 2007/01/09 20:13:48 Konstantin Exp $
class CSSPageBreakAfter extends CSSPageBreak {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PAGE_BREAK_AFTER;
}
- function get_property_name() {
+ function getPropertyName() {
return 'page-break-after';
}
}
-CSS::register_css_property(new CSSPageBreakAfter);
+(new CSS())->register_css_property(new CSSPageBreakAfter);
?>
\ No newline at end of file
diff --git a/public_html/css.page-break-before.inc.php b/public_html/css.page-break-before.inc.php
index c7b19c7..26f9ca6 100644
--- a/public_html/css.page-break-before.inc.php
+++ b/public_html/css.page-break-before.inc.php
@@ -2,15 +2,15 @@
// $Header: /cvsroot/html2ps/css.page-break-before.inc.php,v 1.1.2.1 2006/11/16 03:19:36 Konstantin Exp $
class CSSPageBreakBefore extends CSSPageBreak {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PAGE_BREAK_BEFORE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'page-break-before';
}
}
-CSS::register_css_property(new CSSPageBreakBefore);
+(new CSS())->register_css_property(new CSSPageBreakBefore);
?>
\ No newline at end of file
diff --git a/public_html/css.page-break-inside.inc.php b/public_html/css.page-break-inside.inc.php
index 21cf6ec..1531219 100644
--- a/public_html/css.page-break-inside.inc.php
+++ b/public_html/css.page-break-inside.inc.php
@@ -2,15 +2,15 @@
// $Header: /cvsroot/html2ps/css.page-break-inside.inc.php,v 1.1.2.1 2006/11/16 03:19:36 Konstantin Exp $
class CSSPageBreakInside extends CSSPageBreak {
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PAGE_BREAK_INSIDE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'page-break-inside';
}
}
-CSS::register_css_property(new CSSPageBreakInside);
+(new CSS())->register_css_property(new CSSPageBreakInside);
?>
\ No newline at end of file
diff --git a/public_html/css.page-break.inc.php b/public_html/css.page-break.inc.php
index 54635c7..6a901c4 100644
--- a/public_html/css.page-break.inc.php
+++ b/public_html/css.page-break.inc.php
@@ -7,8 +7,8 @@
define('PAGE_BREAK_RIGHT' ,4);
class CSSPageBreak extends CSSPropertyStringSet {
- function CSSPageBreak() {
- $this->CSSPropertyStringSet(false,
+ function __construct() {
+ CSSPropertyStringSet::__construct(false,
false,
array('inherit' => CSS_PROPERTY_INHERIT,
'auto' => PAGE_BREAK_AUTO,
diff --git a/public_html/css.page.inc.php b/public_html/css.page.inc.php
index 012463b..75ba186 100644
--- a/public_html/css.page.inc.php
+++ b/public_html/css.page.inc.php
@@ -2,8 +2,8 @@
// $Header: /cvsroot/html2ps/css.color.inc.php,v 1.13 2007/01/24 18:55:51 Konstantin Exp $
class CSSPage extends CSSPropertyHandler {
- function CSSPage() {
- $this->CSSPropertyHandler(true, true);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, true);
}
function default_value() {
@@ -14,15 +14,15 @@ function parse($value) {
return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_PAGE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'page';
}
}
-CSS::register_css_property(new CSSPage());
+(new CSS())->register_css_property(new CSSPage());
?>
\ No newline at end of file
diff --git a/public_html/css.parse.inc.php b/public_html/css.parse.inc.php
index 16bfa47..8caab90 100644
--- a/public_html/css.parse.inc.php
+++ b/public_html/css.parse.inc.php
@@ -1,9 +1,8 @@
add_property(CSSPropertyDeclaration::create($code, trim($matches[2]), $pipeline));
-// return $collection;
-// } elseif (preg_match("/@import\s+\"(.*)\";/",$property, $matches)) {
-// // @import ""
-// $collection =& css_import(trim($matches[1]), $pipeline);
-// return $collection;
-// } elseif (preg_match("/@import\s+url\((.*)\);/",$property, $matches)) {
-// // @import url()
-// $collection =& css_import(trim($matches[1]), $pipeline);
-// return $collection;
-// } elseif (preg_match("/@import\s+(.*);/",$property, $matches)) {
-// // @import
-// $collection =& css_import(trim($matches[1]), $pipeline);
-// return $collection;
-// } else {
-// $collection =& new CSSPropertyCollection();
-// return $collection;
-// };
-// }
+
+function parse_css_property($property, &$pipeline) {
+ if (preg_match("/^(.*?)\s*:\s*(.*)/",$property, $matches)) {
+ $name = strtolower(trim($matches[1]));
+ $code = (new CSS())->word2code($name);
+ if (is_null($code)) {
+ error_log(sprintf("Unsupported CSS property: '%s'", $name));
+ return null;
+ }
+
+ $collection = new CSSPropertyCollection();
+ $collection->addProperty((new CSSPropertyDeclaration())->create($code, trim($matches[2]), $pipeline));
+ return $collection;
+ } elseif (preg_match("/@import\s+\"(.*)\";/",$property, $matches)) {
+ // @import ""
+ css_import(trim($matches[1]), $pipeline);
+ } elseif (preg_match("/@import\s+url\((.*)\);/",$property, $matches)) {
+ // @import url()
+ css_import(trim($matches[1]), $pipeline);
+ } elseif (preg_match("/@import\s+(.*);/",$property, $matches)) {
+ // @import
+ css_import(trim($matches[1]), $pipeline);
+ } else {
+ return new CSSPropertyCollection();
+ }
+}
+
+function parse_css_properties($raw_properties, &$pipeline) {
+ $properties = explode(";",$raw_properties);
+
+ $property_collection = new CSSPropertyCollection();
+
+ foreach ($properties as $property) {
+ $result = parse_css_property(trim($property), $pipeline);
+ if (!is_null($result)) {
+ $property_collection->merge($result);
+ }
+ }
+
+ return $property_collection;
+}
?>
\ No newline at end of file
diff --git a/public_html/css.parse.media.inc.php b/public_html/css.parse.media.inc.php
index d683f86..4d10472 100644
--- a/public_html/css.parse.media.inc.php
+++ b/public_html/css.parse.media.inc.php
@@ -6,16 +6,9 @@ function is_allowed_media($media_list) {
$allowed_media = config_get_allowed_media();
$allowed_found = false;
- // Note that media names should be case-insensitive;
- // it is not guaranteed that $media_list contains lower-case variants,
- // as well as it is not guaranteed that configuration data contains them.
- // Thus, media name lists should be explicitly converted to lowercase
- $media_list = array_map('strtolower', $media_list);
- $allowed_media = array_map('strtolower', $allowed_media);
-
foreach ($media_list as $media) {
$allowed_found |= (array_search($media, $allowed_media) !== false);
- };
+ }
return $allowed_found;
}
diff --git a/public_html/css.parse.properties.php b/public_html/css.parse.properties.php
index 30eece5..d6aa608 100644
--- a/public_html/css.parse.properties.php
+++ b/public_html/css.parse.properties.php
@@ -6,41 +6,41 @@ function &parse_css_property($string, &$pipeline) {
}
function &parse_css_properties($string, &$pipeline) {
- $property_collection =& new CSSPropertyCollection();
+ $property_collection= new CSSPropertyCollection();
while ($string != '') {
$string = parse_css_properties_property($string, $code);
if (preg_match('/^\s*:\s*(.*?)$/si', $string, $matches)) {
$string = $matches[1];
- };
+ }
$string = parse_css_properties_value($string, $value);
if (preg_match('/^\s*;\s*(.*)$/si', $string, $matches)) {
$string = $matches[1];
- };
+ }
- $property =& CSSPropertyDeclaration::create($code, $value, $pipeline);
+ $property =& (new CSSPropertyDeclaration())->create($code, $value, $pipeline);
if (!is_null($property)) {
$property_collection->add_property($property);
- };
- };
+ }
+ }
return $property_collection;
}
function parse_css_properties_property($string, &$code) {
- $identifier_regexp = CSS::get_identifier_regexp();
+ $identifier_regexp = (new CSS())->get_identifier_regexp();
if (!preg_match(sprintf('/^\s*(%s)(.*)/si', $identifier_regexp), $string, $matches)) {
$code = null;
return '';
- };
+ }
$name = strtolower(trim($matches[1]));
$rest = $matches[2];
- $code = CSS::name2code($name);
+ $code = (new CSS())->name2code($name);
return $rest;
}
@@ -53,17 +53,17 @@ function parse_css_properties_value($string, &$value) {
do {
$matched = false;
- list($new_value, $string) = CSS::parse_string($string);
+ list($new_value, $string) = (new CSS())->parse_string($string);
if (!is_null($new_value)) {
$value .= $new_value;
$matched = true;
- };
+ }
if (preg_match('/^('.CSS_FUNCTION_REGEXP.CSS_IDENT_REGEXP.'\))\s*(.*)$/si', $string, $matches)) {
$value .= $matches[1];
$string = $matches[2];
$matched = true;
- };
+ }
} while ($matched);
$value_regexp = '[^;]*?';
@@ -72,7 +72,7 @@ function parse_css_properties_value($string, &$value) {
$rest = $matches[2];
return $rest;
- };
+ }
$value = $value.trim($string);
return '';
diff --git a/public_html/css.position.inc.php b/public_html/css.position.inc.php
index cadace9..261c68c 100644
--- a/public_html/css.position.inc.php
+++ b/public_html/css.position.inc.php
@@ -11,8 +11,8 @@
define('POSITION_FOOTNOTE',4);
class CSSPosition extends CSSPropertyStringSet {
- function CSSPosition() {
- $this->CSSPropertyStringSet(false,
+ function __construct() {
+ CSSPropertyStringSet::__construct(false,
false,
array('inherit' => CSS_PROPERTY_INHERIT,
'absolute' => POSITION_ABSOLUTE,
@@ -26,15 +26,15 @@ function default_value() {
return POSITION_STATIC;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_POSITION;
}
- function get_property_name() {
+ function getPropertyName() {
return 'position';
}
}
-CSS::register_css_property(new CSSPosition);
+(new CSS())->register_css_property(new CSSPosition);
?>
\ No newline at end of file
diff --git a/public_html/css.property.collection.php b/public_html/css.property.collection.php
index c90b2b9..5b22a36 100644
--- a/public_html/css.property.collection.php
+++ b/public_html/css.property.collection.php
@@ -6,31 +6,13 @@ class CSSPropertyCollection {
var $_priorities;
var $_max_priority;
- function CSSPropertyCollection() {
- $this->_properties = array();
- $this->_positions = array();
- $this->_priorities = array();
- $this->_max_priority = 0;
- }
-
- function apply(&$state) {
- $properties = $this->getPropertiesRaw();
- foreach ($properties as $property) {
- $key = $property->get_code();
- $value = $property->get_value();
-
- $handler =& CSS::get_handler($key);
- $handler->replace($value, $state);
- };
- }
-
function ©() {
- $collection =& new CSSPropertyCollection();
+ $collection= new CSSPropertyCollection();
- for ($i = 0, $size = count($this->_properties); $i < $size; $i++) {
+ for ($i = 0, $size = count((array) $this->_properties); $i < $size; $i++) {
$property =& $this->_properties[$i];
$collection->_properties[] =& $property->copy();
- };
+ }
$collection->_positions = $this->_positions;
$collection->_priorities = $this->_priorities;
@@ -39,18 +21,25 @@ function ©() {
return $collection;
}
- function add_property($property) {
+ function __construct() {
+ $this->_properties = array();
+ $this->_positions = array();
+ $this->_priorities = array();
+ $this->_max_priority = 0;
+ }
+
+ function addProperty($property) {
$this->_max_priority ++;
- $code = $property->get_code();
+ $code = $property->getCode();
/**
* Important properties shoud not be overridden with non-important ones
*/
- if ($this->is_important($code) &&
- !$property->is_important()) {
+ if ($this->isImportant($code) &&
+ !$property->isImportant()) {
return;
- };
+ }
if (array_key_exists($code, $this->_positions)) {
$this->_properties[$this->_positions[$code]] = $property;
@@ -58,12 +47,8 @@ function add_property($property) {
} else {
$this->_properties[] = $property;
$this->_priorities[] = $this->_max_priority;
- $this->_positions[$code] = count($this->_priorities)-1;
- };
- }
-
- function contains($code) {
- return isset($this->_positions[$code]);
+ $this->_positions[$code] = count((array) $this->_priorities)-1;
+ }
}
function getMaxPriority() {
@@ -83,30 +68,19 @@ function getPropertiesRaw() {
return $this->_properties;
}
- function is_important($code) {
+ function isImportant($code) {
if (!isset($this->_positions[$code])) {
return false;
- };
- return $this->_properties[$this->_positions[$code]]->is_important();
+ }
+ return $this->_properties[$this->_positions[$code]]->isImportant();
}
- function &get_property_value($code) {
- if (!isset($this->_positions[$code])) {
- $null = null;
- return $null;
- };
-
- if (!isset($this->_properties[$this->_positions[$code]])) {
- $null = null;
- return $null;
- };
-
- $property =& $this->_properties[$this->_positions[$code]];
- return $property->get_value();
+ function getPropertyValue($code) {
+ return $this->_properties[$this->_positions[$code]]->getValue();
}
- function set_property_value($code, $value) {
- $this->_properties[$this->_positions[$code]]->set_value($value);
+ function setPropertyValue($code, $value) {
+ $this->_properties[$this->_positions[$code]]->setValue($value);
}
/**
@@ -116,8 +90,8 @@ function set_property_value($code, $value) {
function merge($collection) {
$properties = $collection->getPropertiesSortedByPriority();
foreach ($properties as $property) {
- $this->add_property($property);
- };
+ $this->addProperty($property);
+ }
}
}
diff --git a/public_html/css.property.declaration.php b/public_html/css.property.declaration.php
index 2c983a1..dfd67dc 100644
--- a/public_html/css.property.declaration.php
+++ b/public_html/css.property.declaration.php
@@ -5,69 +5,58 @@ class CSSPropertyDeclaration {
var $_value;
var $_important;
- function CSSPropertyDeclaration() {
- $this->_code = 0;
- $this->_value = null;
- $this->_important = false;
- }
-
- function &get_value() {
+ function getValue() {
return $this->_value;
}
- function set_code($code) {
- $this->_code = $code;
- }
-
- function set_important($value) {
- $this->_important = $value;
+ function setValue($value) {
+ $this->_value = $value;
}
- function set_value(&$value) {
- $this->_value =& $value;
+ function __construct() {
+ $this->_code = 0;
+ $this->_value = null;
+ $this->_important = false;
}
- function &create($code, $value, $pipeline) {
- $handler =& CSS::get_handler($code);
- if (is_null($handler)) {
- $null = null;
- return $null;
- };
+ function create($code, $value, $pipeline) {
+ $declaration = new CSSPropertyDeclaration();
- $declaration =& new CSSPropertyDeclaration();
- $declaration->_code = $code;
+ $declaration->_code = $code;
if (preg_match("/^(.*)!\s*important\s*$/", $value, $matches)) {
$value = $matches[1];
$declaration->_important = true;
} else {
$declaration->_important = false;
- };
+ }
+ $handler =& (new CSS())->get_handler($code);
$declaration->_value = $handler->parse($value, $pipeline);
+
return $declaration;
}
- function get_code() {
+ function getCode() {
return $this->_code;
}
function ©() {
- $declaration =& new CSSPropertyDeclaration();
+ $declaration= new CSSPropertyDeclaration();
$declaration->_code = $this->_code;
if (is_object($this->_value)) {
$declaration->_value =& $this->_value->copy();
} else {
$declaration->_value =& $this->_value;
- };
+ }
$declaration->_important = $this->_important;
return $declaration;
}
-
- function is_important() {
+
+ function isImportant() {
return $this->_important;
}
}
diff --git a/public_html/css.property.handler.class.php b/public_html/css.property.handler.class.php
index 60cfea1..02f92fe 100644
--- a/public_html/css.property.handler.class.php
+++ b/public_html/css.property.handler.class.php
@@ -5,11 +5,11 @@ class CSSPropertyHandler {
var $_inheritable_text;
function css($value, &$pipeline) {
- $css_state =& $pipeline->get_current_css_state();
+ $css_state =& $pipeline->getCurrentCSSState();
if ($this->applicable($css_state)) {
$this->replace($this->parse($value, $pipeline), $css_state);
- };
+ }
}
function applicable($css_state) {
@@ -17,36 +17,33 @@ function applicable($css_state) {
}
function clearDefaultFlags(&$state) {
- $state->set_propertyDefaultFlag($this->get_property_code(), false);
+ $state->setPropertyDefaultFlag($this->getPropertyCode(), false);
}
- function CSSPropertyHandler($inheritable, $inheritable_text) {
+ function __construct($inheritable, $inheritable_text) {
$this->_inheritable = $inheritable;
$this->_inheritable_text = $inheritable_text;
}
/**
* Optimization: this function is called very often, so
- * we minimize the overhead by calling $this->get_property_code()
+ * we minimize the overhead by calling $this->getPropertyCode()
* once per property handler object instead of calling in every
* CSSPropertyHandler::get() call.
*/
function &get(&$state) {
- static $property_code = null;
- if (is_null($property_code)) {
- $property_code = $this->get_property_code();
- };
-
+ $property_code = $this->getPropertyCode();
+
if (!isset($state[$property_code])) {
$null = null;
return $null;
- };
+ }
return $state[$property_code];
}
function inherit($old_state, &$new_state) {
- $code = $this->get_property_code();
+ $code = $this->getPropertyCode();
$new_state[$code] = ($this->_inheritable ?
$old_state[$code] :
$this->default_value());
@@ -61,13 +58,13 @@ function isInheritable() {
}
function inherit_text($old_state, &$new_state) {
- $code = $this->get_property_code();
+ $code = $this->getPropertyCode();
if ($this->_inheritable_text) {
$new_state[$code] = $old_state[$code];
} else {
$new_state[$code] = $this->default_value();
- };
+ }
}
function is_default($value) {
@@ -75,27 +72,24 @@ function is_default($value) {
return $value->is_default();
} else {
return $this->default_value() === $value;
- };
+ }
}
function is_subproperty() { return false; }
function replace($value, &$state) {
- $state->set_property($this->get_property_code(), $value);
+ $state->setProperty($this->getPropertyCode(), $value);
}
function replaceDefault($value, &$state) {
- $state->set_propertyDefault($this->get_property_code(), $value);
+ $state->setPropertyDefault($this->getPropertyCode(), $value);
}
function replace_array($value, &$state) {
- static $property_code = null;
- if (is_null($property_code)) {
- $property_code = $this->get_property_code();
- };
-
+ $property_code = $this->getPropertyCode();
+
$state[$property_code] = $value;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/public_html/css.property.stringset.class.php b/public_html/css.property.stringset.class.php
index d071f60..312c887 100644
--- a/public_html/css.property.stringset.class.php
+++ b/public_html/css.property.stringset.class.php
@@ -4,8 +4,8 @@ class CSSPropertyStringSet extends CSSPropertyHandler {
var $_mapping;
var $_keys;
- function CSSPropertyStringSet($inherit, $inherit_text, $mapping) {
- $this->CSSPropertyHandler($inherit, $inherit_text);
+ function __construct($inherit, $inherit_text, $mapping) {
+ CSSPropertyHandler::__construct($inherit, $inherit_text);
$this->_mapping = $mapping;
@@ -17,7 +17,7 @@ function CSSPropertyStringSet($inherit, $inherit_text, $mapping) {
$this->_keys = $mapping;
foreach ($this->_keys as $key => $value) {
$this->_keys[$key] = 1;
- };
+ }
}
function parse($value) {
@@ -25,7 +25,7 @@ function parse($value) {
if (isset($this->_keys[$value])) {
return $this->_mapping[$value];
- };
+ }
return $this->default_value();
}
diff --git a/public_html/css.property.sub.class.php b/public_html/css.property.sub.class.php
index 306bdc0..8421edc 100644
--- a/public_html/css.property.sub.class.php
+++ b/public_html/css.property.sub.class.php
@@ -3,14 +3,14 @@
class CSSSubProperty extends CSSPropertyHandler {
var $_owner;
- function CSSSubProperty(&$owner) {
+ function __construct(&$owner) {
$this->_owner =& $owner;
}
function &get(&$state) {
$owner =& $this->owner();
$value =& $owner->get($state);
- $subvalue =& $this->get_value($value);
+ $subvalue =& $this->getValue($value);
return $subvalue;
}
@@ -34,19 +34,19 @@ function inherit_text($old_state, &$new_state) {
function replace_array($value, &$state_array) {
$owner =& $this->owner();
- $owner_value = $state_array[$owner->get_property_code()];
+ $owner_value = $state_array[$owner->getPropertyCode()];
if (is_object($owner_value)) {
$owner_value = $owner_value->copy();
- };
+ }
if (is_object($value)) {
- $this->set_value($owner_value, $value->copy());
+ $this->setValue($owner_value, $value->copy());
} else {
- $this->set_value($owner_value, $value);
- };
+ $this->setValue($owner_value, $value);
+ }
- $state_array[$owner->get_property_code()] = $owner_value;
+ $state_array[$owner->getPropertyCode()] = $owner_value;
}
function replace($value, &$state) {
@@ -55,25 +55,25 @@ function replace($value, &$state) {
if (is_object($owner_value)) {
$owner_value =& $owner_value->copy();
- };
+ }
if (is_object($value)) {
$value_copy =& $value->copy();
- $this->set_value($owner_value, $value_copy);
+ $this->setValue($owner_value, $value_copy);
} else {
- $this->set_value($owner_value, $value);
- };
+ $this->setValue($owner_value, $value);
+ }
$owner->replaceDefault($owner_value, $state);
- $state->set_propertyDefaultFlag($this->get_property_code(), false);
+ $state->setPropertyDefaultFlag($this->getPropertyCode(), false);
}
- function set_value(&$owner_value, &$value) {
- error_no_method('set_value', get_class($this));
+ function setValue(&$owner_value, &$value) {
+ error_no_method('setValue', get_class($this));
}
- function &get_value(&$owner_value) {
- error_no_method('get_value', get_class($this));
+ function &getValue(&$owner_value) {
+ error_no_method('getValue', get_class($this));
}
}
diff --git a/public_html/css.property.sub.field.class.php b/public_html/css.property.sub.field.class.php
index d0070ae..399b7c5 100644
--- a/public_html/css.property.sub.field.class.php
+++ b/public_html/css.property.sub.field.class.php
@@ -4,17 +4,17 @@ class CSSSubFieldProperty extends CSSSubProperty {
var $_owner;
var $_owner_field;
- function CSSSubFieldProperty(&$owner, $field) {
- $this->CSSSubProperty($owner);
+ function __construct(&$owner = null, $field = null) {
+ CSSSubProperty::__construct($owner);
$this->_owner_field = $field;
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$field = $this->_owner_field;
$owner_value->$field = $value;
}
- function &get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
$field = $this->_owner_field;
return $owner_value->$field;
}
diff --git a/public_html/css.pseudo.align.inc.php b/public_html/css.pseudo.align.inc.php
index de82ee5..1f834d2 100644
--- a/public_html/css.pseudo.align.inc.php
+++ b/public_html/css.pseudo.align.inc.php
@@ -8,7 +8,7 @@
// This is a pseudo CSS property for
class CSSPseudoAlign extends CSSPropertyHandler {
- function CSSPseudoAlign() { $this->CSSPropertyHandler(true, true); }
+ function __construct() { CSSPropertyHandler::__construct(true, true); }
function default_value() {
return PA_LEFT;
@@ -56,15 +56,15 @@ function value2pdf($value) {
}
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_ALIGN;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-align';
}
}
-CSS::register_css_property(new CSSPseudoAlign);
+(new CSS())->register_css_property(new CSSPseudoAlign);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.cellpadding.inc.php b/public_html/css.pseudo.cellpadding.inc.php
index f512cfe..181812a 100644
--- a/public_html/css.pseudo.cellpadding.inc.php
+++ b/public_html/css.pseudo.cellpadding.inc.php
@@ -2,27 +2,27 @@
// $Header: /cvsroot/html2ps/css.pseudo.cellpadding.inc.php,v 1.6 2006/09/07 18:38:14 Konstantin Exp $
class CSSCellPadding extends CSSPropertyHandler {
- function CSSCellPadding() {
- $this->CSSPropertyHandler(true, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, false);
}
function default_value() {
- return Value::fromData(1, UNIT_PX);
+ return (new Value())->fromData(1, UNIT_PX);
}
function parse($value) {
- return Value::fromString($value);
+ return (new Value())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_CELLPADDING;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-cellpadding';
}
}
-CSS::register_css_property(new CSSCellPadding);
+(new CSS())->register_css_property(new CSSCellPadding);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.cellspacing.inc.php b/public_html/css.pseudo.cellspacing.inc.php
index f7c3b1d..58efffb 100644
--- a/public_html/css.pseudo.cellspacing.inc.php
+++ b/public_html/css.pseudo.cellspacing.inc.php
@@ -2,27 +2,27 @@
// $Header: /cvsroot/html2ps/css.pseudo.cellspacing.inc.php,v 1.6 2006/09/07 18:38:14 Konstantin Exp $
class CSSCellSpacing extends CSSPropertyHandler {
- function CSSCellSpacing() {
- $this->CSSPropertyHandler(true, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, false);
}
function default_value() {
- return Value::fromData(1, UNIT_PX);
+ return (new Value())->fromData(1, UNIT_PX);
}
function parse($value) {
- return Value::fromString($value);
+ return (new Value())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_CELLSPACING;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-cellspacing';
}
}
-CSS::register_css_property(new CSSCellSpacing);
+(new CSS())->register_css_property(new CSSCellSpacing);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.form.action.inc.php b/public_html/css.pseudo.form.action.inc.php
index 4f56378..b9eb4c8 100644
--- a/public_html/css.pseudo.form.action.inc.php
+++ b/public_html/css.pseudo.form.action.inc.php
@@ -1,7 +1,7 @@
CSSPropertyHandler(true, true); }
+ function __construct() { CSSPropertyHandler::__construct(true, true); }
function default_value() { return null; }
@@ -9,15 +9,15 @@ function parse($value) {
return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_FORM_ACTION;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-form-action';
}
}
-CSS::register_css_property(new CSSPseudoFormAction);
+(new CSS())->register_css_property(new CSSPseudoFormAction);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.form.radiogroup.inc.php b/public_html/css.pseudo.form.radiogroup.inc.php
index 21ddf31..dc8aa0e 100644
--- a/public_html/css.pseudo.form.radiogroup.inc.php
+++ b/public_html/css.pseudo.form.radiogroup.inc.php
@@ -1,8 +1,8 @@
CSSPropertyHandler(true, true);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, true);
}
function default_value() {
@@ -13,15 +13,15 @@ function parse($value) {
return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_FORM_RADIOGROUP;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-form-radiogroup';
}
}
-CSS::register_css_property(new CSSPseudoFormRadioGroup);
+(new CSS())->register_css_property(new CSSPseudoFormRadioGroup);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.link.destination.inc.php b/public_html/css.pseudo.link.destination.inc.php
index 690500d..45c25a8 100644
--- a/public_html/css.pseudo.link.destination.inc.php
+++ b/public_html/css.pseudo.link.destination.inc.php
@@ -1,27 +1,27 @@
CSSPropertyHandler(false, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
}
function default_value() {
- return null;
+ return "";
}
function parse($value) {
return $value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_LINK_DESTINATION;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-link-destination';
}
}
-CSS::register_css_property(new CSSPseudoLinkDestination);
+(new CSS())->register_css_property(new CSSPseudoLinkDestination);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.link.target.inc.php b/public_html/css.pseudo.link.target.inc.php
index 98d8691..4828a57 100644
--- a/public_html/css.pseudo.link.target.inc.php
+++ b/public_html/css.pseudo.link.target.inc.php
@@ -1,39 +1,39 @@
CSSPropertyHandler(true, true); }
+ function __construct() { CSSPropertyHandler::__construct(true, true); }
function default_value() { return ""; }
function is_external_link($value) {
- return (strlen($value) > 0 && $value{0} != "#");
+ return (strlen($value) > 0 && $value[0] != "#");
}
function is_local_link($value) {
- return (strlen($value) > 0 && $value{0} == "#");
+ return (strlen($value) > 0 && $value[0] == "#");
}
function parse($value, &$pipeline) {
// Keep local links (starting with sharp sign) as-is
- if (CSSPseudoLinkTarget::is_local_link($value)) { return $value; }
+ if ((new CSSPseudoLinkTarget())->is_local_link($value)) { return $value; }
$data = @parse_url($value);
if (!isset($data['scheme']) || $data['scheme'] == "" || $data['scheme'] == "http") {
return $pipeline->guess_url($value);
} else {
return $value;
- };
+ }
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_LINK_TARGET;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-link-target';
}
}
-CSS::register_css_property(new CSSPseudoLinkTarget);
+(new CSS())->register_css_property(new CSSPseudoLinkTarget);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.listcounter.inc.php b/public_html/css.pseudo.listcounter.inc.php
index 27f8890..b3971b1 100644
--- a/public_html/css.pseudo.listcounter.inc.php
+++ b/public_html/css.pseudo.listcounter.inc.php
@@ -2,27 +2,19 @@
// $Header: /cvsroot/html2ps/css.pseudo.listcounter.inc.php,v 1.4 2006/09/07 18:38:14 Konstantin Exp $
class CSSPseudoListCounter extends CSSPropertyHandler {
- function CSSPseudoListCounter() {
- $this->CSSPropertyHandler(true, false);
- }
-
- function default_value() {
- return 0;
- }
+ function __construct() { CSSPropertyHandler::__construct(true, false); }
+ function default_value() { return 0; }
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_LIST_COUNTER;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-list-counter';
}
- function parse($value) {
- return (int)$value;
- }
}
-CSS::register_css_property(new CSSPseudoListCounter);
+(new CSS())->register_css_property(new CSSPseudoListCounter);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.localalign.inc.php b/public_html/css.pseudo.localalign.inc.php
index c21b431..b5ec356 100644
--- a/public_html/css.pseudo.localalign.inc.php
+++ b/public_html/css.pseudo.localalign.inc.php
@@ -6,21 +6,21 @@
define('LA_RIGHT',2);
class CSSLocalAlign extends CSSPropertyHandler {
- function CSSLocalAlign() { $this->CSSPropertyHandler(false, false); }
+ function __construct() { CSSPropertyHandler::__construct(false, false); }
function default_value() { return LA_LEFT; }
function parse($value) { return $value; }
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_LOCALALIGN;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-localalign';
}
}
-CSS::register_css_property(new CSSLocalAlign);
+(new CSS())->register_css_property(new CSSLocalAlign);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.nowrap.inc.php b/public_html/css.pseudo.nowrap.inc.php
index 8a65714..dea3fe0 100644
--- a/public_html/css.pseudo.nowrap.inc.php
+++ b/public_html/css.pseudo.nowrap.inc.php
@@ -5,18 +5,18 @@
define('NOWRAP_NOWRAP',1);
class CSSPseudoNoWrap extends CSSPropertyHandler {
- function CSSPseudoNoWrap() { $this->CSSPropertyHandler(false, false); }
+ function __construct() { CSSPropertyHandler::__construct(false, false); }
function default_value() { return NOWRAP_NORMAL; }
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_NOWRAP;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-nowrap';
}
}
-CSS::register_css_property(new CSSPseudoNoWrap);
+(new CSS())->register_css_property(new CSSPseudoNoWrap);
?>
\ No newline at end of file
diff --git a/public_html/css.pseudo.table.border.inc.php b/public_html/css.pseudo.table.border.inc.php
index c89cd44..ad4cc6a 100644
--- a/public_html/css.pseudo.table.border.inc.php
+++ b/public_html/css.pseudo.table.border.inc.php
@@ -6,19 +6,19 @@
class CSSPseudoTableBorder extends CSSPropertyHandler {
var $_defaultValue;
- function CSSPseudoTableBorder() {
- $this->CSSPropertyHandler(true, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, false);
- $this->_defaultValue = BorderPDF::create(array('top' => array('width' => Value::fromString('2px'),
+ $this->_defaultValue = (new BorderPDF())->create(array('top' => array('width' => (new Value())->fromString('2px'),
'color' => array(0,0,0),
'style' => BS_NONE),
- 'right' => array('width' => Value::fromString('2px'),
+ 'right' => array('width' => (new Value())->fromString('2px'),
'color' => array(0,0,0),
'style' => BS_NONE),
- 'bottom' => array('width' => Value::fromString('2px'),
+ 'bottom' => array('width' => (new Value())->fromString('2px'),
'color' => array(0,0,0),
'style' => BS_NONE),
- 'left' => array('width' => Value::fromString('2px'),
+ 'left' => array('width' => (new Value())->fromString('2px'),
'color' => array(0,0,0),
'style' => BS_NONE)));
}
@@ -27,11 +27,11 @@ function default_value() {
return $this->_defaultValue->copy();
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_TABLE_BORDER;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-table-border';
}
@@ -52,6 +52,6 @@ function inherit($old_state, &$new_state) {
}
}
-CSS::register_css_property(new CSSPseudoTableBorder());
+(new CSS())->register_css_property(new CSSPseudoTableBorder());
?>
\ No newline at end of file
diff --git a/public_html/css.right.inc.php b/public_html/css.right.inc.php
index a39b025..ef0279e 100644
--- a/public_html/css.right.inc.php
+++ b/public_html/css.right.inc.php
@@ -4,9 +4,9 @@
require_once(HTML2PS_DIR.'value.right.php');
class CSSRight extends CSSPropertyHandler {
- function CSSRight() {
- $this->CSSPropertyHandler(false, false);
- $this->_autoValue = ValueRight::fromString('auto');
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
+ $this->_autoValue = (new ValueRight())->fromString('auto');
}
function _getAutoValue() {
@@ -18,18 +18,18 @@ function default_value() {
}
function parse($value) {
- return ValueRight::fromString($value);
+ return (new ValueRight())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_RIGHT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'right';
}
}
-CSS::register_css_property(new CSSRight);
+(new CSS())->register_css_property(new CSSRight);
?>
\ No newline at end of file
diff --git a/public_html/css.rules.inc.php b/public_html/css.rules.inc.php
index bc8e2b0..a0edb3c 100644
--- a/public_html/css.rules.inc.php
+++ b/public_html/css.rules.inc.php
@@ -1,5 +1,5 @@
push_base_url($this->baseurl);
- $this->body->apply($state);
+
+ $properties = $this->body->getPropertiesRaw();
+ foreach ($properties as $property) {
+ $key = $property->getCode();
+ $value = $property->getValue();
+
+ $handler =& (new CSS())->get_handler($key);
+ $handler->replace($value, $state);
+ }
+
$pipeline->pop_base_url();
}
- function add_property($property) {
- $this->body->add_property($property);
+ function addProperty($property) {
+ $this->body->addProperty($property);
}
- function CSSRule($rule, &$pipeline) {
+ function __construct($rule, &$pipeline) {
$this->selector = $rule[0];
$this->body = $rule[1]->copy();
$this->baseurl = $rule[2];
@@ -30,12 +39,12 @@ function CSSRule($rule, &$pipeline) {
$this->pseudoelement = css_find_pseudoelement($this->selector);
}
- function set_property($key, $value, &$pipeline) {
- $this->body->set_property_value($key, $value);
+ function setProperty($key, $value, &$pipeline) {
+ $this->body->setPropertyValue($key, $value);
}
- function &get_property($key) {
- return $this->body->get_property_value($key);
+ function getProperty($key) {
+ return $this->body->getPropertyValue($key);
}
function get_order() { return $this->order; }
@@ -48,15 +57,15 @@ function match($root) {
}
}
-function rule_get_selector(&$rule) { return $rule[0]; };
+function rule_get_selector(&$rule) { return $rule[0]; }
function cmp_rules($r1, $r2) {
$a = css_selector_specificity($r1[0]);
$b = css_selector_specificity($r2[0]);
for ($i=0; $i<=2; $i++) {
- if ($a[$i] != $b[$i]) { return ($a[$i] < $b[$i]) ? -1 : 1; };
- };
+ if ($a[$i] != $b[$i]) { return ($a[$i] < $b[$i]) ? -1 : 1; }
+ }
// If specificity of selectors is equal, use rules natural order in stylesheet
@@ -68,8 +77,8 @@ function cmp_rule_objs($r1, $r2) {
$b = $r2->get_specificity();
for ($i=0; $i<=2; $i++) {
- if ($a[$i] != $b[$i]) { return ($a[$i] < $b[$i]) ? -1 : 1; };
- };
+ if ($a[$i] != $b[$i]) { return ($a[$i] < $b[$i]) ? -1 : 1; }
+ }
// If specificity of selectors is equal, use rules natural order in stylesheet
diff --git a/public_html/css.rules.page.inc.php b/public_html/css.rules.page.inc.php
index 1e34a54..b4a2fb5 100644
--- a/public_html/css.rules.page.inc.php
+++ b/public_html/css.rules.page.inc.php
@@ -5,7 +5,7 @@
class CSSPageSelector {
var $_type;
- function CSSPageSelector($type) {
+ function __construct($type) {
$this->set_type($type);
}
@@ -19,16 +19,16 @@ function set_type($type) {
}
class CSSPageSelectorAll extends CSSPageSelector {
- function CSSPageSelectorAll() {
- $this->CSSPageSelector(CSS_PAGE_SELECTOR_ALL);
+ function __construct() {
+ CSSPageSelector::__construct(CSS_PAGE_SELECTOR_ALL);
}
}
class CSSPageSelectorNamed extends CSSPageSelector {
var $_name;
- function CSSPageSelectorNamed($name) {
- $this->CSSPageSelector(CSS_PAGE_SELECTOR_NAMED);
+ function __construct($name) {
+ CSSPageSelector::__construct(CSS_PAGE_SELECTOR_NAMED);
$this->set_name($name);
}
@@ -42,33 +42,30 @@ function set_name($name) {
}
class CSSPageSelectorFirst extends CSSPageSelector {
- function CSSPageSelectorFirst() {
- $this->CSSPageSelector(CSS_PAGE_SELECTOR_FIRST);
+ function __construct() {
+ CSSPageSelector::__construct(CSS_PAGE_SELECTOR_FIRST);
}
}
class CSSPageSelectorLeft extends CSSPageSelector {
- function CSSPageSelectorLeft() {
- $this->CSSPageSelector(CSS_PAGE_SELECTOR_LEFT);
+ function __construct() {
+ CSSPageSelector::__construct(CSS_PAGE_SELECTOR_LEFT);
}
}
class CSSPageSelectorRight extends CSSPageSelector {
- function CSSPageSelectorRight() {
- $this->CSSPageSelector(CSS_PAGE_SELECTOR_RIGHT);
+ function __construct() {
+ CSSPageSelector::__construct(CSS_PAGE_SELECTOR_RIGHT);
}
}
class CSSAtRulePage {
var $selector;
var $margin_boxes;
- var $css;
- function CSSAtRulePage($selector, &$pipeline) {
+ function __construct($selector) {
$this->selector = $selector;
$this->margin_boxes = array();
-
- $this->css =& new CSSPropertyCollection();
}
function &getSelector() {
@@ -86,21 +83,21 @@ function getAtRuleMarginBoxes() {
function addAtRuleMarginBox($rule) {
$this->margin_boxes[$rule->getSelector()] = $rule;
}
-
- function setCSSProperty($property) {
- $this->css->add_property($property);
- }
}
class CSSAtRuleMarginBox {
var $selector;
var $css;
+ function getSelector() {
+ return $this->selector;
+ }
+
/**
* TODO: CSS_TEXT_ALIGN should get top/bottom values by default for
* left-top, left-bottom, right-top and right-bottom boxes
*/
- function CSSAtRuleMarginBox($selector, &$pipeline) {
+ function __construct($selector, &$pipeline) {
$this->selector = $selector;
$css = "-html2ps-html-content: ''; content: ''; width: auto; height: auto; margin: 0; border: none; padding: 0; font: auto;";
@@ -114,13 +111,9 @@ function CSSAtRuleMarginBox($selector, &$pipeline) {
$pipeline);
}
- function getSelector() {
- return $this->selector;
- }
-
function _getCSSDefaults($selector) {
- $text_align_handler =& CSS::get_handler(CSS_TEXT_ALIGN);
- $vertical_align_handler =& CSS::get_handler(CSS_VERTICAL_ALIGN);
+ $text_align_handler =& (new CSS())->get_handler(CSS_TEXT_ALIGN);
+ $vertical_align_handler =& (new CSS())->get_handler(CSS_VERTICAL_ALIGN);
switch ($selector) {
case CSS_MARGIN_BOX_SELECTOR_TOP:
@@ -159,15 +152,15 @@ function _getCSSDefaults($selector) {
return 'text-align: center; vertical-align: middle';
case CSS_MARGIN_BOX_SELECTOR_RIGHT_BOTTOM:
return 'text-align: center; vertical-align: bottom';
- };
+ }
}
function setCSSProperty($property) {
- $this->css->add_property($property);
+ $this->css->addProperty($property);
}
- function &get_css_property($code) {
- return $this->css->get_property($code);
+ function getCSSProperty($code) {
+ return $this->css->getProperty($code);
}
}
@@ -185,7 +178,8 @@ function parse_css_atpage_rules($css, &$css_ruleset) {
while (preg_match('/^(.*?)@page(.*)/is', $css, $matches)) {
$data = $matches[2];
$css = $matches[1].parse_css_atpage_rule(trim($data), $css_ruleset);
- };
+ }
+
return $css;
}
@@ -196,12 +190,12 @@ function parse_css_atpage_rule($css, &$css_ruleset) {
if (!preg_match('/^(.*?){(.*)$/is', $css, $matches)) {
error_log('No selector and/or open bracket found in @page rule');
return $css;
- };
+ }
$raw_selector = trim($matches[1]);
$css = trim($matches[2]);
$selector =& parse_css_atpage_selector($raw_selector);
- $at_rule =& new CSSAtRulePage($selector, $css_ruleset);
+ $at_rule= new CSSAtRulePage($selector);
/**
* The body of @page rule may contain declaraction (detected by ';'),
@@ -218,7 +212,7 @@ function parse_css_atpage_rule($css, &$css_ruleset) {
/**
* Normal declaration (text contained in $raw_prefix
*/
- parse_css_atpage_declaration($raw_prefix, $at_rule, $css_ruleset);
+ parse_css_atpage_declaration($raw_prefix, $at_rule);
$css = $raw_suffix;
break;
@@ -233,16 +227,16 @@ function parse_css_atpage_rule($css, &$css_ruleset) {
/**
* End-of-rule
*/
- $css_ruleset->add_at_rule_page($at_rule);
+ $css_ruleset->addAtRulePage($at_rule);
return $raw_suffix;
- };
- };
+ }
+ }
/**
* Note that we should normally exit via '}' token handler above
*/
error_log('No close bracket found in @page rule');
- $css_ruleset->add_at_rule_page($at_rule);
+ $css_ruleset->addAtRulePage($at_rule);
return $css;
}
@@ -255,34 +249,34 @@ function parse_css_atpage_rule($css, &$css_ruleset) {
function &parse_css_atpage_selector($selector) {
switch ($selector) {
case '':
- $selector =& new CSSPageSelectorAll();
+ $selector= new CSSPageSelectorAll();
return $selector;
case ':first':
- $selector =& new CSSPageSelectorFirst();
+ $selector= new CSSPageSelectorFirst();
return $selector;
case ':left':
- $selector =& new CSSPageSelectorLeft();
+ $selector= new CSSPageSelectorLeft();
return $selector;
case ':right':
- $selector =& new CSSPageSelectorRight();
+ $selector= new CSSPageSelectorRight();
return $selector;
default:
- if (CSS::is_identifier($selector)) {
- $selector =& new CSSPageSelectorNamed($selector);
+ if ((new CSS())->is_identifier($selector)) {
+ $selector= new CSSPageSelectorNamed($selector);
return $selector;
} else {
error_log(sprintf('Unknown page selector in @page rule: \'%s\'', $selector));
- $selector =& new CSSPageSelectorAll();
+ $selector= new CSSPageSelectorAll();
return $selector;
- };
- };
+ }
+ }
}
function parse_css_atpage_margin_box($css, &$at_rule, &$pipeline) {
if (!preg_match("/^([-\w]*)\s*{(.*)/is",$css,$matches)) {
error_log("Invalid margin box at-rule format");
return $css;
- };
+ }
$raw_margin_box_selector = trim($matches[1]);
$css = trim($matches[2]);
@@ -314,8 +308,8 @@ function parse_css_atpage_margin_box($css, &$at_rule, &$pipeline) {
*/
$at_rule->addAtRuleMarginBox($at_rule_margin_box);
return $raw_suffix;
- };
- };
+ }
+ }
/**
* Note that we should normally exit via '}' token handler above
@@ -367,28 +361,38 @@ function parse_css_atpage_margin_box_selector($css) {
error_log(sprintf('Unrecognized margin box selector: \'%s\'', $css));
return CSS_MARGIN_BOX_SELECTOR_TOP;
}
-};
-
-function parse_css_atpage_declaration($css, &$at_rule, &$pipeline) {
- $parsed =& parse_css_property($css, $pipeline);
+}
- if (!is_null($parsed)) {
- $properties = $parsed->getPropertiesSortedByPriority();
- foreach ($properties as $property) {
- $at_rule->setCSSProperty($property);
- };
- };
+/**
+ * Available properties:
+ * margin (and its subproperties)
+ * size
+ *
+ */
+function parse_css_atpage_declaration($css, &$at_rule) {
}
+
+/**
+ * Available properties:
+ * content
+ * text-align
+ * vertical-align
+ * width
+ * height
+ * border
+ */
function parse_css_atpage_margin_box_declaration($css, &$at_rule, &$pipeline) {
- $parsed =& parse_css_property($css, $pipeline);
-
- if (!is_null($parsed)) {
- $properties = $parsed->getPropertiesSortedByPriority();
- foreach ($properties as $property) {
- $at_rule->setCSSProperty($property);
- };
- };
+ /**
+ * Here we pass null as a value of $pipeline parameter to parse_css_property function;
+ * we can do it because there's no @import directives allowed in margin context
+ */
+ $parsed = parse_css_property($css, $pipeline);
+
+ $properties = $parsed->getPropertiesSortedByPriority();
+ foreach ($properties as $property) {
+ $at_rule->setCSSProperty($property);
+ }
}
?>
\ No newline at end of file
diff --git a/public_html/css.ruleset.class.php b/public_html/css.ruleset.class.php
index 4202063..c440f72 100644
--- a/public_html/css.ruleset.class.php
+++ b/public_html/css.ruleset.class.php
@@ -5,7 +5,7 @@ class CSSRuleset {
var $tag_filtered;
var $_lastId;
- function CSSRuleset() {
+ function __construct() {
$this->rules = array();
$this->tag_filtered = array();
$this->_lastId = 0;
@@ -23,22 +23,23 @@ function parse_style_node($root, &$pipeline) {
$media_list = array("screen");
if ($root->has_attribute("media")) {
// Note that there may be whitespace symbols around commas, so we should not just use 'explode' function
+ //
$media_list = preg_split("/\s*,\s*/",trim($root->get_attribute("media")));
- };
+ }
if (!is_allowed_media($media_list)) {
if (defined('DEBUG_MODE')) {
error_log(sprintf('No allowed (%s) media types found in CSS stylesheet media types (%s). Stylesheet ignored.',
join(',', config_get_allowed_media()),
join(',', $media_list)));
- };
+ }
return;
- };
+ }
if (!isset($GLOBALS['g_stylesheet_title']) ||
$GLOBALS['g_stylesheet_title'] === "") {
$GLOBALS['g_stylesheet_title'] = $root->get_attribute("title");
- };
+ }
if (!$root->has_attribute("title") || $root->get_attribute("title") === $GLOBALS['g_stylesheet_title']) {
/**
@@ -47,21 +48,19 @@ function parse_style_node($root, &$pipeline) {
$content = trim($root->get_content());
if ($content != "") {
$this->parse_css($content, $pipeline);
- };
- };
+ }
+ }
}
function scan_styles($root, &$pipeline) {
switch ($root->node_type()) {
case XML_ELEMENT_NODE:
- $tagname = strtolower($root->tagname());
-
- if ($tagname === 'style') {
+ if ($root->tagname() === 'style') {
// Parse nodes
//
$this->parse_style_node($root, $pipeline);
- } elseif ($tagname === 'link') {
+ } elseif ($root->tagname() === 'link') {
// Parse
$this->css_import(trim(css_remove_value_quotes($matches[1])), $pipeline);
- };
+ }
}
function parse_css_media($css, &$pipeline, $baseindex = 0) {
@@ -196,7 +193,7 @@ function parse_css_media($css, &$pipeline, $baseindex = 0) {
for ($i=0; $i<$num; $i++) {
$this->parse_css_import($matches[0][$i], $pipeline);
}
- };
+ }
// Remove @import rules so they will not break further processing
$css = preg_replace("/@import[^;]+;/","", $css);
@@ -221,8 +218,8 @@ function parse_css_media($css, &$pipeline, $baseindex = 0) {
$this->_lastId + $baseindex);
$this->add_rule($rule,
$pipeline);
- };
- };
+ }
+ }
}
function add_rule(&$rule, &$pipeline) {
@@ -241,37 +238,37 @@ function apply(&$root, &$state, &$pipeline) {
if (isset($this->tag_filtered[strtolower($root->tagname())])) {
$local_css = $this->tag_filtered[strtolower($root->tagname())];
- };
+ }
if (isset($this->tag_filtered["*"])) {
$local_css = array_merge($local_css, $this->tag_filtered["*"]);
- };
+ }
$applicable = array();
foreach ($local_css as $rule) {
if ($rule->match($root)) {
$applicable[] = $rule;
- };
- };
+ }
+ }
usort($applicable, "cmp_rule_objs");
foreach ($applicable as $rule) {
switch ($rule->get_pseudoelement()) {
case SELECTOR_PSEUDOELEMENT_BEFORE:
- $handler =& CSS::get_handler(CSS_HTML2PS_PSEUDOELEMENTS);
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_PSEUDOELEMENTS);
$handler->replace($handler->get($state->getState()) | CSS_HTML2PS_PSEUDOELEMENTS_BEFORE, $state);
break;
case SELECTOR_PSEUDOELEMENT_AFTER:
- $handler =& CSS::get_handler(CSS_HTML2PS_PSEUDOELEMENTS);
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_PSEUDOELEMENTS);
$handler->replace($handler->get($state->getState()) | CSS_HTML2PS_PSEUDOELEMENTS_AFTER, $state);
break;
default:
$rule->apply($root, $state, $pipeline);
break;
- };
- };
+ }
+ }
}
function apply_pseudoelement($element_type, &$root, &$state, &$pipeline) {
@@ -279,11 +276,11 @@ function apply_pseudoelement($element_type, &$root, &$state, &$pipeline) {
if (isset($this->tag_filtered[strtolower($root->tagname())])) {
$local_css = $this->tag_filtered[strtolower($root->tagname())];
- };
+ }
if (isset($this->tag_filtered["*"])) {
$local_css = array_merge($local_css, $this->tag_filtered["*"]);
- };
+ }
$applicable = array();
@@ -292,9 +289,9 @@ function apply_pseudoelement($element_type, &$root, &$state, &$pipeline) {
if ($rule->get_pseudoelement() == $element_type) {
if ($rule->match($root)) {
$applicable[] =& $rule;
- };
- };
- };
+ }
+ }
+ }
usort($applicable, "cmp_rule_objs");
@@ -302,7 +299,7 @@ function apply_pseudoelement($element_type, &$root, &$state, &$pipeline) {
foreach ($applicable as $rule) {
$rule->apply($root, $state, $pipeline);
- };
+ }
}
// Check if only tag with a specific name can match this selector
@@ -316,8 +313,8 @@ function detect_applicable_tag($selector) {
case SELECTOR_SEQUENCE:
foreach ($selector[1] as $subselector) {
$tag = $this->detect_applicable_tag($subselector);
- if ($tag) { return $tag; };
- };
+ if ($tag) { return $tag; }
+ }
return null;
default:
return null;
diff --git a/public_html/css.selectors.inc.php b/public_html/css.selectors.inc.php
index 60adfdf..bd9a1b3 100644
--- a/public_html/css.selectors.inc.php
+++ b/public_html/css.selectors.inc.php
@@ -54,54 +54,54 @@
// Any node can be marked by several space separated class names
//
function node_have_class($root, $target_class) {
- if (!$root->has_attribute('class')) { return false; };
+ if (!$root->has_attribute('class')) { return false; }
$classes = preg_split("/\s+/", strtolower($root->get_attribute('class')));
foreach ($classes as $class) {
if ($class == $target_class) {
return true;
- };
- };
+ }
+ }
return false;
-};
+}
function match_selector($selector, $root) {
switch ($selector[0]) {
case SELECTOR_TAG:
- if ($selector[1] == strtolower($root->tagname())) { return true; };
+ if ($selector[1] == strtolower($root->tagname())) { return true; }
break;
case SELECTOR_ID:
- if ($selector[1] == strtolower($root->get_attribute('id'))) { return true; };
+ if ($selector[1] == strtolower($root->get_attribute('id'))) { return true; }
break;
case SELECTOR_CLASS:
if (node_have_class($root, $selector[1])) { return true; }
- if ($selector[1] == strtolower($root->get_attribute('class'))) { return true; };
+ if ($selector[1] == strtolower($root->get_attribute('class'))) { return true; }
break;
case SELECTOR_TAG_CLASS:
if ((node_have_class($root, $selector[2])) &&
- ($selector[1] == strtolower($root->tagname()))) { return true; };
+ ($selector[1] == strtolower($root->tagname()))) { return true; }
break;
case SELECTOR_SEQUENCE:
foreach ($selector[1] as $subselector) {
- if (!match_selector($subselector, $root)) { return false; };
- };
+ if (!match_selector($subselector, $root)) { return false; }
+ }
return true;
case SELECTOR_PARENT:
case SELECTOR_PARENT_LOW_PRIORITY:
$node = $root->parent();
while ($node && $node->node_type() == XML_ELEMENT_NODE) {
- if (match_selector($selector[1], $node)) { return true; };
+ if (match_selector($selector[1], $node)) { return true; }
$node = $node->parent();
- };
+ }
return false;
case SELECTOR_DIRECT_PARENT:
$node = $root->parent();
if ($node && $node->node_type() == XML_ELEMENT_NODE) {
- if (match_selector($selector[1], $node)) { return true; };
- };
+ if (match_selector($selector[1], $node)) { return true; }
+ }
return false;
case SELECTOR_ATTR:
$attr_name = $selector[1];
@@ -121,7 +121,7 @@ function match_selector($selector, $root) {
if (!$root->has_attribute($attr_name)) {
return false;
- };
+ }
return strtolower($root->get_attribute($attr_name)) == strtolower($attr_value);
case SELECTOR_ATTR_VALUE_WORD:
// Note that CSS 2.1 standard does not says strictly if attribute case
@@ -138,12 +138,12 @@ function match_selector($selector, $root) {
if (!$root->has_attribute($attr_name)) {
return false;
- };
+ }
$words = preg_split("/\s+/",$root->get_attribute($attr_name));
foreach ($words as $word) {
- if (strtolower($word) == strtolower($attr_value)) { return true; };
- };
+ if (strtolower($word) == strtolower($attr_value)) { return true; }
+ }
return false;
case SELECTOR_PSEUDOCLASS_LINK:
return $root->tagname() == "a" && $root->has_attribute('href');
@@ -162,7 +162,7 @@ function match_selector($selector, $root) {
case SELECTOR_ANY:
return true;
- };
+ }
return false;
}
@@ -219,6 +219,6 @@ function css_selector_specificity($selector) {
//
function selector_get_type($selector) {
return $selector[0];
-};
+}
?>
\ No newline at end of file
diff --git a/public_html/css.size.inc.php b/public_html/css.size.inc.php
index 117c148..d4f9857 100644
--- a/public_html/css.size.inc.php
+++ b/public_html/css.size.inc.php
@@ -1,8 +1,8 @@
CSSPropertyHandler(false, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
}
function default_value() {
@@ -14,23 +14,23 @@ function default_value() {
function parse($value) {
if ($value == '') {
return null;
- };
+ }
// First attempt to create media with predefined name
if (preg_match('/^(\w+)(?:\s+(portrait|landscape))?$/', $value, $matches)) {
$name = $matches[1];
$landscape = isset($matches[2]) && $matches[2] == 'landscape';
- $media =& Media::predefined($name);
+ $media =& (new Media())->predefined($name);
if (is_null($media)) {
return null;
- };
+ }
return array('size' => array('width' => $media->get_width(),
'height' => $media->get_height()),
'landscape' => $landscape);
- };
+ }
// Second, attempt to create media with predefined size
$parts = preg_split('/\s+/', $value);
@@ -43,7 +43,7 @@ function parse($value) {
if ($width == 0 ||
$height == 0) {
return null;
- };
+ }
return array('size' => array('width' => $width / mm2pt(1) / pt2pt(1),
'height' => $height / mm2pt(1) / pt2pt(1)),
@@ -59,6 +59,6 @@ function get_property_name() {
}
}
-CSS::register_css_property(new CSSSize());
+(new CSS())->register_css_property(new CSSSize());
?>
\ No newline at end of file
diff --git a/public_html/css.state.class.php b/public_html/css.state.class.php
index 6787545..15922f7 100644
--- a/public_html/css.state.class.php
+++ b/public_html/css.state.class.php
@@ -6,7 +6,7 @@ class CSSState {
var $_handlerSet;
var $_baseFontSize;
- function CSSState(&$handlerSet) {
+ function __construct(&$handlerSet) {
$this->_handlerSet =& $handlerSet;
$this->_state = array($this->_getDefaultState());
$this->_stateDefaultFlags = array($this->_getDefaultStateFlags());
@@ -28,8 +28,8 @@ function _getDefaultStateFlags() {
function replaceParsed($property_data, $property_list) {
foreach ($property_list as $property) {
- $this->set_property($property, $property_data->get_css_property($property));
- };
+ $this->setProperty($property, $property_data->getCSSProperty($property));
+ }
}
function popState() {
@@ -56,12 +56,12 @@ function pushState() {
* Only computed font-size values are inherited; this means that
* base font size value should not be recalculated if font-size was not set explicitly
*/
- if ($this->get_propertyDefaultFlag(CSS_FONT_SIZE)) {
+ if ($this->getPropertyDefaultFlag(CSS_FONT_SIZE)) {
array_unshift($this->_baseFontSize, $base_size);
} else {
$size = $this->getInheritedProperty(CSS_FONT_SIZE);
array_unshift($this->_baseFontSize, $size->toPt($base_size));
- };
+ }
array_unshift($this->_state, $this->getState());
array_unshift($this->_stateDefaultFlags, $this->_getDefaultStateFlags());
@@ -75,7 +75,7 @@ function pushDefaultState() {
foreach ($handlers as $property => $handler) {
$handler->inherit($this->_state[1], $this->_state[0]);
- };
+ }
}
function pushDefaultTextState() {
@@ -99,79 +99,77 @@ function &getState() {
return $this->_state[0];
}
- function &getInheritedProperty($code) {
- $handler =& CSS::get_handler($code);
+ function getInheritedProperty($code) {
+ $handler =& (new CSS())->get_handler($code);
- $size = count($this->_state);
+ $size = count((array) $this->_state);
for ($i=0; $i<$size; $i++) {
- $value =& $handler->get($this->_state[$i]);
+ $value = $handler->get($this->_state[$i]);
if ($value != CSS_PROPERTY_INHERIT) {
return $value;
- };
+ }
// Prevent taking the font-size property; as, according to CSS
// standard, 'inherit' should mean calculated value, we use
// '1em' instead, forcing the script to take parent calculated
// value later
if ($code == CSS_FONT_SIZE) {
- $value =& Value::fromData(1, UNIT_EM);
- return $value;
- };
- };
+ return (new Value())->fromData(1, UNIT_EM);
+ }
+ }
- $null = null;
- return $null;
+ return null;
}
- function get_propertyOnLevel($code, $level) {
+ function getPropertyOnLevel($code, $level) {
return $this->_state[$level][$code];
}
/**
* Optimization notice: this function is called very often,
- * so even a slight overhead for the 'getState() and CSS::get_handler
+ * so even a slight overhead for the 'getState() and (new CSS())->get_handler
* accumulates in a significiant processing delay.
*
* getState was replaced with direct $this->_state[0] access,
* get_handler call results are cached in static var
*/
- function &get_property($code) {
+ function &getProperty($code) {
static $cache = array();
if (!isset($cache[$code])) {
- $cache[$code] =& CSS::get_handler($code);
- };
+ $cache[$code] =& (new CSS())->get_handler($code);
+ }
$value =& $cache[$code]->get($this->_state[0]);
return $value;
}
- function get_propertyDefaultFlag($code) {
+ function getPropertyDefaultFlag($code) {
return $this->_stateDefaultFlags[0][$code];
}
- function set_property_on_level($code, $level, $value) {
+ function setPropertyOnLevel($code, $level, $value) {
$this->_state[$level][$code] = $value;
}
- function set_propertyDefault($code, $value) {
+ function setPropertyDefault($code, $value) {
$state =& $this->getState();
$state[$code] = $value;
}
/**
- * see get_property for optimization description
+ * see getProperty for optimization description
*/
- function set_property($code, $value) {
- $this->set_propertyDefault($code, $value);
+ function setProperty($code, $value) {
+ $this->setPropertyDefault($code, $value);
static $cache = array();
if (!isset($cache[$code])) {
- $cache[$code] =& CSS::get_handler($code);
- };
+ $cache[$code] =& (new CSS())->get_handler($code);
+ }
$cache[$code]->clearDefaultFlags($this);
}
- function set_propertyDefaultFlag($code, $value) {
+ function setPropertyDefaultFlag($code, $value) {
$state_flags =& $this->getStateDefaultFlags();
$state_flags[$code] = $value;
}
diff --git a/public_html/css.table-layout.inc.php b/public_html/css.table-layout.inc.php
index 0a4483b..989ac08 100644
--- a/public_html/css.table-layout.inc.php
+++ b/public_html/css.table-layout.inc.php
@@ -5,8 +5,8 @@
define('TABLE_LAYOUT_FIXED', 2);
class CSSTableLayout extends CSSPropertyStringSet {
- function CSSTableLayout() {
- $this->CSSPropertyStringSet(false,
+ function __construct() {
+ CSSPropertyStringSet::__construct(false,
false,
array('auto' => TABLE_LAYOUT_AUTO,
'fixed' => TABLE_LAYOUT_FIXED));
@@ -16,15 +16,15 @@ function default_value() {
return TABLE_LAYOUT_AUTO;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_TABLE_LAYOUT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'table-layout';
}
}
-CSS::register_css_property(new CSSTableLayout());
+(new CSS())->register_css_property(new CSSTableLayout());
?>
\ No newline at end of file
diff --git a/public_html/css.text-align.inc.php b/public_html/css.text-align.inc.php
index dc0c67d..78aae14 100644
--- a/public_html/css.text-align.inc.php
+++ b/public_html/css.text-align.inc.php
@@ -7,8 +7,8 @@
define('TA_JUSTIFY',3);
class CSSTextAlign extends CSSPropertyStringSet {
- function CSSTextAlign() {
- $this->CSSPropertyStringSet(true,
+ function __construct() {
+ CSSPropertyStringSet::__construct(true,
true,
array('inherit' => CSS_PROPERTY_INHERIT,
'left' => TA_LEFT,
@@ -35,15 +35,15 @@ function value2pdf($value) {
}
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_TEXT_ALIGN;
}
- function get_property_name() {
+ function getPropertyName() {
return 'text-align';
}
}
-CSS::register_css_property(new CSSTextAlign);
+(new CSS())->register_css_property(new CSSTextAlign);
?>
\ No newline at end of file
diff --git a/public_html/css.text-decoration.inc.php b/public_html/css.text-decoration.inc.php
index 430cfd8..0c08f9f 100644
--- a/public_html/css.text-decoration.inc.php
+++ b/public_html/css.text-decoration.inc.php
@@ -16,8 +16,8 @@
*/
class CSSTextDecoration extends CSSPropertyHandler {
- function CSSTextDecoration() {
- $this->CSSPropertyHandler(true, true);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, true);
}
function default_value() {
@@ -29,24 +29,24 @@ function default_value() {
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
$parsed = $this->default_value();
- if (strstr($value,"overline") !== false) { $parsed['O'] = true; };
- if (strstr($value,"underline") !== false) { $parsed['U'] = true; };
- if (strstr($value,"line-through") !== false) { $parsed['T'] = true; };
+ if (strstr($value,"overline") !== false) { $parsed['O'] = true; }
+ if (strstr($value,"underline") !== false) { $parsed['U'] = true; }
+ if (strstr($value,"line-through") !== false) { $parsed['T'] = true; }
return $parsed;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_TEXT_DECORATION;
}
- function get_property_name() {
+ function getPropertyName() {
return 'text-decoration';
}
}
-CSS::register_css_property(new CSSTextDecoration);
+(new CSS())->register_css_property(new CSSTextDecoration);
?>
diff --git a/public_html/css.text-indent.inc.php b/public_html/css.text-indent.inc.php
index c2f650d..d388a81 100644
--- a/public_html/css.text-indent.inc.php
+++ b/public_html/css.text-indent.inc.php
@@ -4,8 +4,8 @@
require_once(HTML2PS_DIR.'value.text-indent.class.php');
class CSSTextIndent extends CSSPropertyHandler {
- function CSSTextIndent() {
- $this->CSSPropertyHandler(true, true);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, true);
}
function default_value() {
@@ -15,24 +15,24 @@ function default_value() {
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
if (is_percentage($value)) {
return new TextIndentValuePDF(array((int)$value, true));
} else {
return new TextIndentValuePDF(array($value, false));
- };
+ }
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_TEXT_INDENT;
}
- function get_property_name() {
+ function getPropertyName() {
return 'text-indent';
}
}
-CSS::register_css_property(new CSSTextIndent());
+(new CSS())->register_css_property(new CSSTextIndent());
?>
diff --git a/public_html/css.text-transform.inc.php b/public_html/css.text-transform.inc.php
index d577c5f..68b54e5 100644
--- a/public_html/css.text-transform.inc.php
+++ b/public_html/css.text-transform.inc.php
@@ -7,8 +7,8 @@
define('CSS_TEXT_TRANSFORM_LOWERCASE' ,3);
class CSSTextTransform extends CSSPropertyStringSet {
- function CSSTextTransform() {
- $this->CSSPropertyStringSet(false,
+ function __construct() {
+ CSSPropertyStringSet::__construct(false,
true,
array('inherit' => CSS_PROPERTY_INHERIT,
'none' => CSS_TEXT_TRANSFORM_NONE,
@@ -21,15 +21,15 @@ function default_value() {
return CSS_TEXT_TRANSFORM_NONE;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_TEXT_TRANSFORM;
}
- function get_property_name() {
+ function getPropertyName() {
return 'text-transform';
}
}
-CSS::register_css_property(new CSSTextTransform);
+(new CSS())->register_css_property(new CSSTextTransform);
?>
diff --git a/public_html/css.top.inc.php b/public_html/css.top.inc.php
index 6d19f7d..5e1bf26 100644
--- a/public_html/css.top.inc.php
+++ b/public_html/css.top.inc.php
@@ -4,9 +4,9 @@
require_once(HTML2PS_DIR.'value.top.php');
class CSSTop extends CSSPropertyHandler {
- function CSSTop() {
- $this->CSSPropertyHandler(false, false);
- $this->_autoValue = ValueTop::fromString('auto');
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
+ $this->_autoValue = (new ValueTop())->fromString('auto');
}
function _getAutoValue() {
@@ -17,19 +17,19 @@ function default_value() {
return $this->_getAutoValue();
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_TOP;
}
- function get_property_name() {
+ function getPropertyName() {
return 'top';
}
function parse($value) {
- return ValueTop::fromString($value);
+ return (new ValueTop())->fromString($value);
}
}
-CSS::register_css_property(new CSSTop);
+(new CSS())->register_css_property(new CSSTop);
?>
\ No newline at end of file
diff --git a/public_html/css.utils.inc.php b/public_html/css.utils.inc.php
index 60947c1..a661603 100644
--- a/public_html/css.utils.inc.php
+++ b/public_html/css.utils.inc.php
@@ -1,5 +1,5 @@
get_handler(CSS_DISPLAY);
if ($handler->get($state->getState()) === "none") {
return;
- };
+ }
switch ($default_display) {
case 'table-cell':
@@ -46,17 +46,17 @@ function _fix_tag_display($default_display, &$state, &$pipeline) {
case '-button':
// INPUT buttons will always have 'display: -button' (in latter case if display = 'block', we'll use a wrapper box)
- $css_state =& $pipeline->get_current_css_state();
+ $css_state =& $pipeline->getCurrentCSSState();
if ($handler->get($css_state->getState()) === 'block') {
$need_block_wrapper = true;
- };
+ }
$handler->css('-button', $pipeline);
break;
- };
+ }
}
function is_percentage($value) {
- return $value{strlen($value)-1} == "%";
+ return $value[strlen($value)-1] == "%";
}
/**
@@ -112,30 +112,27 @@ function is_percentage($value) {
* either be escaped or doubled.
*/
function css_process_escapes($value) {
- $value = preg_replace_callback('/\\\\([\da-f]{1,6})( |[^][\da-f])/i',
+ $value = preg_replace_callback('/\\\\([\da-f]{1,6}) /i',
'css_process_escapes_callback',
$value);
- $value = preg_replace_callback('/\\\\([\da-f]{6})( ?)/i',
+ $value = preg_replace_callback('/\\\\([\da-f]{6})/i',
'css_process_escapes_callback',
$value);
+
return $value;
}
function css_process_escapes_callback($matches) {
- if ($matches[2] == ' ') {
- return hex_to_utf8($matches[1]);
- } else {
- return hex_to_utf8($matches[1]).$matches[2];
- };
+ return hex_to_utf8($matches[1]);
}
function css_remove_value_quotes($value) {
- if (strlen($value) == 0) { return $value; };
+ if (strlen($value) == 0) { return $value; }
- if ($value{0} === "'" || $value{0} === "\"") {
+ if ($value[0] === "'" || $value[0] === "\"") {
$value = substr($value, 1, strlen($value)-2);
- };
+ }
return $value;
}
diff --git a/public_html/css.valign.inc.php b/public_html/css.valign.inc.php
new file mode 100644
index 0000000..5b457f9
--- /dev/null
+++ b/public_html/css.valign.inc.php
@@ -0,0 +1,47 @@
+
\ No newline at end of file
diff --git a/public_html/css.vertical-align.inc.php b/public_html/css.vertical-align.inc.php
index c6aaf7f..87bc39e 100644
--- a/public_html/css.vertical-align.inc.php
+++ b/public_html/css.vertical-align.inc.php
@@ -75,10 +75,10 @@ function apply_cell(&$cell, $row_height, $row_baseline) {
}
class CSSVerticalAlign extends CSSPropertyHandler {
- function CSSVerticalAlign() {
+ function __construct() {
// Note that in general, parameters 'true' and 'false' are non meaningful in out case,
// as we anyway override 'inherit' and 'inherit_text' in this class.
- $this->CSSPropertyHandler(true, true);
+ CSSPropertyHandler::__construct(true, true);
}
function inherit($old_state, &$new_state) {
@@ -95,7 +95,7 @@ function inherit($old_state, &$new_state) {
if (is_inline_element($parent_display)) {
$this->replace_array($this->get($old_state), $new_state);
return;
- };
+ }
$this->replace_array($this->default_value(), $new_state);
return;
@@ -114,25 +114,25 @@ function default_value() { return VA_BASELINE; }
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
// Convert value to lower case, as html allows values
// in both cases to be entered
$value = strtolower($value);
- if ($value === 'baseline') { return VA_BASELINE; };
- if ($value === 'sub') { return VA_SUB; };
- if ($value === 'super') { return VA_SUPER; };
- if ($value === 'top') { return VA_TOP; };
- if ($value === 'middle') { return VA_MIDDLE; };
+ if ($value === 'baseline') { return VA_BASELINE; }
+ if ($value === 'sub') { return VA_SUB; }
+ if ($value === 'super') { return VA_SUPER; }
+ if ($value === 'top') { return VA_TOP; }
+ if ($value === 'middle') { return VA_MIDDLE; }
// As some brainless designers sometimes use 'center' instead of 'middle',
// we'll add support for it
if ($value === 'center') { return VA_MIDDLE; }
- if ($value === 'bottom') { return VA_BOTTOM; };
- if ($value === 'text-top') { return VA_TEXT_TOP; };
- if ($value === 'text-bottom') { return VA_TEXT_BOTTOM; };
+ if ($value === 'bottom') { return VA_BOTTOM; }
+ if ($value === 'text-top') { return VA_TEXT_TOP; }
+ if ($value === 'text-bottom') { return VA_TEXT_BOTTOM; }
return $this->default_value();
}
@@ -149,7 +149,7 @@ function value2pdf($value) {
}
function applicable($css_state) {
- $handler =& CSS::get_handler(CSS_DISPLAY);
+ $handler =& (new CSS())->get_handler(CSS_DISPLAY);
$display = $handler->get($css_state->getState());
return
$display === 'table-cell' ||
@@ -157,15 +157,15 @@ function applicable($css_state) {
is_inline_element($display);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_VERTICAL_ALIGN;
}
- function get_property_name() {
+ function getPropertyName() {
return 'vertical-align';
}
}
-CSS::register_css_property(new CSSVerticalAlign);
+(new CSS())->register_css_property(new CSSVerticalAlign);
?>
\ No newline at end of file
diff --git a/public_html/css.visibility.inc.php b/public_html/css.visibility.inc.php
index cc3c255..9a02665 100644
--- a/public_html/css.visibility.inc.php
+++ b/public_html/css.visibility.inc.php
@@ -1,13 +1,13 @@
CSSPropertyStringSet(false,
+ function __construct() {
+ CSSPropertyStringSet::__construct(false,
false,
array('inherit' => CSS_PROPERTY_INHERIT,
'visible' => VISIBILITY_VISIBLE,
@@ -15,19 +15,17 @@ function CSSVisibility() {
'collapse' => VISIBILITY_COLLAPSE));
}
- function default_value() {
- return VISIBILITY_VISIBLE;
- }
+ function default_value() { return VISIBILITY_VISIBLE; }
- function get_property_code() {
+ function getPropertyCode() {
return CSS_VISIBILITY;
}
- function get_property_name() {
+ function getPropertyName() {
return 'visibility';
}
}
-CSS::register_css_property(new CSSVisibility);
+(new CSS())->register_css_property(new CSSVisibility);
?>
\ No newline at end of file
diff --git a/public_html/css.white-space.inc.php b/public_html/css.white-space.inc.php
index 15e22c9..ef0c68a 100644
--- a/public_html/css.white-space.inc.php
+++ b/public_html/css.white-space.inc.php
@@ -8,8 +8,8 @@
define('WHITESPACE_PRE_LINE', 4);
class CSSWhiteSpace extends CSSPropertyStringSet {
- function CSSWhiteSpace() {
- $this->CSSPropertyStringSet(true,
+ function __construct() {
+ CSSPropertyStringSet::__construct(true,
true,
array('normal' => WHITESPACE_NORMAL,
'pre' => WHITESPACE_PRE,
@@ -22,15 +22,15 @@ function default_value() {
return WHITESPACE_NORMAL;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_WHITE_SPACE;
}
- function get_property_name() {
+ function getPropertyName() {
return 'white-space';
}
}
-CSS::register_css_property(new CSSWhiteSpace);
+(new CSS())->register_css_property(new CSSWhiteSpace);
?>
\ No newline at end of file
diff --git a/public_html/css.widows.inc.php b/public_html/css.widows.inc.php
index 49a472d..999a16d 100644
--- a/public_html/css.widows.inc.php
+++ b/public_html/css.widows.inc.php
@@ -1,8 +1,8 @@
CSSPropertyHandler(true, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(true, false);
}
function default_value() { return 2; }
@@ -11,15 +11,15 @@ function parse($value) {
return (int)$value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_WIDOWS;
}
- function get_property_name() {
+ function getPropertyName() {
return 'widows';
}
}
-CSS::register_css_property(new CSSWidows);
+(new CSS())->register_css_property(new CSSWidows);
?>
\ No newline at end of file
diff --git a/public_html/css.width.inc.php b/public_html/css.width.inc.php
index 4949bad..700b2fe 100644
--- a/public_html/css.width.inc.php
+++ b/public_html/css.width.inc.php
@@ -5,15 +5,15 @@
require_once(HTML2PS_DIR.'css.property.sub.class.php');
class CSSCompositeWidth extends CSSPropertyHandler {
- function CSSCompositeWidth() {
- $this->CSSPropertyHandler(false, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_HTML2PS_COMPOSITE_WIDTH;
}
- function get_property_name() {
+ function getPropertyName() {
return '-html2ps-composite-width';
}
@@ -23,17 +23,17 @@ function default_value() {
}
class CSSWidth extends CSSSubProperty {
- function CSSWidth($owner) {
- $this->CSSSubProperty($owner);
+ function __construct($owner) {
+ CSSSubProperty::__construct($owner);
}
- function set_value(&$owner_value, &$value) {
+ function setValue(&$owner_value, &$value) {
$min = $owner_value->_min_width;
$owner_value = $value->copy();
$owner_value->_min_width = $min;
}
- function &get_value(&$owner_value) {
+ function &getValue(&$owner_value) {
return $owner_value;
}
@@ -44,17 +44,17 @@ function default_value() {
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
// Check if user specified empty value
- if ($value === '') { return new WCNone; };
+ if ($value === "") { return new WCNone; }
// Check if this value is 'auto' - default value of this property
if ($value === 'auto') {
return new WCNone;
- };
+ }
- if (substr($value,strlen($value)-1,1) == '%') {
+ if (substr($value,strlen($value)-1,1) == "%") {
// Percentage
return new WCFraction(((float)$value)/100);
} else {
@@ -63,18 +63,18 @@ function parse($value) {
}
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_WIDTH;
}
- function get_property_name() {
+ function getPropertyName() {
return 'width';
}
}
$width = new CSSCompositeWidth;
-CSS::register_css_property($width);
-CSS::register_css_property(new CSSWidth($width));
-CSS::register_css_property(new CSSMinWidth($width, '_min_width'));
+(new CSS())->register_css_property($width);
+(new CSS())->register_css_property(new CSSWidth($width));
+(new CSS())->register_css_property(new CSSMinWidth($width, '_min_width'));
?>
\ No newline at end of file
diff --git a/public_html/css.word-spacing.inc.php b/public_html/css.word-spacing.inc.php
index 688ca52..2dd1989 100644
--- a/public_html/css.word-spacing.inc.php
+++ b/public_html/css.word-spacing.inc.php
@@ -4,10 +4,10 @@
class CSSWordSpacing extends CSSPropertyHandler {
var $_default_value;
- function CSSWordSpacing() {
- $this->CSSPropertyHandler(false, true);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, true);
- $this->_default_value = Value::fromString("0");
+ $this->_default_value = (new Value())->fromString("0");
}
function default_value() {
@@ -19,24 +19,24 @@ function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
if ($value === 'normal') {
return $this->_default_value;
- };
+ }
- return Value::fromString($value);
+ return (new Value())->fromString($value);
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_WORD_SPACING;
}
- function get_property_name() {
+ function getPropertyName() {
return 'word-spacing';
}
}
-CSS::register_css_property(new CSSWordSpacing);
+(new CSS())->register_css_property(new CSSWordSpacing);
?>
diff --git a/public_html/css.z-index.inc.php b/public_html/css.z-index.inc.php
index eb6602b..195e4a9 100644
--- a/public_html/css.z-index.inc.php
+++ b/public_html/css.z-index.inc.php
@@ -1,8 +1,8 @@
CSSPropertyHandler(false, false);
+ function __construct() {
+ CSSPropertyHandler::__construct(false, false);
}
function default_value() { return 0; }
@@ -10,20 +10,20 @@ function default_value() { return 0; }
function parse($value) {
if ($value === 'inherit') {
return CSS_PROPERTY_INHERIT;
- };
+ }
return (int)$value;
}
- function get_property_code() {
+ function getPropertyCode() {
return CSS_Z_INDEX;
}
- function get_property_name() {
+ function getPropertyName() {
return 'z-index';
}
}
-CSS::register_css_property(new CSSZIndex);
+(new CSS())->register_css_property(new CSSZIndex);
?>
\ No newline at end of file
diff --git a/public_html/default.css b/public_html/default.css
index 8b9adea..9967753 100644
--- a/public_html/default.css
+++ b/public_html/default.css
@@ -259,7 +259,6 @@ input[type=submit] {
input[type=text] {
display: -text;
- width: 21ex;
}
ins {
@@ -311,7 +310,6 @@ ol {
padding-left: 40px;
margin-top: 1em;
margin-bottom: 1em;
- -html2ps-list-counter: 0;
}
option {
@@ -423,7 +421,6 @@ td {
th {
display: table-cell;
font-weight: bold;
- text-align: center;
}
thead {
@@ -509,11 +506,9 @@ dir ol dir, dir ul dir, dir menu dir, dir dir dir {
/**
* CSS 3 - specific defaults
*/
-/*
@page {
reset-counter: footnote;
}
-*/
@footnote {
border-top: thin solid black;
@@ -528,72 +523,4 @@ dir ol dir, dir ul dir, dir menu dir, dir dir dir {
*::marker {
content: counter(footnote, super-decimal);
-}
-
-.html2ps-toc-wrapper {
- position: relative;
- height: 1.2em;
- background: white;
-}
-
-.html2ps-toc-2-wrapper {
- padding-left: 1em;
-}
-
-.html2ps-toc-3-wrapper {
- padding-left: 2em;
-}
-
-.html2ps-toc-name {
- float: left;
- height: 1.2em;
- width: 100%;
- margin-right: -5em;
-}
-
-.html2ps-toc-page {
- float: left;
- height: 1.2em;
- width: 4em;
-}
-
-/**
- * New HTML5 Tags
- */
-article,
-aside,
-audio,
-canvas,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-output,
-section,
-video {
- display: block;
-}
-
-bdi,
-command,
-details,
-dialog,
-summary,
-mark,
-meter,
-nav,
-progress,
-ruby,
-rt,
-rp,
-time,
-wbr {
- display: inline;
-}
-
-datalist,
-keygen,
-track {
- display: none;
}
\ No newline at end of file
diff --git a/public_html/demo/generic.param.php b/public_html/demo/generic.param.php
index c17c56c..31588c1 100644
--- a/public_html/demo/generic.param.php
+++ b/public_html/demo/generic.param.php
@@ -1,46 +1,30 @@
- $value) {
- $data[$key] = stripslashes($data[$key]);
- };
- };
- } else {
- /**
- * Remove slashes added by magic quotes option
- */
- if (get_magic_quotes_gpc()) {
- $data = stripslashes($data);
- };
-
- /**
- * Limit maximal length of passed data
- */
- $data = substr($data, 0, $maxlength);
- };
-
- return $data;
-}
+
\ No newline at end of file
diff --git a/public_html/demo/html2ps.php b/public_html/demo/html2ps.php
index 0cf41f3..440ad55 100644
--- a/public_html/demo/html2ps.php
+++ b/public_html/demo/html2ps.php
@@ -1,238 +1,269 @@
- isset($_REQUEST['compress']),
- 'cssmedia' => get_var('cssmedia', $_REQUEST, 255, "screen"),
- 'debugbox' => isset($_REQUEST['debugbox']),
- 'debugnoclip' => isset($_REQUEST['debugnoclip']),
- 'draw_page_border' => isset($_REQUEST['pageborder']),
- 'encoding' => get_var('encoding', $_REQUEST, 255, ""),
- 'html2xhtml' => !isset($_REQUEST['html2xhtml']),
- 'imagequality_workaround' => isset($_REQUEST['imagequality_workaround']),
- 'landscape' => isset($_REQUEST['landscape']),
- 'margins' => array(
- 'left' => (int)get_var('leftmargin', $_REQUEST, 10, 0),
- 'right' => (int)get_var('rightmargin', $_REQUEST, 10, 0),
- 'top' => (int)get_var('topmargin', $_REQUEST, 10, 0),
- 'bottom' => (int)get_var('bottommargin', $_REQUEST, 10, 0),
- ),
- 'media' => get_var('media', $_REQUEST, 255, "A4"),
- 'method' => get_var('method', $_REQUEST, 255, "fpdf"),
- 'mode' => 'html',
- 'output' => get_var('output', $_REQUEST, 255, ""),
- 'pagewidth' => (int)get_var('pixels', $_REQUEST, 10, 800),
- 'pdfversion' => get_var('pdfversion', $_REQUEST, 255, "1.2"),
- 'ps2pdf' => isset($_REQUEST['ps2pdf']),
- 'pslevel' => (int)get_var('pslevel', $_REQUEST, 1, 3),
- 'renderfields' => isset($_REQUEST['renderfields']),
- 'renderforms' => isset($_REQUEST['renderforms']),
- 'renderimages' => isset($_REQUEST['renderimages']),
- 'renderlinks' => isset($_REQUEST['renderlinks']),
- 'scalepoints' => isset($_REQUEST['scalepoints']),
- 'smartpagebreak' => isset($_REQUEST['smartpagebreak']),
- 'transparency_workaround' => isset($_REQUEST['transparency_workaround'])
- );
-
-$proxy = get_var('proxy', $_REQUEST, 255, '');
-
-// ========== Entry point
-parse_config_file('../html2ps.config');
-
-// validate input data
-if ($GLOBALS['g_config']['pagewidth'] == 0) {
- die("Please specify non-zero value for the pixel width!");
-};
-
-// begin processing
-
-$g_media = Media::predefined($GLOBALS['g_config']['media']);
-$g_media->set_landscape($GLOBALS['g_config']['landscape']);
-$g_media->set_margins($GLOBALS['g_config']['margins']);
-$g_media->set_pixels($GLOBALS['g_config']['pagewidth']);
-
-// Initialize the coversion pipeline
-$pipeline = new Pipeline();
-$pipeline->configure($GLOBALS['g_config']);
-
-// Configure the fetchers
-if (extension_loaded('curl')) {
- require_once(HTML2PS_DIR.'fetcher.url.curl.class.php');
- $pipeline->fetchers = array(new FetcherUrlCurl());
- if ($proxy != '') {
- $pipeline->fetchers[0]->set_proxy($proxy);
- };
-} else {
- require_once(HTML2PS_DIR.'fetcher.url.class.php');
- $pipeline->fetchers[] = new FetcherURL();
-};
-
-// Configure the data filters
-$pipeline->data_filters[] = new DataFilterDoctype();
-$pipeline->data_filters[] = new DataFilterUTF8($GLOBALS['g_config']['encoding']);
-if ($GLOBALS['g_config']['html2xhtml']) {
- $pipeline->data_filters[] = new DataFilterHTML2XHTML();
-} else {
- $pipeline->data_filters[] = new DataFilterXHTML2XHTML();
-};
-
-$pipeline->parser = new ParserXHTML();
-
-// "PRE" tree filters
-
-$pipeline->pre_tree_filters = array();
-
-$header_html = get_var('headerhtml', $_REQUEST, 65535, "");
-$footer_html = get_var('footerhtml', $_REQUEST, 65535, "");
-$filter = new PreTreeFilterHeaderFooter($header_html, $footer_html);
-$pipeline->pre_tree_filters[] = $filter;
-
-if ($GLOBALS['g_config']['renderfields']) {
- $pipeline->pre_tree_filters[] = new PreTreeFilterHTML2PSFields();
-};
-
-//
-
-if ($GLOBALS['g_config']['method'] === 'ps') {
- $pipeline->layout_engine = new LayoutEnginePS();
-} else {
- $pipeline->layout_engine = new LayoutEngineDefault();
-};
-
-$pipeline->post_tree_filters = array();
-
-// Configure the output format
-if ($GLOBALS['g_config']['pslevel'] == 3) {
- $image_encoder = new PSL3ImageEncoderStream();
-} else {
- $image_encoder = new PSL2ImageEncoderStream();
-};
-
-switch ($GLOBALS['g_config']['method']) {
- case 'fastps':
- if ($GLOBALS['g_config']['pslevel'] == 3) {
- $pipeline->output_driver = new OutputDriverFastPS($image_encoder);
- } else {
- $pipeline->output_driver = new OutputDriverFastPSLevel2($image_encoder);
- };
- break;
- case 'pdflib':
- $pipeline->output_driver = new OutputDriverPDFLIB16($GLOBALS['g_config']['pdfversion']);
- break;
- case 'fpdf':
- $pipeline->output_driver = new OutputDriverFPDF();
- break;
- case 'png':
- $pipeline->output_driver = new OutputDriverPNG();
- break;
- case 'pcl':
- $pipeline->output_driver = new OutputDriverPCL();
- break;
- default:
- die("Unknown output method");
-};
-
-// Setup watermark
-$watermark_text = trim(get_var('watermarkhtml', $_REQUEST, 65535, ""));
-if ($watermark_text != '') {
- $pipeline->add_feature('watermark', array('text' => $watermark_text));
-};
-
-if ($GLOBALS['g_config']['debugbox']) {
- $pipeline->output_driver->set_debug_boxes(true);
-}
-
-if ($GLOBALS['g_config']['draw_page_border']) {
- $pipeline->output_driver->set_show_page_border(true);
-}
-
-if ($GLOBALS['g_config']['ps2pdf']) {
- $pipeline->output_filters[] = new OutputFilterPS2PDF($GLOBALS['g_config']['pdfversion']);
-}
-
-if ($GLOBALS['g_config']['compress'] && $GLOBALS['g_config']['method'] == 'fastps') {
- $pipeline->output_filters[] = new OutputFilterGZip();
-}
-
-if (get_var('process_mode', $_REQUEST) == 'batch') {
- $filename = "batch";
-} else {
- $filename = $g_baseurl;
-};
-
-switch ($GLOBALS['g_config']['output']) {
- case 0:
- $pipeline->destination = new DestinationBrowser($filename);
- break;
- case 1:
- $pipeline->destination = new DestinationDownload($filename);
- break;
- case 2:
- $pipeline->destination = new DestinationFile($filename, 'File saved as: %name% ');
- break;
-};
-
-// Add additional requested features
-if (isset($_REQUEST['toc'])) {
- $pipeline->add_feature('toc', array('location' => isset($_REQUEST['toc-location']) ? $_REQUEST['toc-location'] : 'after'));
-};
-
-if (isset($_REQUEST['automargins'])) {
- $pipeline->add_feature('automargins', array());
-};
-
-// Start the conversion
-
-$time = time();
-if (get_var('process_mode', $_REQUEST) == 'batch') {
- $batch = get_var('batch', $_REQUEST);
-
- for ($i=0; $iprocess_batch($batch, $g_media);
-} else {
- $status = $pipeline->process($g_baseurl, $g_media);
-};
-
-error_log(sprintf("Processing of '%s' completed in %u seconds", $g_baseurl, time() - $time));
-
-if ($status == null) {
- print($pipeline->error_message());
- error_log("Error in conversion pipeline");
- die();
-}
-
+ isset($_REQUEST['compress']),
+ 'cssmedia' => get_var('cssmedia', $_REQUEST, 255, "screen"),
+ 'debugbox' => isset($_REQUEST['debugbox']),
+ 'debugnoclip' => isset($_REQUEST['debugnoclip']),
+ 'draw_page_border' => isset($_REQUEST['pageborder']),
+ 'encoding' => get_var('encoding', $_REQUEST, 255, ""),
+ 'html2xhtml' => !isset($_REQUEST['html2xhtml']),
+ 'imagequality_workaround' => isset($_REQUEST['imagequality_workaround']),
+ 'landscape' => isset($_REQUEST['landscape']),
+ 'margins' => array(
+ 'left' => (int)get_var('leftmargin', $_REQUEST, 10, 0),
+ 'right' => (int)get_var('rightmargin', $_REQUEST, 10, 0),
+ 'top' => (int)get_var('topmargin', $_REQUEST, 10, 0),
+ 'bottom' => (int)get_var('bottommargin', $_REQUEST, 10, 0),
+ ),
+ 'media' => get_var('media', $_REQUEST, 255, "A4"),
+ 'method' => get_var('method', $_REQUEST, 255, "fpdf"),
+ 'mode' => 'html',
+ 'output' => get_var('output', $_REQUEST, 255, ""),
+ 'pagewidth' => (int)get_var('pixels', $_REQUEST, 10, 800),
+ 'pdfversion' => get_var('pdfversion', $_REQUEST, 255, "1.2"),
+ 'ps2pdf' => isset($_REQUEST['ps2pdf']),
+ 'pslevel' => (int)get_var('pslevel', $_REQUEST, 1, 3),
+ 'renderfields' => isset($_REQUEST['renderfields']),
+ 'renderforms' => isset($_REQUEST['renderforms']),
+ 'renderimages' => isset($_REQUEST['renderimages']),
+ 'renderlinks' => isset($_REQUEST['renderlinks']),
+ 'scalepoints' => isset($_REQUEST['scalepoints']),
+ 'smartpagebreak' => isset($_REQUEST['smartpagebreak']),
+ 'transparency_workaround' => isset($_REQUEST['transparency_workaround'])
+ );
+
+$proxy = get_var('proxy', $_REQUEST, 255, '');
+
+// ========== Entry point
+parse_config_file('../html2ps.config');
+
+// validate input data
+if ($GLOBALS['g_config']['pagewidth'] == 0) {
+ die("Please specify non-zero value for the pixel width!");
+}
+
+// begin processing
+
+$g_media = (new Media())->predefined($GLOBALS['g_config']['media']);
+$g_media->set_landscape($GLOBALS['g_config']['landscape']);
+$g_media->set_margins($GLOBALS['g_config']['margins']);
+$g_media->set_pixels($GLOBALS['g_config']['pagewidth']);
+
+// Initialize the coversion pipeline
+$pipeline = new Pipeline();
+$pipeline->configure($GLOBALS['g_config']);
+
+// Configure the fetchers
+if (extension_loaded('curl')) {
+ require_once(HTML2PS_DIR.'fetcher.url.curl.class.php');
+ $pipeline->fetchers = array(new FetcherUrlCurl());
+ if ($proxy != '') {
+ $pipeline->fetchers[0]->set_proxy($proxy);
+ }
+} else {
+ require_once(HTML2PS_DIR.'fetcher.url.class.php');
+ $pipeline->fetchers[] = new FetcherURL();
+}
+
+// Configure the data filters
+$pipeline->data_filters[] = new DataFilterDoctype();
+$pipeline->data_filters[] = new DataFilterUTF8($GLOBALS['g_config']['encoding']);
+if ($GLOBALS['g_config']['html2xhtml']) {
+ $pipeline->data_filters[] = new DataFilterHTML2XHTML();
+} else {
+ $pipeline->data_filters[] = new DataFilterXHTML2XHTML();
+}
+
+$pipeline->parser = new ParserXHTML();
+
+// "PRE" tree filters
+
+$pipeline->pre_tree_filters = array();
+
+$header_html = get_var('headerhtml', $_REQUEST, 65535, "");
+$footer_html = get_var('footerhtml', $_REQUEST, 65535, "");
+$filter = new PreTreeFilterHeaderFooter($header_html, $footer_html);
+$pipeline->pre_tree_filters[] = $filter;
+
+if ($GLOBALS['g_config']['renderfields']) {
+ $pipeline->pre_tree_filters[] = new PreTreeFilterHTML2PSFields();
+}
+
+//
+
+if ($GLOBALS['g_config']['method'] === 'ps') {
+ $pipeline->layout_engine = new LayoutEnginePS();
+} else {
+ $pipeline->layout_engine = new LayoutEngineDefault();
+}
+
+$pipeline->post_tree_filters = array();
+
+// Configure the output format
+if ($GLOBALS['g_config']['pslevel'] == 3) {
+ $image_encoder = new PSL3ImageEncoderStream();
+} else {
+ $image_encoder = new PSL2ImageEncoderStream();
+}
+
+switch ($GLOBALS['g_config']['method']) {
+ case 'fastps':
+ if ($GLOBALS['g_config']['pslevel'] == 3) {
+ $pipeline->output_driver = new OutputDriverFastPS($image_encoder);
+ } else {
+ $pipeline->output_driver = new OutputDriverFastPSLevel2($image_encoder);
+ }
+ break;
+ case 'pdflib':
+ $pipeline->output_driver = new OutputDriverPDFLIB16($GLOBALS['g_config']['pdfversion']);
+ break;
+ case 'fpdf':
+ $pipeline->output_driver = new OutputDriverFPDF();
+ break;
+ case 'png':
+ $pipeline->output_driver = new OutputDriverPNG();
+ break;
+ case 'pcl':
+ $pipeline->output_driver = new OutputDriverPCL();
+ break;
+ default:
+ die("Unknown output method");
+}
+
+// Setup watermark
+$watermark_text = trim(get_var('watermarkhtml', $_REQUEST, 65535, ""));
+if ($watermark_text != '') {
+ $pipeline->add_feature('watermark', array('text' => $watermark_text));
+}
+
+// Check whether PDF encryption should be enabled
+if (isset($_REQUEST['encryption_copy']) ||
+ isset($_REQUEST['encryption_print']) ||
+ isset($_REQUEST['encryption_modify']) ||
+ isset($_REQUEST['encryption_modify_annotations'])) {
+ $mode = 0;
+
+ if (isset($_REQUEST['encryption_copy'])) {
+ $mode = $mode | 1;
+ }
+
+ if (isset($_REQUEST['encryption_print'])) {
+ $mode = $mode | 2;
+ }
+
+ if (isset($_REQUEST['encryption_modify'])) {
+ $mode = $mode | 4;
+ }
+
+ if (isset($_REQUEST['encryption_modify_annotations'])) {
+ $mode = $mode | 8;
+ }
+
+ $pipeline->add_feature('encryption', array('mode' => $mode));
+}
+
+if ($GLOBALS['g_config']['debugbox']) {
+ $pipeline->output_driver->set_debug_boxes(true);
+}
+
+if ($GLOBALS['g_config']['draw_page_border']) {
+ $pipeline->output_driver->set_show_page_border(true);
+}
+
+if ($GLOBALS['g_config']['ps2pdf']) {
+ $pipeline->output_filters[] = new OutputFilterPS2PDF($GLOBALS['g_config']['pdfversion']);
+}
+
+if ($GLOBALS['g_config']['compress'] && $GLOBALS['g_config']['method'] == 'fastps') {
+ $pipeline->output_filters[] = new OutputFilterGZip();
+}
+
+if (get_var('process_mode', $_REQUEST) == 'batch') {
+ $filename = "batch";
+} else {
+ $filename = $g_baseurl;
+}
+
+if(!empty($_REQUEST['sNewFilename'])) $filename = $_REQUEST['sNewFilename'];
+
+switch ($GLOBALS['g_config']['output']) {
+ case 0:
+ $pipeline->destination = new DestinationBrowser($filename);
+ break;
+ case 1:
+ $pipeline->destination = new DestinationDownload($filename);
+ break;
+ case 2:
+ $pipeline->destination = new DestinationFile($filename, 'File saved as: %name% ');
+ break;
+}
+
+// Add additional requested features
+if (isset($_REQUEST['toc'])) {
+ $pipeline->add_feature('toc', array('location' => isset($_REQUEST['toc-location']) ? $_REQUEST['toc-location'] : 'after'));
+}
+
+if (isset($_REQUEST['automargins'])) {
+ $pipeline->add_feature('automargins', array());
+}
+
+// Start the conversion
+
+$time = time();
+if (get_var('process_mode', $_REQUEST) == 'batch') {
+ $batch = get_var('batch', $_REQUEST);
+
+ for ($i=0; $iprocess_batch($batch, $g_media);
+} else {
+ $status = $pipeline->process($g_baseurl, $g_media);
+}
+
+error_log(sprintf("Processing of '%s' completed in %u seconds", $g_baseurl, time() - $time));
+
+if ($status == null) {
+ print($pipeline->error_message());
+ error_log("Error in conversion pipeline");
+ die();
+}
+
?>
\ No newline at end of file
diff --git a/public_html/demo/index.php b/public_html/demo/index.php
index e8c251c..df06047 100644
--- a/public_html/demo/index.php
+++ b/public_html/demo/index.php
@@ -1,534 +1,568 @@
-
-
-
-
-
-
-
-
-HTML2PS/PDF
-
-
-
-
-
-
-html2ps/pdf demo (v ..)
-
-GhostView can be used to read PostScript files, and Adobe Acrobat Reader can be used to read PDF files.
-See also:
-
-
-
-
-
-html2ps is free and open-source for commercial and non-commercial use. Read more about html2ps .
-
-Donate to the html2ps project
-
-HTML2PS/PDF
+
+
+
+
+
+
+html2ps/pdf demo (v ..)
+
+GhostView can be used to read PostScript files, and Adobe Acrobat Reader can be used to read PDF files.
+See also:
+
+
+
+
+
+html2ps is free and open-source for commercial and non-commercial use. Read more about html2ps .
+
+Donate to the html2ps project
+
+
-${title}
-${message}
-
-EOF;
- };
-}
-
-class ManagerChecks {
- function register($check) {
- global $__g_registered_checks;
- $__g_registered_checks[] = $check;
- }
-
- function run() {
- global $__g_registered_checks;
- $size = count($__g_registered_checks);
- for ($i=0; $i<$size; $i++) {
- $__g_registered_checks[$i]->run();
- };
- }
-
- function getChecks() {
- global $__g_registered_checks;
- return $__g_registered_checks;
- }
-}
-
-class CheckSimple {
- var $_message;
-
- /**
- * Invariants
- */
- function title() {
- error_no_method('title', get_class($this));
- }
-
- function description() {
- error_no_method('description', get_class($this));
- }
-
- /**
- * Start checking
- */
- function run() {
- error_no_method('run', get_class($this));
- }
-
- /**
- * Get check status code; status code should be one of the following
- * predefined constants:
- * CHECK_STATUS_FAILED - check failed, script will not work unless this issue is fixed
- * CHECK_STATUS_WARNING - check succeeded, script may encounter minor issues
- * CHECK_STATUS_SUCCESS - check succeeded without any problems
- *
- * @return Integer Status code
- */
- function getStatus() {
- error_no_method('status', get_class($this));
- }
-
- /**
- * Returns a short human-readable message describing results of the
- * check run. By default, this message is generated in 'run' method
- * (overridden in CheckSimple children) and stored via 'setMessage'
- *
- * @return String description of the test results
- */
- function getMessage() {
- return $this->_message;
- }
-
- function setMessage($message) {
- $this->_message = $message;
- }
-}
-
-/**
- */
-class CheckBinary extends CheckSimple {
- var $_success;
-
- function setSuccess($success) {
- $this->_success = $success;
- }
-
- function getSuccess() {
- return $this->_success;
- }
-}
-
-/**
- */
-class CheckBinaryRequired extends CheckBinary {
- function getStatus() {
- if ($this->getSuccess()) {
- return CHECK_STATUS_SUCCESS;
- } else {
- return CHECK_STATUS_FAILED;
- };
- }
-}
-
-/**
- */
-class CheckBinaryRecommended extends CheckBinary {
- function getStatus() {
- if ($this->getSuccess()) {
- return CHECK_STATUS_SUCCESS;
- } else {
- return CHECK_STATUS_WARNING;
- };
- }
-}
-
-/**
- */
-class CheckTriState extends CheckSimple {
- var $_status;
-
- function getStatus() {
- return $this->_status;
- }
-
- function setStatus($status) {
- $this->_status = $status;
- }
-}
-
-/**
- * Actual checks
- */
-
-/**
- * PHP version
- */
-class CheckPHPVersion extends CheckTriState {
- function title() {
- return "PHP Version";
- }
-
- function description() {
- return "";
- }
-
- function run() {
- // > "4.3.0";
- }
-}
-// ManagerChecks::register(new CheckPHPVersion());
-
-/**
- * Required / recommended extensions
- */
-
-/**
- * Presense of DOM/XML extensions
- */
-class CheckDOM extends CheckTriState {
- function title() {
- return "XML DOM extension";
- }
-
- function description() {
- return "HTML files are parsed using XML DOM extensions";
- }
-
- function run() {
- if (function_exists('domxml_open_mem') ||
- class_exists('DOMDocument')) {
- $this->setStatus(CHECK_STATUS_SUCCESS);
- $this->setMessage('Native XML DOM extension found');
- return;
- };
-
- if (file_exists(HTML2PS_DIR.'classes/include.php')) {
- $this->setStatus(CHECK_STATUS_WARNING);
- $this->setMessage('No native XML DOM extension found, falling back to Active-State DOM XML. Note that it is highly recommended to use native PHP XML DOM extension .');
- return;
- };
-
- $this->setStatus(CHECK_STATUS_FAILED);
- $this->setMessage('No XML DOM extension found');
- }
-}
-
-/**
- * Presense of PDFLIB extension
- */
-class CheckPDFLIB extends CheckBinaryRecommended {
-}
-
-/**
- * Presense of Curl extension
- */
-class CheckCurl extends CheckBinaryRecommended {
- function title() {
- return "Curl PHP Extension";
- }
-
- function description() {
- return "Curl PHP extension is recommended for fetching files via HTTP protocol";
- }
-
- function run() {
- $this->setSuccess(false);
-
- if (!extension_loaded('curl')) {
- $this->setMessage('Missing Curl extension. Script will use pure-PHP fallback (allow_url_fopen=On is required!). Proxy support is not available ');
- return;
- };
-
- $version = curl_version();
- // PHP 5.0.1 and greater return array instead of string
- if (is_array($version)) {
- $version = $version['version'];
- };
- $this->setMessage(sprintf('Found Curl extension version %s.', $version['version']));
- $this->setSuccess(true);
- }
-}
-
-/**
- * Presense of GD extension
- */
-class CheckGD extends CheckBinaryRequired {
- function title() {
- return "GD PHP Extension";
- }
-
- function description() {
- return "GD PHP extension is required for graphic file processing";
- }
-
- function run() {
- $this->setSuccess(false);
-
- if (!extension_loaded('gd')) {
- $this->setMessage('Missing GD extension. Please refer to PHP.net instructions on installing/enabling this extension.');
- return;
- };
-
- $gd_info = gd_info();
- $gd_version_string = $gd_info['GD Version'];
-
- /**
- * Extract version number if it is a bundled version; otherwise we assume that
- * version string should contain verions number only
- */
- if (preg_match("/bundled \(([\d\.]+) compatible\)/", $gd_version_string, $matches)) {
- $gd_version = $matches[1];
- } else {
- $gd_version = $gd_version_string;
- };
-
- if (!function_exists('imagecreatetruecolor')) {
- $this->setMessage("GD version 2.0.1+ required for 'imagecreatetruecolor' function to work");
- return;
- };
-
- $this->setMessage("Found GD version $gd_version.");
- $this->setSuccess(true);
- }
-}
-
-/**
- * Presense of ZLIB extension (compressed files)
- */
-class CheckZLIB extends CheckBinaryRecommended {
-}
-
-/**
- * System limits & settings
- */
-
-/**
- * Execution time limit
- */
-class CheckMaxExecutionTime extends CheckTriState {
-}
-
-/**
- * Memory limit
- */
-class CheckMemoryLimit extends CheckTriState {
-}
-
-/**
- * Allow_url_fopen setting
- */
-class CheckAllowURLFopen extends CheckBinaryRecommended {
- function title() {
- return "allow_url_fopen ini setting";
- }
-
- function description() {
- return "allow_url_fopen should be enabled when CURL extension is not available";
- }
-
- function run() {
- $this->setSuccess(false);
-
- $setting = ini_get('allow_url_fopen');
- if (!$setting) {
- $this->setMessage('allow_url_fopen is disabled. You will not be able to fetch files via HTTP without CURL extension.');
- return;
- }
-
- $this->setMessage('allow_url_fopen is enabled');
- $this->setSuccess(true);
- }
-}
-
-
-/**
- * pcre.backtrack_limit setting (PHP 5.2)
- */
-class CheckPCREBacktrack extends CheckBinaryRecommended {
- function title() {
- return "pcre.backtrack_limit ini setting";
- }
-
- function description() {
- return "It is recommended to increase pcre.backtrack_limit value to 1,000,000";
- }
-
- function run() {
- $this->setSuccess(false);
-
- $version = explode('.', PHP_VERSION);
- if ($version[0] < 5 ||
- ($version[0] == 5 && $version[1] < 2)) {
- $this->setMessage('pcre.backtrack_limit is not available in PHP prior to 5.2.0');
- $this->setSuccess(true);
- return;
- };
-
- $setting = ini_get('pcre.backtrack_limit');
- if ($setting < 1000000) {
- $this->setMessage(sprintf('pcre.backtrack_limit is set to %s (less than 1,000,000). You could experience issues converting large pages.',
- $setting));
- return;
- }
-
- $this->setMessage('pcre.backtrack_limit is greater than 1,000,000');
- $this->setSuccess(true);
- }
-}
-
-
-/**
- * Access/permissions
- */
-
-/**
- * permissions on cache directory
- */
-class CheckPermissionsCache extends CheckBinaryRequired {
- function title() {
- return "Permissions on 'cache' subdirectory";
- }
-
- function description() {
- return "Script should have full access to 'cache' subdirectory to keep cached files there";
- }
-
- function run() {
- if (!file_exists(HTML2PS_DIR.'/cache/')) {
- $this->setMessage("'cache' subdirectory is missing");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_readable(HTML2PS_DIR.'/cache/')) {
- $this->setMessage("'cache' subdirectory is not readable");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_writable(HTML2PS_DIR.'/cache/')) {
- $this->setMessage("'cache' subdirectory is not writable");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_executable(HTML2PS_DIR.'/cache/') && PHP_OS != "WINNT") {
- $this->setMessage("'cache' subdirectory is not executable");
- $this->setSuccess(false);
- return;
- };
-
- $this->setMessage("'cache' subdirectory is fully accessible to the script");
- $this->setSuccess(true);
- }
-}
-
-/**
- * Permissions on 'out' directory
- */
-class CheckPermissionsOut extends CheckBinaryRecommended {
- function title() {
- return "Permissions on 'out' subdirectory";
- }
-
- function description() {
- return "Script should have full access to 'out' subdirectory to put generated files there";
- }
-
- function run() {
- if (!file_exists(HTML2PS_DIR.'/out/')) {
- $this->setMessage("'out' subdirectory is missing");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_readable(HTML2PS_DIR.'/out/')) {
- $this->setMessage("'out' subdirectory is not readable");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_writable(HTML2PS_DIR.'/out/')) {
- $this->setMessage("'out' subdirectory is not writable");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_executable(HTML2PS_DIR.'/out/') && PHP_OS != "WINNT") {
- $this->setMessage("'out' subdirectory is not executable");
- $this->setSuccess(false);
- return;
- };
-
- $this->setMessage("'out' subdirectory is fully accessible to the script");
- $this->setSuccess(true);
- }
-}
-
-/**
- * Permissions on 'temp' directory (system-dependent)
- */
-class CheckPermissionsTemp extends CheckBinaryRequired {
- function title() {
- return "Permissions on 'temp' subdirectory";
- }
-
- function description() {
- return "Script should have full access to 'temp' subdirectory to keep temporary files there";
- }
-
- function run() {
- if (!file_exists(HTML2PS_DIR.'/temp/')) {
- $this->setMessage("'temp' subdirectory is missing");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_readable(HTML2PS_DIR.'/temp/')) {
- $this->setMessage("'temp' subdirectory is not readable");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_writable(HTML2PS_DIR.'/temp/')) {
- $this->setMessage("'temp' subdirectory is not writable");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_executable(HTML2PS_DIR.'/temp/') && PHP_OS != "WINNT") {
- $this->setMessage("'temp' subdirectory is not executable");
- $this->setSuccess(false);
- return;
- };
-
- $this->setMessage("'temp' subdirectory is fully accessible to the script");
- $this->setSuccess(true);
- }
-}
-
-/**
- * Permissions/availability of GS executable
- */
-
-/**
- * Permissions of fonts directory
- */
-class CheckPermissionsFonts extends CheckBinaryRequired {
- function title() {
- return "Permissions on 'fonts' subdirectory";
- }
-
- function description() {
- return "Script should be able to read 'fonts' subdirectory to access installed fonts";
- }
-
- function run() {
- if (!file_exists(HTML2PS_DIR.'/fonts/')) {
- $this->setMessage("'fonts' subdirectory is missing");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_readable(HTML2PS_DIR.'/fonts/')) {
- $this->setMessage("'fonts' subdirectory is not readable");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_executable(HTML2PS_DIR.'/fonts/') && PHP_OS != "WINNT") {
- $this->setMessage("'fonts' subdirectory is not executable");
- $this->setSuccess(false);
- return;
- };
-
- $this->setMessage("'fonts' subdirectory is readable and executable by the script");
- $this->setSuccess(true);
- }
-}
-
-/**
- * Permissions/presence of Type1 fonts repository
- */
-class CheckPermissionsType1 extends CheckBinaryRecommended {
- function title() {
- return "Permissions on Type1 fonts directory";
- }
-
- function description() {
- return "Script should be able to access Type1 fonts directory containing font metrics in order to generate Postscript files";
- }
-
- function run() {
- if (!file_exists(TYPE1_FONTS_REPOSITORY)) {
- $this->setMessage("Type1 fonts directory (".TYPE1_FONTS_REPOSITORY.") is missing. You will not be able to generate postscript files.");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_readable(TYPE1_FONTS_REPOSITORY)) {
- $this->setMessage("Type1 fonts directory (".TYPE1_FONTS_REPOSITORY.") is not readable. You will not be able to generate postscript files.");
- $this->setSuccess(false);
- return;
- };
-
- if (!is_executable(HTML2PS_DIR.'/fonts/') && PHP_OS != "WINNT") {
- $this->setMessage("Type1 fonts directory (".TYPE1_FONTS_REPOSITORY.") is not executable. You will not be able to generate postscript files.");
- $this->setSuccess(false);
- return;
- };
-
- $this->setMessage("Type1 fonts directory is readable and executable by the script");
- $this->setSuccess(true);
- }
-}
-
-/**
- * Fonts
- */
-
-/**
- * Permissions/presense of TTF files
- */
-class CheckPresenceTTF extends CheckBinaryRecommended {
- function title() {
- return "Presense of registered TTF files";
- }
-
- function description() {
- return "TrueType fonts registered in html2ps.config should be present in order to generate PDF files with these fonts.";
- }
-
- function run() {
- $message = "";
- $this->setSuccess(true);
-
- global $g_font_resolver_pdf;
- foreach ($g_font_resolver_pdf->ttf_mappings as $file) {
- $fullname = HTML2PS_DIR.'/fonts/'.$file;
-
- if (!file_exists($fullname)) {
- $message .= "Font ".$fullname." is missing. You will not be able to generate PDF files with this font.\n";
- $this->setSuccess(false);
- } elseif (!file_exists($fullname)) {
- $message .= "Font ".$fullname." is not readable. You will not be able to generate PDF files with this font.\n";
- $this->setSuccess(false);
- } else {
- $message .= "Font ".$fullname." is present and readable.\n";
- };
- };
-
- $this->setMessage($message);
- }
-}
-
-/**
- * Permissions/presense of Type1 fonts
- */
-
-/**
- * Permissions/presense of AFM files for Type1 fonts
- */
-class CheckPresenceType1AFM extends CheckBinaryRecommended {
- function title() {
- return "Presense of registered TTF files";
- }
-
- function description() {
- return "TrueType fonts registered in html2ps.config should be present in order to generate PDF files with these fonts.";
- }
-
- function run() {
- $message = "";
- $this->setSuccess(true);
-
- global $g_font_resolver;
- foreach ($g_font_resolver->afm_mappings as $file) {
- $fullname = TYPE1_FONTS_REPOSITORY.$file.'.afm';
-
- if (!file_exists($fullname)) {
- $message .= "Font ".$fullname." is missing. You will not be able to generate PDF files with this font.\n";
- $this->setSuccess(false);
- } elseif (!file_exists($fullname)) {
- $message .= "Font ".$fullname." is not readable. You will not be able to generate PDF files with this font.\n";
- $this->setSuccess(false);
- } else {
- $message .= "Font ".$fullname." is present and readable.\n";
- };
- };
-
- $this->setMessage($message);
- }
-}
-
-/**
- * Graphics
- */
-
-/**
- * Generic
- */
-class CheckGDFormat extends CheckBinaryRequired {
- function title() {
- return "GD ".$this->_getFormatName()." Support";
- }
-
- function description() {
- return "GD ".$this->_getFormatName()." Support is required for reading images in ".$this->_getFormatName()." format";
- }
-
- function run() {
- $this->setSuccess(false);
-
- if (!extension_loaded('gd')) {
- $this->setMessage('Missing GD extension. Please refer to PHP.net instructions on installing/enabling this extension.');
- return;
- };
-
- $gd_info = gd_info();
- if (!$gd_info[$this->_getInfoKey()]) {
- $this->setMessage("No ".$this->_getFormatName()." support, some images will not be displayed");
- return;
- };
-
- $this->setMessage($this->_getFormatName()." support enabled");
- $this->setSuccess(true);
- }
-}
-
-/**
- * JPEG support
- */
-class CheckGDJPEG extends CheckGDFormat {
- function _getFormatName() {
- return "JPEG";
- }
-
- function _getInfoKey() {
- return "JPG Support";
- }
-}
-
-/**
- * GIF support
- */
-class CheckGDGIF extends CheckGDFormat {
- function _getFormatName() {
- return "GIF";
- }
-
- function _getInfoKey() {
- return "GIF Read Support";
- }
-}
-
-/**
- * PNG support
- */
-class CheckGDPNG extends CheckGDFormat {
- function _getFormatName() {
- return "PNG";
- }
-
- function _getInfoKey() {
- return "PNG Support";
- }
-}
-
-/**
- * Freetype support
- */
-
-/**
- * Miscellanous
- */
-
-/**
- * Check if outgoing connections are allowed
- */
-class CheckOutgoingConnections extends CheckBinary {
-}
-
-ManagerChecks::register(new CheckDOM());
-ManagerChecks::register(new CheckCurl());
-ManagerChecks::register(new CheckAllowURLFopen());
-ManagerChecks::register(new CheckPCREBacktrack());
-ManagerChecks::register(new CheckGD());
-ManagerChecks::register(new CheckGDJPEG());
-ManagerChecks::register(new CheckGDGIF());
-ManagerChecks::register(new CheckGDPNG());
-ManagerChecks::register(new CheckPermissionsTemp());
-ManagerChecks::register(new CheckPermissionsFonts());
-ManagerChecks::register(new CheckPermissionsType1());
-ManagerChecks::register(new CheckPresenceTTF());
-ManagerChecks::register(new CheckPresenceType1AFM());
-
-ManagerChecks::run();
-out_header();
-out_check_list();
-out_footer();
-
+ "failed",
+ CHECK_STATUS_WARNING => "warning",
+ CHECK_STATUS_SUCCESS => "success");
+ if (isset($mapping[$status])) {
+ return $mapping[$status];
+ }
+
+ error_log(sprintf("Unknown status code passed to 'status2class': %s", $status));
+ return "unknown";
+}
+
+function out_check_list() {
+ $checks = ManagerChecks::getChecks();
+ foreach ($checks as $check) {
+ $title = htmlspecialchars($check->title());
+ $message = nl2br($check->getMessage());
+ $status_class = status2class($check->getStatus());
+
+ print <<
+${title}
+${message}
+
+EOF;
+ }
+}
+
+class ManagerChecks {
+ function register($check) {
+ global $__g_registered_checks;
+ $__g_registered_checks[] = $check;
+ }
+
+ function run() {
+ global $__g_registered_checks;
+ $size = count((array) $__g_registered_checks);
+ for ($i=0; $i<$size; $i++) {
+ $__g_registered_checks[$i]->run();
+ }
+ }
+
+ function getChecks() {
+ global $__g_registered_checks;
+ return $__g_registered_checks;
+ }
+}
+
+class CheckSimple {
+ var $_message;
+
+ /**
+ * Invariants
+ */
+ function title() {
+ error_no_method('title', get_class($this));
+ }
+
+ function description() {
+ error_no_method('description', get_class($this));
+ }
+
+ /**
+ * Start checking
+ */
+ function run() {
+ error_no_method('run', get_class($this));
+ }
+
+ /**
+ * Get check status code; status code should be one of the following
+ * predefined constants:
+ * CHECK_STATUS_FAILED - check failed, script will not work unless this issue is fixed
+ * CHECK_STATUS_WARNING - check succeeded, script may encounter minor issues
+ * CHECK_STATUS_SUCCESS - check succeeded without any problems
+ *
+ * @return Integer Status code
+ */
+ function getStatus() {
+ error_no_method('status', get_class($this));
+ }
+
+ /**
+ * Returns a short human-readable message describing results of the
+ * check run. By default, this message is generated in 'run' method
+ * (overridden in CheckSimple children) and stored via 'setMessage'
+ *
+ * @return String description of the test results
+ */
+ function getMessage() {
+ return $this->_message;
+ }
+
+ function setMessage($message) {
+ $this->_message = $message;
+ }
+}
+
+/**
+ */
+class CheckBinary extends CheckSimple {
+ var $_success;
+
+ function setSuccess($success) {
+ $this->_success = $success;
+ }
+
+ function getSuccess() {
+ return $this->_success;
+ }
+}
+
+/**
+ */
+class CheckBinaryRequired extends CheckBinary {
+ function getStatus() {
+ if ($this->getSuccess()) {
+ return CHECK_STATUS_SUCCESS;
+ } else {
+ return CHECK_STATUS_FAILED;
+ }
+ }
+}
+
+/**
+ */
+class CheckBinaryRecommended extends CheckBinary {
+ function getStatus() {
+ if ($this->getSuccess()) {
+ return CHECK_STATUS_SUCCESS;
+ } else {
+ return CHECK_STATUS_WARNING;
+ }
+ }
+}
+
+/**
+ */
+class CheckTriState extends CheckSimple {
+ var $_status;
+
+ function getStatus() {
+ return $this->_status;
+ }
+
+ function setStatus($status) {
+ $this->_status = $status;
+ }
+}
+
+/**
+ * Actual checks
+ */
+
+/**
+ * PHP version
+ */
+class CheckPHPVersion extends CheckTriState {
+ function title() {
+ return "PHP Version";
+ }
+
+ function description() {
+ return "";
+ }
+
+ function run() {
+ // > "4.3.0";
+ }
+}
+// ManagerChecks::register(new CheckPHPVersion());
+
+/**
+ * Required / recommended extensions
+ */
+
+/**
+ * Presense of DOM/XML extensions
+ */
+class CheckDOM extends CheckTriState {
+ function title() {
+ return "XML DOM extension";
+ }
+
+ function description() {
+ return "HTML files are parsed using XML DOM extensions";
+ }
+
+ function run() {
+ if (function_exists('domxml_open_mem') ||
+ class_exists('DOMDocument')) {
+ $this->setStatus(CHECK_STATUS_SUCCESS);
+ $this->setMessage('Native XML DOM extension found');
+ return;
+ }
+
+ if (file_exists(HTML2PS_DIR.'classes/include.php')) {
+ $this->setStatus(CHECK_STATUS_WARNING);
+ $this->setMessage('No native XML DOM extension found, falling back to Active-State DOM XML. Note that it is highly recommended to use native PHP XML DOM extension .');
+ return;
+ }
+
+ $this->setStatus(CHECK_STATUS_FAILED);
+ $this->setMessage('No XML DOM extension found');
+ }
+}
+
+/**
+ * Presense of PDFLIB extension
+ */
+class CheckPDFLIB extends CheckBinaryRecommended {
+}
+
+/**
+ * Presense of Curl extension
+ */
+class CheckCurl extends CheckBinaryRecommended {
+ function title() {
+ return "Curl PHP Extension";
+ }
+
+ function description() {
+ return "Curl PHP extension is recommended for fetching files via HTTP protocol";
+ }
+
+ function run() {
+ $this->setSuccess(false);
+
+ if (!extension_loaded('curl')) {
+ $this->setMessage('Missing Curl extension. Script will use pure-PHP fallback (allow_url_fopen=On is required!). Proxy support is not available ');
+ return;
+ }
+
+ $version = curl_version();
+ // PHP 5.0.1 and greater return array instead of string
+ if (is_array($version)) {
+ $version = $version['version'];
+ }
+ $this->setMessage(sprintf('Found Curl extension version %s.', $version['version']));
+ $this->setSuccess(true);
+ }
+}
+
+/**
+ * Presense of GD extension
+ */
+class CheckGD extends CheckBinaryRequired {
+ function title() {
+ return "GD PHP Extension";
+ }
+
+ function description() {
+ return "GD PHP extension is required for graphic file processing";
+ }
+
+ function run() {
+ $this->setSuccess(false);
+
+ if (!extension_loaded('gd')) {
+ $this->setMessage('Missing GD extension. Please refer to PHP.net instructions on installing/enabling this extension.');
+ return;
+ }
+
+ $gd_info = gd_info();
+ $gd_version_string = $gd_info['GD Version'];
+
+ /**
+ * Extract version number if it is a bundled version; otherwise we assume that
+ * version string should contain verions number only
+ */
+ if (preg_match("/bundled \(([\d\.]+) compatible\)/", $gd_version_string, $matches)) {
+ $gd_version = $matches[1];
+ } else {
+ $gd_version = $gd_version_string;
+ }
+
+ if (!function_exists('imagecreatetruecolor')) {
+ $this->setMessage("GD version 2.0.1+ required for 'imagecreatetruecolor' function to work");
+ return;
+ }
+
+ $this->setMessage("Found GD version $gd_version.");
+ $this->setSuccess(true);
+ }
+}
+
+/**
+ * Presense of ZLIB extension (compressed files)
+ */
+class CheckZLIB extends CheckBinaryRecommended {
+}
+
+/**
+ * System limits & settings
+ */
+
+/**
+ * Execution time limit
+ */
+class CheckMaxExecutionTime extends CheckTriState {
+}
+
+/**
+ * Memory limit
+ */
+class CheckMemoryLimit extends CheckTriState {
+}
+
+/**
+ * Allow_url_fopen setting
+ */
+class CheckAllowURLFopen extends CheckBinaryRecommended {
+ function title() {
+ return "allow_url_fopen ini setting";
+ }
+
+ function description() {
+ return "allow_url_fopen should be enabled when CURL extension is not available";
+ }
+
+ function run() {
+ $this->setSuccess(false);
+
+ $setting = ini_get('allow_url_fopen');
+ if (!$setting) {
+ $this->setMessage('allow_url_fopen is disabled. You will not be able to fetch files via HTTP without CURL extension.');
+ return;
+ }
+
+ $this->setMessage('allow_url_fopen is enabled');
+ $this->setSuccess(true);
+ }
+}
+
+
+/**
+ * pcre.backtrack_limit setting (PHP 5.2)
+ */
+class CheckPCREBacktrack extends CheckBinaryRecommended {
+ function title() {
+ return "pcre.backtrack_limit ini setting";
+ }
+
+ function description() {
+ return "It is recommended to increase pcre.backtrack_limit value to 1,000,000";
+ }
+
+ function run() {
+ $this->setSuccess(false);
+
+ $version = explode('.', PHP_VERSION);
+ if ($version[0] < 5 ||
+ ($version[0] == 5 && $version[1] < 2)) {
+ $this->setMessage('pcre.backtrack_limit is not available in PHP prior to 5.2.0');
+ $this->setSuccess(true);
+ return;
+ }
+
+ $setting = ini_get('pcre.backtrack_limit');
+ if ($setting < 1000000) {
+ $this->setMessage(sprintf('pcre.backtrack_limit is set to %s (less than 1,000,000). You could experience issues converting large pages.',
+ $setting));
+ return;
+ }
+
+ $this->setMessage('pcre.backtrack_limit is greater than 1,000,000');
+ $this->setSuccess(true);
+ }
+}
+
+
+/**
+ * Access/permissions
+ */
+
+/**
+ * permissions on cache directory
+ */
+class CheckPermissionsCache extends CheckBinaryRequired {
+ function title() {
+ return "Permissions on 'cache' subdirectory";
+ }
+
+ function description() {
+ return "Script should have full access to 'cache' subdirectory to keep cached files there";
+ }
+
+ function run() {
+ if (!file_exists(HTML2PS_DIR.'/cache/')) {
+ $this->setMessage("'cache' subdirectory is missing");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_readable(HTML2PS_DIR.'/cache/')) {
+ $this->setMessage("'cache' subdirectory is not readable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_writable(HTML2PS_DIR.'/cache/')) {
+ $this->setMessage("'cache' subdirectory is not writable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_executable(HTML2PS_DIR.'/cache/') && PHP_OS != "WINNT") {
+ $this->setMessage("'cache' subdirectory is not executable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ $this->setMessage("'cache' subdirectory is fully accessible to the script");
+ $this->setSuccess(true);
+ }
+}
+
+/**
+ * Permissions on 'out' directory
+ */
+class CheckPermissionsOut extends CheckBinaryRecommended {
+ function title() {
+ return "Permissions on 'out' subdirectory";
+ }
+
+ function description() {
+ return "Script should have full access to 'out' subdirectory to put generated files there";
+ }
+
+ function run() {
+ if (!file_exists(HTML2PS_DIR.'/out/')) {
+ $this->setMessage("'out' subdirectory is missing");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_readable(HTML2PS_DIR.'/out/')) {
+ $this->setMessage("'out' subdirectory is not readable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_writable(HTML2PS_DIR.'/out/')) {
+ $this->setMessage("'out' subdirectory is not writable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_executable(HTML2PS_DIR.'/out/') && PHP_OS != "WINNT") {
+ $this->setMessage("'out' subdirectory is not executable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ $this->setMessage("'out' subdirectory is fully accessible to the script");
+ $this->setSuccess(true);
+ }
+}
+
+/**
+ * Permissions on 'temp' directory (system-dependent)
+ */
+class CheckPermissionsTemp extends CheckBinaryRequired {
+ function title() {
+ return "Permissions on 'temp' subdirectory";
+ }
+
+ function description() {
+ return "Script should have full access to 'temp' subdirectory to keep temporary files there";
+ }
+
+ function run() {
+ if (!file_exists(HTML2PS_DIR.'/temp/')) {
+ $this->setMessage("'temp' subdirectory is missing");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_readable(HTML2PS_DIR.'/temp/')) {
+ $this->setMessage("'temp' subdirectory is not readable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_writable(HTML2PS_DIR.'/temp/')) {
+ $this->setMessage("'temp' subdirectory is not writable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_executable(HTML2PS_DIR.'/temp/') && PHP_OS != "WINNT") {
+ $this->setMessage("'temp' subdirectory is not executable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ $this->setMessage("'temp' subdirectory is fully accessible to the script");
+ $this->setSuccess(true);
+ }
+}
+
+/**
+ * Permissions/availability of GS executable
+ */
+
+/**
+ * Permissions of fonts directory
+ */
+class CheckPermissionsFonts extends CheckBinaryRequired {
+ function title() {
+ return "Permissions on 'fonts' subdirectory";
+ }
+
+ function description() {
+ return "Script should be able to read 'fonts' subdirectory to access installed fonts";
+ }
+
+ function run() {
+ if (!file_exists(HTML2PS_DIR.'/fonts/')) {
+ $this->setMessage("'fonts' subdirectory is missing");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_readable(HTML2PS_DIR.'/fonts/')) {
+ $this->setMessage("'fonts' subdirectory is not readable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_executable(HTML2PS_DIR.'/fonts/') && PHP_OS != "WINNT") {
+ $this->setMessage("'fonts' subdirectory is not executable");
+ $this->setSuccess(false);
+ return;
+ }
+
+ $this->setMessage("'fonts' subdirectory is readable and executable by the script");
+ $this->setSuccess(true);
+ }
+}
+
+/**
+ * Permissions/presence of Type1 fonts repository
+ */
+class CheckPermissionsType1 extends CheckBinaryRecommended {
+ function title() {
+ return "Permissions on Type1 fonts directory";
+ }
+
+ function description() {
+ return "Script should be able to access Type1 fonts directory containing font metrics in order to generate Postscript files";
+ }
+
+ function run() {
+ if (!file_exists(TYPE1_FONTS_REPOSITORY)) {
+ $this->setMessage("Type1 fonts directory (".TYPE1_FONTS_REPOSITORY.") is missing. You will not be able to generate postscript files.");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_readable(TYPE1_FONTS_REPOSITORY)) {
+ $this->setMessage("Type1 fonts directory (".TYPE1_FONTS_REPOSITORY.") is not readable. You will not be able to generate postscript files.");
+ $this->setSuccess(false);
+ return;
+ }
+
+ if (!is_executable(HTML2PS_DIR.'/fonts/') && PHP_OS != "WINNT") {
+ $this->setMessage("Type1 fonts directory (".TYPE1_FONTS_REPOSITORY.") is not executable. You will not be able to generate postscript files.");
+ $this->setSuccess(false);
+ return;
+ }
+
+ $this->setMessage("Type1 fonts directory is readable and executable by the script");
+ $this->setSuccess(true);
+ }
+}
+
+/**
+ * Fonts
+ */
+
+/**
+ * Permissions/presense of TTF files
+ */
+class CheckPresenceTTF extends CheckBinaryRecommended {
+ function title() {
+ return "Presense of registered TTF files";
+ }
+
+ function description() {
+ return "TrueType fonts registered in html2ps.config should be present in order to generate PDF files with these fonts.";
+ }
+
+ function run() {
+ $message = "";
+ $this->setSuccess(true);
+
+ global $g_font_resolver_pdf;
+ foreach ($g_font_resolver_pdf->ttf_mappings as $file) {
+ $fullname = HTML2PS_DIR.'/fonts/'.$file;
+
+ if (!file_exists($fullname)) {
+ $message .= "Font ".$fullname." is missing. You will not be able to generate PDF files with this font.\n";
+ $this->setSuccess(false);
+ } elseif (!file_exists($fullname)) {
+ $message .= "Font ".$fullname." is not readable. You will not be able to generate PDF files with this font.\n";
+ $this->setSuccess(false);
+ } else {
+ $message .= "Font ".$fullname." is present and readable.\n";
+ }
+ }
+
+ $this->setMessage($message);
+ }
+}
+
+/**
+ * Permissions/presense of Type1 fonts
+ */
+
+/**
+ * Permissions/presense of AFM files for Type1 fonts
+ */
+class CheckPresenceType1AFM extends CheckBinaryRecommended {
+ function title() {
+ return "Presense of registered TTF files";
+ }
+
+ function description() {
+ return "TrueType fonts registered in html2ps.config should be present in order to generate PDF files with these fonts.";
+ }
+
+ function run() {
+ $message = "";
+ $this->setSuccess(true);
+
+ global $g_font_resolver;
+ foreach ($g_font_resolver->afm_mappings as $file) {
+ $fullname = TYPE1_FONTS_REPOSITORY.$file.'.afm';
+
+ if (!file_exists($fullname)) {
+ $message .= "Font ".$fullname." is missing. You will not be able to generate PDF files with this font.\n";
+ $this->setSuccess(false);
+ } elseif (!file_exists($fullname)) {
+ $message .= "Font ".$fullname." is not readable. You will not be able to generate PDF files with this font.\n";
+ $this->setSuccess(false);
+ } else {
+ $message .= "Font ".$fullname." is present and readable.\n";
+ }
+ }
+
+ $this->setMessage($message);
+ }
+}
+
+/**
+ * Graphics
+ */
+
+/**
+ * Generic
+ */
+class CheckGDFormat extends CheckBinaryRequired {
+ function title() {
+ return "GD ".$this->_getFormatName()." Support";
+ }
+
+ function description() {
+ return "GD ".$this->_getFormatName()." Support is required for reading images in ".$this->_getFormatName()." format";
+ }
+
+ function run() {
+ $this->setSuccess(false);
+
+ if (!extension_loaded('gd')) {
+ $this->setMessage('Missing GD extension. Please refer to PHP.net instructions on installing/enabling this extension.');
+ return;
+ }
+
+ $gd_info = gd_info();
+ if (!$gd_info[$this->_getInfoKey()]) {
+ $this->setMessage("No ".$this->_getFormatName()." support, some images will not be displayed");
+ return;
+ }
+
+ $this->setMessage($this->_getFormatName()." support enabled");
+ $this->setSuccess(true);
+ }
+}
+
+/**
+ * JPEG support
+ */
+class CheckGDJPEG extends CheckGDFormat {
+ function _getFormatName() {
+ return "JPEG";
+ }
+
+ function _getInfoKey() {
+ return "JPG Support";
+ }
+}
+
+/**
+ * GIF support
+ */
+class CheckGDGIF extends CheckGDFormat {
+ function _getFormatName() {
+ return "GIF";
+ }
+
+ function _getInfoKey() {
+ return "GIF Read Support";
+ }
+}
+
+/**
+ * PNG support
+ */
+class CheckGDPNG extends CheckGDFormat {
+ function _getFormatName() {
+ return "PNG";
+ }
+
+ function _getInfoKey() {
+ return "PNG Support";
+ }
+}
+
+/**
+ * Freetype support
+ */
+
+/**
+ * Miscellanous
+ */
+
+/**
+ * Check if outgoing connections are allowed
+ */
+class CheckOutgoingConnections extends CheckBinary {
+}
+
+ManagerChecks::register(new CheckDOM());
+ManagerChecks::register(new CheckCurl());
+ManagerChecks::register(new CheckAllowURLFopen());
+ManagerChecks::register(new CheckPCREBacktrack());
+ManagerChecks::register(new CheckGD());
+ManagerChecks::register(new CheckGDJPEG());
+ManagerChecks::register(new CheckGDGIF());
+ManagerChecks::register(new CheckGDPNG());
+ManagerChecks::register(new CheckPermissionsTemp());
+ManagerChecks::register(new CheckPermissionsFonts());
+ManagerChecks::register(new CheckPermissionsType1());
+ManagerChecks::register(new CheckPresenceTTF());
+ManagerChecks::register(new CheckPresenceType1AFM());
+
+ManagerChecks::run();
+out_header();
+out_check_list();
+out_footer();
+
?>
\ No newline at end of file
diff --git a/public_html/demo/test.php b/public_html/demo/test.php
index 524d60f..60cdb39 100644
--- a/public_html/demo/test.php
+++ b/public_html/demo/test.php
@@ -1,97 +1,6 @@
'aa'));
+print_r(array('text' => 'aa'));
- class MyDestinationFile extends Destination {
- var $_dest_filename;
-
- function MyDestinationFile($dest_filename) {
- $this->_dest_filename = $dest_filename;
- }
-
- function process($tmp_filename, $content_type) {
- copy($tmp_filename, $this->_dest_filename);
- }
- }
-
-
- class MyDestinationDownload extends DestinationHTTP {
- function MyDestinationDownload($filename) {
- $this->DestinationHTTP($filename);
- $GLOBALS['PDFOutFileName'] = $filename;
- }
-
- function headers($content_type) {
- return array(
- "Content-Disposition: attachment; filename=".$GLOBALS['PDFOutFileName'].".".$content_type->default_extension,
- "Content-Transfer-Encoding: binary",
- "Cache-Control: must-revalidate, post-check=0, pre-check=0",
- "Pragma: public"
- );
- }
- }
-
- class MyFetcherLocalFile extends Fetcher {
- var $_content;
-
- function MyFetcherLocalFile() {
- $this->_content = "TestTest'.$code.'
', $pipeline, $media);
- $context =& new FlowContext();
+ $context= new FlowContext();
$pipeline->layout_engine->process($toc_box_document, $media, $pipeline->get_output_driver(), $context);
$toc_box =& $toc_box_document->content[0];
@@ -121,12 +121,12 @@ function update_document(&$toc, &$pipeline, &$media, &$document) {
}
function update_page_numbers(&$toc, &$pipeline, &$document, &$page_heights, &$media) {
- for ($i = 0, $size = count($toc); $i < $size; $i++) {
+ for ($i = 0, $size = is_countable($toc) ? count($toc) : 0; $i < $size; $i++) {
$toc_element =& $document->get_element_by_id($this->make_toc_page_element_id($i+1));
$element =& $toc[$i]['element'];
$toc_element->content[0]->content[0]->words[0] = $this->guess_page($element, $page_heights, $media);
- };
+ }
}
}
@@ -134,7 +134,7 @@ class FeatureTocAnchorLocatorHeaders {
var $_locations;
var $_last_generated_anchor_id;
- function FeatureTocAnchorLocatorHeaders() {
+ function __construct() {
$this->set_locations(array());
$this->_last_generated_anchor_id = 0;
}
@@ -156,18 +156,18 @@ function process_node($params) {
if (!$node->get_id()) {
$id = $this->generate_toc_anchor_id();
$node->set_id($id);
- };
+ }
$this->_locations[] = array('name' => $node->get_content(),
'level' => (int)$matches[1],
'anchor' => $node->get_id(),
'element' => &$node);
- };
+ }
}
function &run(&$pipeline, &$media, &$document) {
$this->set_locations(array());
- $walker =& new TreeWalkerDepthFirst(array(&$this, 'process_node'));
+ $walker= new TreeWalkerDepthFirst(array(&$this, 'process_node'));
$walker->run($document);
$locations = $this->get_locations();
@@ -176,7 +176,7 @@ function &run(&$pipeline, &$media, &$document) {
// $id = $location['element']->get_id();
// $pipeline->output_driver->anchors[$id] =& $location['element']->make_anchor($media, $id);
- };
+ }
return $locations;
}
@@ -187,7 +187,7 @@ function set_locations($locations) {
}
class FeatureTocDocumentUpdaterAppendPage {
- function FeatureTocDocumentUpdaterAppendPage() {
+ function __construct() {
}
function run(&$toc_box, &$media, &$document) {
@@ -197,7 +197,7 @@ function run(&$toc_box, &$media, &$document) {
}
class FeatureTocDocumentUpdaterPrependPage {
- function FeatureTocDocumentUpdaterPrependPage() {
+ function __construct() {
}
function run(&$toc_box, &$media, &$document) {
@@ -207,7 +207,7 @@ function run(&$toc_box, &$media, &$document) {
}
class FeatureTocDocumentUpdaterPlaceholder {
- function FeatureTocDocumentUpdaterPlaceholder() {
+ function __construct() {
}
function run(&$toc_box, &$media, &$document) {
diff --git a/public_html/features/watermark.php b/public_html/features/watermark.php
index a4d01d5..23a003e 100644
--- a/public_html/features/watermark.php
+++ b/public_html/features/watermark.php
@@ -3,7 +3,7 @@
class FeatureWatermark {
var $_text;
- function FeatureWatermark() {
+ function __construct() {
$this->set_text('');
}
diff --git a/public_html/fetched_data._html.class.php b/public_html/fetched_data._html.class.php
index 78d17ec..bb0998c 100644
--- a/public_html/fetched_data._html.class.php
+++ b/public_html/fetched_data._html.class.php
@@ -9,7 +9,7 @@ function _detect_encoding_using_meta() {
return strtolower($matches[2]);
} else {
return null;
- };
+ }
}
}
?>
\ No newline at end of file
diff --git a/public_html/fetched_data._interface.class.php b/public_html/fetched_data._interface.class.php
index 05022cb..576032f 100644
--- a/public_html/fetched_data._interface.class.php
+++ b/public_html/fetched_data._interface.class.php
@@ -1,6 +1,6 @@
content = $content;
$this->path = $path;
}
diff --git a/public_html/fetched_data.url.class.php b/public_html/fetched_data.url.class.php
index cef24d5..48c60b0 100644
--- a/public_html/fetched_data.url.class.php
+++ b/public_html/fetched_data.url.class.php
@@ -15,8 +15,8 @@ function detect_encoding() {
foreach ($this->headers as $header) {
if (preg_match("/Content-Type: .*charset=\s*([^\s;]+)/i", $header, $matches)) {
$encoding = strtolower($matches[1]);
- };
- };
+ }
+ }
}
// At last, fall back to default encoding
@@ -26,7 +26,7 @@ function detect_encoding() {
return $encoding;
}
- function FetchedDataURL($content, $headers, $url) {
+ function __construct($content, $headers, $url) {
$this->content = $content;
$this->headers = $headers;
$this->url = $url;
@@ -38,10 +38,10 @@ function get_additional_data($key) {
foreach ($this->headers as $header) {
if (preg_match("/Content-Type: (.*)/", $header, $matches)) {
return $matches[1];
- };
- };
+ }
+ }
return null;
- };
+ }
}
function get_uri() {
@@ -56,4 +56,4 @@ function set_content($data) {
$this->content = $data;
}
}
-?>
+?>
\ No newline at end of file
diff --git a/public_html/fetcher.local.class.php b/public_html/fetcher.local.class.php
index 53cf9de..3c8f461 100644
--- a/public_html/fetcher.local.class.php
+++ b/public_html/fetcher.local.class.php
@@ -3,7 +3,7 @@
class FetcherLocalFile extends Fetcher {
var $_content;
- function FetcherLocalFile($file) {
+ function __construct($file) {
$this->_content = file_get_contents($file);
}
@@ -12,11 +12,11 @@ function get_data($dummy1) {
}
function get_base_url() {
- return '';
+ return "";
}
function error_message() {
- return '';
+ return "";
}
}
?>
\ No newline at end of file
diff --git a/public_html/fetcher.memory.class.php b/public_html/fetcher.memory.class.php
index 6daede3..5d59277 100644
--- a/public_html/fetcher.memory.class.php
+++ b/public_html/fetcher.memory.class.php
@@ -5,7 +5,7 @@ class FetcherMemory extends Fetcher {
var $base_url;
var $content;
- function FetcherMemory($content, $base_path) {
+ function __construct($content, $base_path) {
$this->content = $content;
$this->base_path = $base_path;
$this->base_url = $base_path;
@@ -19,9 +19,9 @@ function &get_data($url) {
if ($url != $this->base_path) {
$null = null;
return $null;
- };
+ }
- $data =& new FetchedDataFile($this->content, $this->base_path);
+ $data= new FetchedDataFile($this->content, $this->base_path);
return $data;
}
diff --git a/public_html/fetcher.url.class.php b/public_html/fetcher.url.class.php
index a62d41e..04307cc 100644
--- a/public_html/fetcher.url.class.php
+++ b/public_html/fetcher.url.class.php
@@ -2,8 +2,7 @@
require_once(HTML2PS_DIR.'fetcher._interface.class.php');
-define('HTTP_OK', 200);
-define('HTTP_NOT_FOUND', 404);
+define('HTTP_OK',200);
/**
* @TODO send authorization headers only if they have been required by the server;
@@ -42,8 +41,6 @@ function get_base_url() {
function get_data($data_id) {
$this->redirects = 0;
- $data_id = $this->_simplify_path($data_id);
-
if ($this->fetch($data_id)) {
if ($this->code != HTTP_OK) {
@@ -56,14 +53,10 @@ function get_data($data_id) {
$this->error_message .= ob_get_contents();
ob_end_clean();
- if ($this->code == HTTP_NOT_FOUND) {
- trigger_error("Not found $data_id", E_USER_NOTICE);
- } else {
- trigger_error("Cannot open $data_id, HTTP result code is: ".$this->code, E_USER_WARNING);
- }
+ error_log("Cannot open $data_id, HTTP result code is: ".$this->code);
return null;
- };
+ }
return new FetchedDataURL($this->content,
explode("\r\n",$this->headers),
@@ -77,12 +70,12 @@ function get_data($data_id) {
$this->error_message .= ob_get_contents();
ob_end_clean();
- trigger_error(sprintf("Cannot open %s, too many redirects",
- $data_id) , E_USER_WARNING);
+ error_log(sprintf("Cannot open %s, too many redirects",
+ $data_id));
return null;
} else {
- $_server_response = $this->headers;
+ $_server_response = $this->headers;
$_url = htmlspecialchars($data_id);
ob_start();
@@ -90,8 +83,8 @@ function get_data($data_id) {
$this->error_message .= ob_get_contents();
ob_end_clean();
- trigger_error(sprintf("Cannot open %s",
- $data_id), E_USER_WARNING);
+ error_log(sprintf("Cannot open %s",
+ $data_id));
return null;
}
@@ -103,7 +96,7 @@ function error_message() {
// FetcherURL - constructor
- function FetcherURL() {
+ function __construct() {
$this->_connections = array();
$this->error_message = "";
@@ -133,7 +126,7 @@ function _connect() {
// Connect to the target host
if ($this->protocol == "https") {
return $this->_connect_ssl();
- };
+ }
$fp = @fsockopen($this->host,$this->port,$errno,$errstr,HTML2PS_CONNECTION_TIMEOUT);
@@ -146,7 +139,7 @@ function _connect() {
error_log($message);
$this->error_message = $message;
return null;
- };
+ }
return $fp;
}
@@ -166,7 +159,7 @@ function _connect_ssl() {
error_log($message);
$this->error_message .= $message;
return null;
- };
+ }
$fp = @fsockopen("ssl://$this->host", $this->port, $errno, $errstr, 5);
@@ -179,7 +172,7 @@ function _connect_ssl() {
error_log($message);
$this->error_message = $message;
return null;
- };
+ }
return $fp;
}
@@ -195,58 +188,20 @@ function _extract_code($res) {
$result = $matches[1];
} else {
$result = "200";
- };
+ }
return $result;
}
function _fix_location($location) {
- if (substr($location, 0, 7) == "http://") { return $location; };
- if (substr($location, 0, 8) == "https://") { return $location; };
+ if (substr($location, 0, 7) == "http://") { return $location; }
+ if (substr($location, 0, 8) == "https://") { return $location; }
- if ($location{0} == "/") {
+ if ($location[0] == "/") {
return $this->protocol."://".$this->host.$location;
- };
-
- return $this->protocol."://".$this->host.$this->path.$location;
- }
-
- /**
- * we need to simplify url, removing two dots form path part and related directory. Not all
- * web server allow this structure, so it will be correctly to parse this at our side
- *
- * @param $path - url path expected, during big code base, from some part urls is passed.
- */
- function _simplify_path($path) {
- $simplified_path = $path;
- $parsed_path = parse_url($path);
- $prepared_path = $parsed_path['path'];
-
- // verify if we need to simplify
- if (strpos($prepared_path, '..') !== false) {
- $path_parts = explode('/', $prepared_path);
-
- // array will contain part without two dots and related directories
- $simplified_parts = array();
- while(($current_part = array_shift($path_parts)) !== NULL) {
- if ($current_part == '..') {
- array_pop($simplified_parts);
- } else {
- array_push($simplified_parts, $current_part);
- }
- }
-
- // try to construct url
- $simplified_path = (isset($parsed_path['scheme']) ? $parsed_path['scheme'].'://' : '');
- $simplified_path .= (isset($parsed_path['user']) ? $parsed_path['user'].':' : '');
- $simplified_path .= (isset($parsed_path['password']) ? $parsed_path['password'].'@' : '');
- $simplified_path .= (isset($parsed_path['host']) ? $parsed_path['host'].'/' : '');
- $simplified_path .= trim(implode('/', $simplified_parts), '/');
- $simplified_path .= (isset($parsed_path['query']) ? '?'.$parsed_path['query'] : '');
- $simplified_path .= (isset($parsed_path['fragment']) ? '#'.$parsed_path['fragment'] : '');
}
- return $simplified_path;
+ return $this->protocol."://".$this->host.$this->path.$location;
}
function fetch($url) {
@@ -272,11 +227,11 @@ function fetch($url) {
if ($parts == false) {
error_log(sprintf("The URL '%s' could not be parsed", $this->url));
- $this->content = '';
+ $this->content = "";
$this->code = HTTP_OK;
return true;
- };
-
+ }
+
/**
* Setup default values
*/
@@ -288,17 +243,15 @@ function fetch($url) {
$this->path = "/";
$this->query = "";
- if (isset($parts['scheme'])) { $this->protocol = $parts['scheme']; };
- if (isset($parts['host'])) { $this->host = $parts['host']; };
- if (isset($parts['user'])) { $this->user = $parts['user']; };
- if (isset($parts['pass'])) { $this->pass = $parts['pass']; };
- if (isset($parts['port'])) { $this->port = $parts['port']; };
- if (isset($parts['path'])) { $this->path = $parts['path']; } else { $this->path = "/"; };
- if (isset($parts['query'])) { $this->path .= '?'.$parts['query']; };
-
- $this->path = $this->_simplify_path($this->path);
+ if (isset($parts['scheme'])) { $this->protocol = $parts['scheme']; }
+ if (isset($parts['host'])) { $this->host = $parts['host']; }
+ if (isset($parts['user'])) { $this->user = $parts['user']; }
+ if (isset($parts['pass'])) { $this->pass = $parts['pass']; }
+ if (isset($parts['port'])) { $this->port = $parts['port']; }
+ if (isset($parts['path'])) { $this->path = $parts['path']; } else { $this->path = "/"; }
+ if (isset($parts['query'])) { $this->path .= '?'.$parts['query']; }
- switch (strtolower($this->protocol)) {
+ switch ($this->protocol) {
case 'http':
return $this->fetch_http();
case 'https':
@@ -317,7 +270,7 @@ function fetch($url) {
function fetch_http() {
$res = $this->_head();
- if (is_null($res)) { return null; };
+ if (is_null($res)) { return null; }
$this->code = $this->_extract_code($res);
return $this->_process_code($res);
@@ -333,7 +286,7 @@ function fetch_https() {
$res = $this->_head();
- if (is_null($res)) { return null; };
+ if (is_null($res)) { return null; }
$this->code = $this->_extract_code($res);
return $this->_process_code($res);
@@ -342,14 +295,14 @@ function fetch_https() {
function fetch_file() {
if (PHP_OS == "WINNT") {
$path = substr($this->url, 7);
- if ($path{0} == "/") { $path = substr($path, 1); };
+ if ($path[0] == "/") { $path = substr($path, 1); }
} else {
$path = substr($this->url, 7);
- };
+ }
- $normalized_path = realpath(urldecode($path));
- $normalized_path_part = substr($normalized_path, 0, strlen(FILE_PROTOCOL_RESTRICT));
- if ($normalized_path_part !== FILE_PROTOCOL_RESTRICT) {
+ $normalized_path = realpath($path);
+
+ if (substr($normalized_path, 0, strlen(FILE_PROTOCOL_RESTRICT)) !== FILE_PROTOCOL_RESTRICT) {
error_log(sprintf("Access denied to file '%s'", $normalized_path));
$this->content = "";
@@ -365,7 +318,7 @@ function fetch_file() {
function _get() {
$socket = $this->_connect();
- if (is_null($socket)) { return null; };
+ if (is_null($socket)) { return null; }
// Build the HEAD request header (we're saying we're just a browser as some pages don't like non-standard user-agents)
$header = "GET ".$this->path." HTTP/1.1\r\n";
@@ -382,7 +335,7 @@ function _get() {
$res = "";
// The PHP-recommended construction
- // while (!feof($fp)) { $res .= fread($fp, 4096); };
+ // while (!feof($fp)) { $res .= fread($fp, 4096); }
// hangs indefinitely on www.searchscout.com, for example.
// seems that they do not close conection on their side or somewhat similar;
@@ -399,7 +352,7 @@ function _get() {
function _head() {
$socket = $this->_connect();
- if (is_null($socket)) { return null; };
+ if (is_null($socket)) { return null; }
// Build the HEAD request header (we're saying we're just a browser as some pages don't like non-standard user-agents)
$header = "HEAD ".$this->path." HTTP/1.1\r\n";
@@ -420,7 +373,7 @@ function _head() {
$res = "";
// The PHP-recommended construction
- // while (!feof($fp)) { $res .= fread($fp, 4096); };
+ // while (!feof($fp)) { $res .= fread($fp, 4096); }
// hangs indefinitely on www.searchscout.com, for example.
// seems that they do not close conection on their side or somewhat similar;
@@ -439,7 +392,7 @@ function _process_code($res, $used_get = false) {
case '200': // OK
if (preg_match('/(.*?)\r\n\r\n(.*)/s',$res,$matches)) {
$this->headers = $matches[1];
- };
+ }
/**
* @todo add error processing here
@@ -453,12 +406,12 @@ function _process_code($res, $used_get = false) {
break;
case '301': // Moved Permanently
$this->redirects++;
- if ($this->redirects > MAX_REDIRECTS) { return false; };
+ if ($this->redirects > MAX_REDIRECTS) { return false; }
preg_match('/Location: ([\S]+)/i',$res,$matches);
return $this->fetch($this->_fix_location($matches[1]));
case '302': // Found
$this->redirects++;
- if ($this->redirects > MAX_REDIRECTS) { return false; };
+ if ($this->redirects > MAX_REDIRECTS) { return false; }
preg_match('/Location: ([\S]+)/i',$res,$matches);
error_log('Redirected to:'.$matches[1]);
@@ -472,7 +425,7 @@ function _process_code($res, $used_get = false) {
if (!preg_match('/(.*?)\r\n\r\n(.*)/s',$res,$matches)) {
error_log("Unrecognized HTTP response");
return false;
- };
+ }
$this->headers = $matches[1];
$this->content = @file_get_contents($this->url);
return true;
@@ -480,28 +433,28 @@ function _process_code($res, $used_get = false) {
// Try to get URL information using GET request (if we didn't tried it before)
if (!$used_get) {
$res = $this->_get();
- if (is_null($res)) { return null; };
+ if (is_null($res)) { return null; }
$this->code = $this->_extract_code($res);
return $this->_process_code($res, true);
} else {
if (!preg_match('/(.*?)\r\n\r\n(.*)/s',$res,$matches)) {
error_log("Unrecognized HTTP response");
return false;
- };
+ }
$this->headers = $matches[1];
$this->content = @file_get_contents($this->url);
return true;
- };
+ }
default:
error_log("Unrecognized HTTP result code:".$this->code);
return false;
- };
+ }
}
function _header_basic_authorization() {
if (!is_null($this->user) && $this->user != "") {
return sprintf("Authorization: Basic %s\r\n", base64_encode($this->user.":".$this->pass));
- };
+ }
}
}
-?>
+?>
\ No newline at end of file
diff --git a/public_html/fetcher.url.curl.class.php b/public_html/fetcher.url.curl.class.php
index cbc1ad1..5c698af 100644
--- a/public_html/fetcher.url.curl.class.php
+++ b/public_html/fetcher.url.curl.class.php
@@ -13,7 +13,7 @@ class FetcherUrlCurl extends Fetcher {
var $url;
var $_proxy;
- function FetcherUrlCurl() {
+ function __construct() {
$this->url = "";
$this->set_proxy(null);
}
@@ -23,7 +23,7 @@ function _fix_url($url) {
// (e.g. replace http://www.google.com with http://www.google.com/
if (preg_match('#^.*://[^/]+$#', $url)) {
$url .= '/';
- };
+ }
return $url;
}
@@ -42,18 +42,14 @@ function get_data($url) {
curl_setopt($curl, CURLOPT_URL, $fixed_url);
curl_setopt($curl, CURLOPT_USERAGENT, DEFAULT_USER_AGENT);
-
- if (!@curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1)) {
- error_log('CURLOPT_FOLLOWLOCATION will not work in safe_mode; pages with redirects may be rendered incorrectly');
- };
-
+ curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
curl_setopt($curl, CURLOPT_HEADER, 1);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
$proxy = $this->get_proxy();
if (!is_null($proxy)) {
curl_setopt($curl, CURLOPT_PROXY, $proxy);
- };
+ }
/**
* Fetch headers and page content to the $response variable
diff --git a/public_html/filter.data.doctype.class.php b/public_html/filter.data.doctype.class.php
index 5f502d4..27bd9e8 100644
--- a/public_html/filter.data.doctype.class.php
+++ b/public_html/filter.data.doctype.class.php
@@ -1,6 +1,6 @@
get_content();
@@ -40,9 +40,9 @@ function process(&$data) {
case '':
$GLOBALS['g_config']['mode'] = 'xhtml';
return $data;
- };
+ }
- };
+ }
/**
* No DOCTYPE found; fall back to quirks mode
diff --git a/public_html/filter.data.encoding.class.php b/public_html/filter.data.encoding.class.php
index 8685b12..bda9bd5 100644
--- a/public_html/filter.data.encoding.class.php
+++ b/public_html/filter.data.encoding.class.php
@@ -1,6 +1,6 @@
encoding = $encoding;
}
@@ -17,13 +17,13 @@ function process(&$data) {
if (is_null($encoding)) {
$encoding = DEFAULT_ENCODING;
- };
- $converter = Converter::create();
+ }
+ $converter = (new Converter())->create();
$data->set_content($converter->to_utf8($data->get_content(), $encoding));
} else {
- $converter = Converter::create();
+ $converter = (new Converter())->create();
$data->set_content($converter->to_utf8($data->get_content(), $this->encoding));
- };
+ }
return $data;
}
diff --git a/public_html/filter.data.html2xhtml.class.php b/public_html/filter.data.html2xhtml.class.php
index 096ee39..8f8df7d 100644
--- a/public_html/filter.data.html2xhtml.class.php
+++ b/public_html/filter.data.html2xhtml.class.php
@@ -7,9 +7,8 @@
class DataFilterHTML2XHTML extends DataFilter {
function process(&$data) {
$data->set_content(html2xhtml($data->get_content()));
-
return $data;
}
}
-?>
+?>
\ No newline at end of file
diff --git a/public_html/filter.data.ucs2.class.php b/public_html/filter.data.ucs2.class.php
index 7678185..6af8568 100644
--- a/public_html/filter.data.ucs2.class.php
+++ b/public_html/filter.data.ucs2.class.php
@@ -4,7 +4,7 @@
class DataFilterUCS2 extends DataFilterEncoding {
function _convert(&$data, $encoding) {
- $converter = Converter::create();
+ $converter = (new Converter())->create();
$data->set_content($converter->to_ucs2($data->get_content(), $encoding));
}
}
diff --git a/public_html/filter.data.utf8.class.php b/public_html/filter.data.utf8.class.php
index d92b44c..27a5579 100644
--- a/public_html/filter.data.utf8.class.php
+++ b/public_html/filter.data.utf8.class.php
@@ -4,7 +4,7 @@
class DataFilterUTF8 extends DataFilterEncoding {
function _convert(&$data, $encoding) {
- $converter = Converter::create();
+ $converter = (new Converter())->create();
$data->set_content($converter->to_utf8($data->get_content(), $encoding));
}
}
diff --git a/public_html/filter.output.gzip.class.php b/public_html/filter.output.gzip.class.php
index bf8660f..fa932bc 100644
--- a/public_html/filter.output.gzip.class.php
+++ b/public_html/filter.output.gzip.class.php
@@ -3,7 +3,7 @@
class OutputFilterGZip extends OutputFilter {
function content_type() {
return null;
- // return ContentType::gz();
+ // return (new ContentType())->gz();
}
function process($tmp_filename) {
diff --git a/public_html/filter.output.ps2pdf.class.php b/public_html/filter.output.ps2pdf.class.php
index 9eecf24..a89e610 100644
--- a/public_html/filter.output.ps2pdf.class.php
+++ b/public_html/filter.output.ps2pdf.class.php
@@ -6,7 +6,7 @@ function safe_exec($cmd, &$output) {
if ($result) {
$message = "";
- if (count($output) > 0) {
+ if (is_countable($output) && count($output) > 0) {
$message .= "Error executing '{$cmd}'content); $i++) {
- $position = $tree->content[$i]->get_css_property(CSS_POSITION);
- $float = $tree->content[$i]->get_css_property(CSS_FLOAT);
+ $size = is_countable($tree->content) ? count((array) $tree->content) : 0;
+ for ($i=0; $i<$size; $i++) {
+ $position = $tree->content[$i]->getCSSProperty(CSS_POSITION);
+ $float = $tree->content[$i]->getCSSProperty(CSS_FLOAT);
if ($position == POSITION_ABSOLUTE) {
$this->_context->add_absolute_positioned($tree->content[$i]);
} elseif ($position == POSITION_FIXED) {
$this->_context->add_fixed_positioned($tree->content[$i]);
- };
+ }
$this->process($tree->content[$i], $data, $pipeline);
- };
- };
+ }
+ }
return true;
}
diff --git a/public_html/filter.post.postponed.class.php b/public_html/filter.post.postponed.class.php
index 3743577..e09ec72 100644
--- a/public_html/filter.post.postponed.class.php
+++ b/public_html/filter.post.postponed.class.php
@@ -3,25 +3,26 @@
class PostTreeFilterPostponed extends PreTreeFilter {
var $_driver;
- function PostTreeFilterPostponed(&$driver) {
+ function __construct(&$driver) {
$this->_driver =& $driver;
}
function process(&$tree, $data, &$pipeline) {
if (is_a($tree, 'GenericContainerBox')) {
- for ($i=0; $icontent); $i++) {
- $position = $tree->content[$i]->get_css_property(CSS_POSITION);
- $float = $tree->content[$i]->get_css_property(CSS_FLOAT);
+ $size = is_countable($tree->content) ? count((array) $tree->content) : 0;
+ for ($i=0; $i<$size; $i++) {
+ $position = $tree->content[$i]->getCSSProperty(CSS_POSITION);
+ $float = $tree->content[$i]->getCSSProperty(CSS_FLOAT);
if ($position == POSITION_RELATIVE) {
$this->_driver->postpone($tree->content[$i]);
} elseif ($float != FLOAT_NONE) {
$this->_driver->postpone($tree->content[$i]);
- };
+ }
$this->process($tree->content[$i], $data, $pipeline);
- };
- };
+ }
+ }
return true;
}
diff --git a/public_html/filter.pre.fields.class.php b/public_html/filter.pre.fields.class.php
index cdfca82..1ca477a 100644
--- a/public_html/filter.pre.fields.class.php
+++ b/public_html/filter.pre.fields.class.php
@@ -4,7 +4,7 @@ class PreTreeFilterHTML2PSFields extends PreTreeFilter {
var $filesize;
var $_timestamp;
- function PreTreeFilterHTML2PSFields($filename=null, $filesize=null, $timestamp=null) {
+ function __construct($filename=null, $filesize=null, $timestamp=null) {
$this->filename = $filename;
$this->filesize = $filesize;
@@ -12,27 +12,27 @@ function PreTreeFilterHTML2PSFields($filename=null, $filesize=null, $timestamp=n
$this->_timestamp = date("Y-m-d H:s");
} else {
$this->_timestamp = $timestamp;
- };
+ }
}
function process(&$tree, $data, &$pipeline) {
if (is_a($tree, 'TextBox')) {
// Ignore completely empty text boxes
- if (count($tree->words) == 0) { return; };
+ if (count($tree->words) == 0) { return; }
switch ($tree->words[0]) {
case '##PAGE##':
$parent =& $tree->parent;
$field = BoxTextFieldPageNo::from_box($tree);
- $parent->insert_before($field, $tree);
+ $parent->insertBefore($field, $tree);
$parent->remove($tree);
break;
case '##PAGES##':
$parent =& $tree->parent;
$field = BoxTextFieldPages::from_box($tree);
- $parent->insert_before($field, $tree);
+ $parent->insertBefore($field, $tree);
$parent->remove($tree);
break;
case '##FILENAME##':
@@ -40,24 +40,24 @@ function process(&$tree, $data, &$pipeline) {
$tree->words[0] = $data->get_uri();
} else {
$tree->words[0] = $this->filename;
- };
+ }
break;
case '##FILESIZE##':
if (is_null($this->filesize)) {
$tree->words[0] = strlen($data->get_content());
} else {
$tree->words[0] = $this->filesize;
- };
+ }
break;
case '##TIMESTAMP##':
$tree->words[0] = $this->_timestamp;
break;
- };
+ }
} elseif (is_a($tree, 'GenericContainerBox')) {
for ($i=0; $icontent); $i++) {
$this->process($tree->content[$i], $data, $pipeline);
- };
- };
+ }
+ }
}
}
?>
\ No newline at end of file
diff --git a/public_html/filter.pre.footnotes.class.php b/public_html/filter.pre.footnotes.class.php
index ced48a7..d6659f0 100644
--- a/public_html/filter.pre.footnotes.class.php
+++ b/public_html/filter.pre.footnotes.class.php
@@ -12,13 +12,14 @@
class PreTreeFilterFootnotes extends PreTreeFilter {
function process(&$tree, $data, &$pipeline) {
if (is_a($tree, 'GenericContainerBox')) {
- for ($i=0; $icontent); $i++) {
+ $size = is_countable($tree->content) ? count((array) $tree->content) : 0;
+ for ($i=0; $i<$size; $i++) {
/**
* No need to check this conition for text boxes, as they do not correspond to
* HTML elements
*/
- if (!is_a($tree->content[$i], 'TextBox')) {
- if ($tree->content[$i]->get_css_property(CSS_POSITION) == POSITION_FOOTNOTE) {
+ if (!is_a($tree->content[$i], "TextBox")) {
+ if ($tree->content[$i]->getCSSProperty(CSS_POSITION) == POSITION_FOOTNOTE) {
$tree->content[$i]->setCSSProperty(CSS_POSITION, POSITION_STATIC);
$note_call =& BoxNoteCall::create($tree->content[$i], $pipeline);
@@ -27,10 +28,10 @@ function process(&$tree, $data, &$pipeline) {
$pipeline->_addFootnote($note_call);
} else {
$this->process($tree->content[$i], $data, $pipeline);
- };
- };
- };
- };
+ }
+ }
+ }
+ }
return true;
}
diff --git a/public_html/filter.pre.headfoot.class.php b/public_html/filter.pre.headfoot.class.php
index deebcd4..768821e 100644
--- a/public_html/filter.pre.headfoot.class.php
+++ b/public_html/filter.pre.headfoot.class.php
@@ -3,33 +3,31 @@ class PreTreeFilterHeaderFooter extends PreTreeFilter {
var $header_html;
var $footer_html;
- function PreTreeFilterHeaderFooter($header_html, $footer_html) {
+ function __construct($header_html, $footer_html) {
$this->header_html = null;
$this->footer_html = null;
if (trim($header_html) != "") {
$this->header_html = "".trim($header_html)."";
- };
+ }
if (trim($footer_html) != "") {
$this->footer_html = "".trim($footer_html)."";
- };
+ }
}
function process(&$tree, $data, &$pipeline) {
$parser = new ParserXHTML();
- $null = null;
-
if ($this->header_html) {
- $box =& $parser->process($this->header_html, $pipeline, $null);
+ $box =& $parser->process($this->header_html, $pipeline);
$tree->add_child($box);
- };
+ }
if ($this->footer_html) {
- $box =& $parser->process($this->footer_html, $pipeline, $null);
+ $box =& $parser->process($this->footer_html, $pipeline);
$tree->add_child($box);
- };
+ }
}
}
?>
\ No newline at end of file
diff --git a/public_html/filter.pre.height-constraint.class.php b/public_html/filter.pre.height-constraint.class.php
index e739b82..07a1e4f 100644
--- a/public_html/filter.pre.height-constraint.class.php
+++ b/public_html/filter.pre.height-constraint.class.php
@@ -8,7 +8,7 @@ class PreTreeFilterHeightConstraint extends PreTreeFilter {
function process(&$tree, $data, &$pipeline) {
if (!is_a($tree, 'GenericFormattedBox')) {
return;
- };
+ }
/**
* In non-quirks mode, percentage height should be ignored for children of boxes having
@@ -24,9 +24,9 @@ function process(&$tree, $data, &$pipeline) {
$hc->constant[1]) {
$hc->constant = null;
$tree->put_height_constraint($hc);
- };
- };
- };
+ }
+ }
+ }
/**
* Set box height to constrained value
@@ -40,10 +40,11 @@ function process(&$tree, $data, &$pipeline) {
* Proceed to this box children
*/
if (is_a($tree, 'GenericContainerBox')) {
- for ($i=0, $size = count($tree->content); $i<$size; $i++) {
+ $size = is_countable($tree->content) ? count((array) $tree->content) : 0;
+ for ($i=0, $i<$size; $i++;) {
$this->process($tree->content[$i], $data, $pipeline);
- };
- };
+ }
+ }
}
}
?>
\ No newline at end of file
diff --git a/public_html/flow_context.class.inc.php b/public_html/flow_context.class.inc.php
index e7efcaa..7922f8c 100644
--- a/public_html/flow_context.class.inc.php
+++ b/public_html/flow_context.class.inc.php
@@ -37,13 +37,13 @@ function ¤t_floats() {
function float_bottom() {
$floats =& $this->current_floats();
- if (count($floats) == 0) { return null; }
+ if (is_countable($floats) && count($floats) == 0) { return null; }
$bottom = $floats[0]->get_bottom_margin();
- $size = count($floats);
+ $size = count((array) $floats);
for ($i=1; $i<$size; $i++) {
$bottom = min($bottom, $floats[$i]->get_bottom_margin());
- };
+ }
return $bottom;
}
@@ -58,12 +58,12 @@ function float_bottom() {
function float_left_x($x, $y) {
$floats =& $this->current_floats();
- $size = count($floats);
+ $size = count((array) $floats);
for ($i=0; $i<$size; $i++) {
$float =& $floats[$i];
// Process only left-floating boxes
- if ($float->get_css_property(CSS_FLOAT) == FLOAT_LEFT) {
+ if ($float->getCSSProperty(CSS_FLOAT) == FLOAT_LEFT) {
// Check if this float contains given Y-coordinate
//
// Note that top margin coordinate is inclusive but
@@ -78,9 +78,9 @@ function float_left_x($x, $y) {
if ($float->get_top_margin() + EPSILON >= $y &&
$float->get_bottom_margin() < $y) {
$x = max($x, $float->get_right_margin());
- };
- };
- };
+ }
+ }
+ }
return $x;
}
@@ -108,10 +108,10 @@ function float_left_xy(&$parent, $width, &$x, &$y) {
// Prepare information about the float bottom coordinates
$float_bottoms = array();
- $size = count($floats);
+ $size = count((array) $floats);
for ($i=0; $i<$size; $i++) {
$float_bottoms[] = $floats[$i]->get_bottom_margin();
- };
+ }
// Note that the sort function SHOULD NOT maintain key-value assotiations!
rsort($float_bottoms);
@@ -123,7 +123,7 @@ function float_left_xy(&$parent, $width, &$x, &$y) {
// OR if there's no parent boxes with constrained width (it will expanded in this case anyway)
// small value to hide the rounding errors
- $parent_wc = $parent->get_css_property(CSS_WIDTH);
+ $parent_wc = $parent->getCSSProperty(CSS_WIDTH);
if ($parent->get_right() + EPSILON >= $x + $width ||
$parent->mayBeExpanded()) {
@@ -133,9 +133,9 @@ function float_left_xy(&$parent, $width, &$x, &$y) {
$x1 = $this->float_right_x($parent->get_right(), $y);
if ($x1 + EPSILON > $x + $width) {
return;
- };
+ }
return;
- };
+ }
// print("CLEAR) {
+ my @data = split(/ /, $_);
+ print "0x".(substr($data[1],2))." 0x".(substr($data[0],1))."\n";
+};
diff --git a/public_html/fpdf/font/makefont/makefont.orig.php b/public_html/fpdf/font/makefont/makefont.orig.php
new file mode 100644
index 0000000..0d45474
--- /dev/null
+++ b/public_html/fpdf/font/makefont/makefont.orig.php
@@ -0,0 +1,415 @@
+Error: encoding not found: '.$enc);
+ $cc2gn=array();
+ foreach($a as $l)
+ {
+ if($l[0]=='!')
+ {
+ $e=preg_split('/[ \\t]+/',rtrim($l));
+ $cc=hexdec(substr($e[0],1));
+ $gn=$e[2];
+ $cc2gn[$cc]=$gn;
+ }
+ }
+ for($i=0;$i<=255;$i++)
+ {
+ if(!isset($cc2gn[$i]))
+ $cc2gn[$i]='.notdef';
+ }
+ return $cc2gn;
+}
+
+function ReadAFM($file,&$map)
+{
+ //Read a font metric file
+ $a=file($file);
+ if(empty($a))
+ die('File not found');
+ $widths=array();
+ $fm=array();
+ $fix=array('Edot'=>'Edotaccent','edot'=>'edotaccent','Idot'=>'Idotaccent','Zdot'=>'Zdotaccent','zdot'=>'zdotaccent',
+ 'Odblacute'=>'Ohungarumlaut','odblacute'=>'ohungarumlaut','Udblacute'=>'Uhungarumlaut','udblacute'=>'uhungarumlaut',
+ 'Gcedilla'=>'Gcommaaccent','gcedilla'=>'gcommaaccent','Kcedilla'=>'Kcommaaccent','kcedilla'=>'kcommaaccent',
+ 'Lcedilla'=>'Lcommaaccent','lcedilla'=>'lcommaaccent','Ncedilla'=>'Ncommaaccent','ncedilla'=>'ncommaaccent',
+ 'Rcedilla'=>'Rcommaaccent','rcedilla'=>'rcommaaccent','Scedilla'=>'Scommaaccent','scedilla'=>'scommaaccent',
+ 'Tcedilla'=>'Tcommaaccent','tcedilla'=>'tcommaaccent','Dslash'=>'Dcroat','dslash'=>'dcroat','Dmacron'=>'Dcroat','dmacron'=>'dcroat',
+ 'combininggraveaccent'=>'gravecomb','combininghookabove'=>'hookabovecomb','combiningtildeaccent'=>'tildecomb',
+ 'combiningacuteaccent'=>'acutecomb','combiningdotbelow'=>'dotbelowcomb','dongsign'=>'dong');
+ foreach($a as $l)
+ {
+ $e=explode(' ',rtrim($l));
+ if (is_countable($e) && count($e)<2)
+ continue;
+ $code=$e[0];
+ $param=$e[1];
+ if($code=='C')
+ {
+ //Character metrics
+ $cc=(int)$e[1];
+ $w=$e[4];
+ $gn=$e[7];
+ if(substr($gn,-4)=='20AC')
+ $gn='Euro';
+ if(isset($fix[$gn]))
+ {
+ //Fix incorrect glyph name
+ foreach($map as $c=>$n)
+ {
+ if($n==$fix[$gn])
+ $map[$c]=$gn;
+ }
+ }
+ if(empty($map))
+ {
+ //Symbolic font: use built-in encoding
+ $widths[$cc]=$w;
+ }
+ else
+ {
+ $widths[$gn]=$w;
+ if($gn=='X')
+ $fm['CapXHeight']=$e[13];
+ }
+ if($gn=='.notdef')
+ $fm['MissingWidth']=$w;
+ }
+ elseif($code=='FontName')
+ $fm['FontName']=$param;
+ elseif($code=='Weight')
+ $fm['Weight']=$param;
+ elseif($code=='ItalicAngle')
+ $fm['ItalicAngle']=(double)$param;
+ elseif($code=='Ascender')
+ $fm['Ascender']=(int)$param;
+ elseif($code=='Descender')
+ $fm['Descender']=(int)$param;
+ elseif($code=='UnderlineThickness')
+ $fm['UnderlineThickness']=(int)$param;
+ elseif($code=='UnderlinePosition')
+ $fm['UnderlinePosition']=(int)$param;
+ elseif($code=='IsFixedPitch')
+ $fm['IsFixedPitch']=($param=='true');
+ elseif($code=='FontBBox')
+ $fm['FontBBox']=array($e[1],$e[2],$e[3],$e[4]);
+ elseif($code=='CapHeight')
+ $fm['CapHeight']=(int)$param;
+ elseif($code=='StdVW')
+ $fm['StdVW']=(int)$param;
+ }
+ if(!isset($fm['FontName']))
+ die('FontName not found');
+ if(!empty($map))
+ {
+ if(!isset($widths['.notdef']))
+ $widths['.notdef']=600;
+ if(!isset($widths['Delta']) and isset($widths['increment']))
+ $widths['Delta']=$widths['increment'];
+ //Order widths according to map
+ for($i=0;$i<=255;$i++)
+ {
+ if(!isset($widths[$map[$i]]))
+ {
+ echo 'Warning: character '.$map[$i].' is missingError: Can\'t open '.$file);
+ //Extract number of tables
+ fseek($f,4,SEEK_CUR);
+ $nb=ReadShort($f);
+ fseek($f,6,SEEK_CUR);
+ //Seek OS/2 table
+ $found=false;
+ for($i=0;$i<$nb;$i++)
+ {
+ if(fread($f,4)=='OS/2')
+ {
+ $found=true;
+ break;
+ }
+ fseek($f,12,SEEK_CUR);
+ }
+ if(!$found)
+ {
+ fclose($f);
+ return;
+ }
+ fseek($f,4,SEEK_CUR);
+ $offset=ReadLong($f);
+ fseek($f,$offset,SEEK_SET);
+ //Extract fsType flags
+ fseek($f,8,SEEK_CUR);
+ $fsType=ReadShort($f);
+ $rl=($fsType & 0x02)!=0;
+ $pp=($fsType & 0x04)!=0;
+ $e=($fsType & 0x08)!=0;
+ fclose($f);
+ if($rl and !$pp and !$e)
+ echo 'Warning: font license does not allow embedding';
+}
+
+/*******************************************************************************
+* $fontfile : chemin du fichier TTF (ou cha�ne vide si pas d'incorporation) *
+* $afmfile : chemin du fichier AFM *
+* $enc : encodage (ou cha�ne vide si la police est symbolique) *
+* $patch : patch optionnel pour l'encodage *
+* $type : type de la police si $fontfile est vide *
+*******************************************************************************/
+function MakeFont($fontfile,$afmfile,$enc='cp1252',$patch=array(),$type='TrueType')
+{
+ //Generate a font definition file
+ ini_set('auto_detect_line_endings','1');
+ if($enc)
+ {
+ $map=ReadMap($enc);
+ foreach($patch as $cc=>$gn)
+ $map[$cc]=$gn;
+ }
+ else
+ $map=array();
+ if(!file_exists($afmfile))
+ die('Error: AFM file not found: '.$afmfile);
+ $fm=ReadAFM($afmfile,$map);
+ if($enc)
+ $diff=MakeFontEncoding($map);
+ else
+ $diff='';
+ $fd=MakeFontDescriptor($fm,empty($map));
+ //Find font type
+ if($fontfile)
+ {
+ $ext=strtolower(substr($fontfile,-3));
+ if($ext=='ttf')
+ $type='TrueType';
+ elseif($ext=='pfb')
+ $type='Type1';
+ else
+ die('Error: unrecognized font file extension: '.$ext);
+ }
+ else
+ {
+ if($type!='TrueType' and $type!='Type1')
+ die('Error: incorrect font type: '.$type);
+ }
+ //Start generation
+ $s='Error: font file not found: '.$fontfile);
+ if($type=='TrueType')
+ CheckTTF($fontfile);
+ $f=fopen($fontfile,'rb');
+ if(!$f)
+ die('Error: Can\'t open '.$fontfile);
+ $file=fread($f,filesize($fontfile));
+ fclose($f);
+ if($type=='Type1')
+ {
+ //Find first two sections and discard third one
+ $header=(ord($file[0])==128);
+ if($header)
+ {
+ //Strip first binary header
+ $file=substr($file,6);
+ }
+ $pos=strpos($file,'eexec');
+ if(!$pos)
+ die('Error: font file does not seem to be valid Type1');
+ $size1=$pos+6;
+ if($header and ord($file[$size1])==128)
+ {
+ //Strip second binary header
+ $file=substr($file,0,$size1).substr($file,$size1+6);
+ }
+ $pos=strpos($file,'00000000');
+ if(!$pos)
+ die('Error: font file does not seem to be valid Type1');
+ $size2=$pos-$size1;
+ $file=substr($file,0,$size1+$size2);
+ }
+ if(function_exists('gzcompress'))
+ {
+ $cmp=$basename.'.z';
+ SaveToFile($cmp,gzcompress($file),'b');
+ $s.='$file=\''.$cmp."';\n";
+ echo 'Font file compressed ('.$cmp.')Notice: font file could not be compressed (zlib extension not available)Error: font file does not seem to be valid Type1');
$size1=$pos+6;
- if($header and ord($file{$size1})==128)
+ if($header and ord($file[$size1])==128)
{
//Strip second binary header
$file=substr($file,0,$size1).substr($file,$size1+6);
diff --git a/public_html/fpdf/font/makefont/symbol.map b/public_html/fpdf/font/makefont/symbol.map
index 76fc154..d4b2750 100644
--- a/public_html/fpdf/font/makefont/symbol.map
+++ b/public_html/fpdf/font/makefont/symbol.map
@@ -1,189 +1,189 @@
-!20 U+00A0 space
-!21 U+0021 exclam
-!22 U+2200 universal
-!23 U+0023 numbersign
-!24 U+2203 existential
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+220B suchthat
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+2217 asteriskmath
-!2B U+002B plus
-!2C U+002C comma
-!2D U+2212 minus
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+2245 congruent
-!41 U+0391 Alpha
-!42 U+0392 Beta
-!43 U+03A7 Chi
-!44 U+2206 Delta
-!45 U+0395 Epsilon
-!46 U+03A6 Phi
-!47 U+0393 Gamma
-!48 U+0397 Eta
-!49 U+0399 Iota
-!4A U+03D1 theta1
-!4B U+039A Kappa
-!4C U+039B Lambda
-!4D U+039C Mu
-!4E U+039D Nu
-!4F U+039F Omicron
-!50 U+03A0 Pi
-!51 U+0398 Theta
-!52 U+03A1 Rho
-!53 U+03A3 Sigma
-!54 U+03A4 Tau
-!55 U+03A5 Upsilon
-!56 U+03C2 sigma1
-!57 U+2126 Omega
-!58 U+039E Xi
-!59 U+03A8 Psi
-!5A U+0396 Zeta
-!5B U+005B bracketleft
-!5C U+2234 therefore
-!5D U+005D bracketright
-!5E U+22A5 perpendicular
-!5F U+005F underscore
-!60 U+F8E5 radicalex
-!61 U+03B1 alpha
-!62 U+03B2 beta
-!63 U+03C7 chi
-!64 U+03B4 delta
-!65 U+03B5 epsilon
-!66 U+03C6 phi
-!67 U+03B3 gamma
-!68 U+03B7 eta
-!69 U+03B9 iota
-!6A U+03D5 phi1
-!6B U+03BA kappa
-!6C U+03BB lambda
-!6D U+03BC mu
-!6E U+03BD nu
-!6F U+03BF omicron
-!70 U+03C0 pi
-!71 U+03B8 theta
-!72 U+03C1 rho
-!73 U+03C3 sigma
-!74 U+03C4 tau
-!75 U+03C5 upsilon
-!76 U+03D6 omega1
-!77 U+03C9 omega
-!78 U+03BE xi
-!79 U+03C8 psi
-!7A U+03B6 zeta
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+223C similar
-!A0 U+20AC Euro
-!A1 U+03D2 Upsilon1
-!A2 U+2032 minute
-!A3 U+2264 lessequal
-!A4 U+2215 fraction
-!A5 U+221E infinity
-!A6 U+0192 florin
-!A7 U+2663 club
-!A8 U+2666 diamond
-!A9 U+2665 heart
-!AA U+2660 spade
-!AB U+2194 arrowboth
-!AC U+2190 arrowleft
-!AD U+2191 arrowup
-!AE U+2192 arrowright
-!AF U+2193 arrowdown
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+2033 second
-!B3 U+2265 greaterequal
-!B4 U+00D7 multiply
-!B5 U+221D proportional
-!B6 U+2202 partialdiff
-!B7 U+2022 bullet
-!B8 U+00F7 divide
-!B9 U+2260 notequal
-!BA U+2261 equivalence
-!BB U+2248 approxequal
-!BC U+2026 ellipsis
-!BD U+F8E6 arrowvertex
-!BE U+F8E7 arrowhorizex
-!BF U+21B5 carriagereturn
-!C0 U+2135 aleph
-!C1 U+2111 Ifraktur
-!C2 U+211C Rfraktur
-!C3 U+2118 weierstrass
-!C4 U+2297 circlemultiply
-!C5 U+2295 circleplus
-!C6 U+2205 emptyset
-!C7 U+2229 intersection
-!C8 U+222A union
-!C9 U+2283 propersuperset
-!CA U+2287 reflexsuperset
-!CB U+2284 notsubset
-!CC U+2282 propersubset
-!CD U+2286 reflexsubset
-!CE U+2208 element
-!CF U+2209 notelement
-!D0 U+2220 angle
-!D1 U+2207 gradient
-!D2 U+F6DA registerserif
-!D3 U+F6D9 copyrightserif
-!D4 U+F6DB trademarkserif
-!D5 U+220F product
-!D6 U+221A radical
-!D7 U+22C5 dotmath
-!D8 U+00AC logicalnot
-!D9 U+2227 logicaland
-!DA U+2228 logicalor
-!DB U+21D4 arrowdblboth
-!DC U+21D0 arrowdblleft
-!DD U+21D1 arrowdblup
-!DE U+21D2 arrowdblright
-!DF U+21D3 arrowdbldown
-!E0 U+25CA lozenge
-!E1 U+2329 angleleft
-!E2 U+F8E8 registersans
-!E3 U+F8E9 copyrightsans
-!E4 U+F8EA trademarksans
-!E5 U+2211 summation
-!E6 U+F8EB parenlefttp
-!E7 U+F8EC parenleftex
-!E8 U+F8ED parenleftbt
-!E9 U+F8EE bracketlefttp
-!EA U+F8EF bracketleftex
-!EB U+F8F0 bracketleftbt
-!EC U+F8F1 bracelefttp
-!ED U+F8F2 braceleftmid
-!EE U+F8F3 braceleftbt
-!EF U+F8F4 braceex
-!F1 U+232A angleright
-!F2 U+222B integral
-!F3 U+2320 integraltp
-!F4 U+F8F5 integralex
-!F5 U+2321 integralbt
-!F6 U+F8F6 parenrighttp
-!F7 U+F8F7 parenrightex
-!F8 U+F8F8 parenrightbt
-!F9 U+F8F9 bracketrighttp
-!FA U+F8FA bracketrightex
-!FB U+F8FB bracketrightbt
-!FC U+F8FC bracerighttp
-!FD U+F8FD bracerightmid
+!20 U+00A0 space
+!21 U+0021 exclam
+!22 U+2200 universal
+!23 U+0023 numbersign
+!24 U+2203 existential
+!25 U+0025 percent
+!26 U+0026 ampersand
+!27 U+220B suchthat
+!28 U+0028 parenleft
+!29 U+0029 parenright
+!2A U+2217 asteriskmath
+!2B U+002B plus
+!2C U+002C comma
+!2D U+2212 minus
+!2E U+002E period
+!2F U+002F slash
+!30 U+0030 zero
+!31 U+0031 one
+!32 U+0032 two
+!33 U+0033 three
+!34 U+0034 four
+!35 U+0035 five
+!36 U+0036 six
+!37 U+0037 seven
+!38 U+0038 eight
+!39 U+0039 nine
+!3A U+003A colon
+!3B U+003B semicolon
+!3C U+003C less
+!3D U+003D equal
+!3E U+003E greater
+!3F U+003F question
+!40 U+2245 congruent
+!41 U+0391 Alpha
+!42 U+0392 Beta
+!43 U+03A7 Chi
+!44 U+2206 Delta
+!45 U+0395 Epsilon
+!46 U+03A6 Phi
+!47 U+0393 Gamma
+!48 U+0397 Eta
+!49 U+0399 Iota
+!4A U+03D1 theta1
+!4B U+039A Kappa
+!4C U+039B Lambda
+!4D U+039C Mu
+!4E U+039D Nu
+!4F U+039F Omicron
+!50 U+03A0 Pi
+!51 U+0398 Theta
+!52 U+03A1 Rho
+!53 U+03A3 Sigma
+!54 U+03A4 Tau
+!55 U+03A5 Upsilon
+!56 U+03C2 sigma1
+!57 U+2126 Omega
+!58 U+039E Xi
+!59 U+03A8 Psi
+!5A U+0396 Zeta
+!5B U+005B bracketleft
+!5C U+2234 therefore
+!5D U+005D bracketright
+!5E U+22A5 perpendicular
+!5F U+005F underscore
+!60 U+F8E5 radicalex
+!61 U+03B1 alpha
+!62 U+03B2 beta
+!63 U+03C7 chi
+!64 U+03B4 delta
+!65 U+03B5 epsilon
+!66 U+03C6 phi
+!67 U+03B3 gamma
+!68 U+03B7 eta
+!69 U+03B9 iota
+!6A U+03D5 phi1
+!6B U+03BA kappa
+!6C U+03BB lambda
+!6D U+03BC mu
+!6E U+03BD nu
+!6F U+03BF omicron
+!70 U+03C0 pi
+!71 U+03B8 theta
+!72 U+03C1 rho
+!73 U+03C3 sigma
+!74 U+03C4 tau
+!75 U+03C5 upsilon
+!76 U+03D6 omega1
+!77 U+03C9 omega
+!78 U+03BE xi
+!79 U+03C8 psi
+!7A U+03B6 zeta
+!7B U+007B braceleft
+!7C U+007C bar
+!7D U+007D braceright
+!7E U+223C similar
+!A0 U+20AC Euro
+!A1 U+03D2 Upsilon1
+!A2 U+2032 minute
+!A3 U+2264 lessequal
+!A4 U+2215 fraction
+!A5 U+221E infinity
+!A6 U+0192 florin
+!A7 U+2663 club
+!A8 U+2666 diamond
+!A9 U+2665 heart
+!AA U+2660 spade
+!AB U+2194 arrowboth
+!AC U+2190 arrowleft
+!AD U+2191 arrowup
+!AE U+2192 arrowright
+!AF U+2193 arrowdown
+!B0 U+00B0 degree
+!B1 U+00B1 plusminus
+!B2 U+2033 second
+!B3 U+2265 greaterequal
+!B4 U+00D7 multiply
+!B5 U+221D proportional
+!B6 U+2202 partialdiff
+!B7 U+2022 bullet
+!B8 U+00F7 divide
+!B9 U+2260 notequal
+!BA U+2261 equivalence
+!BB U+2248 approxequal
+!BC U+2026 ellipsis
+!BD U+F8E6 arrowvertex
+!BE U+F8E7 arrowhorizex
+!BF U+21B5 carriagereturn
+!C0 U+2135 aleph
+!C1 U+2111 Ifraktur
+!C2 U+211C Rfraktur
+!C3 U+2118 weierstrass
+!C4 U+2297 circlemultiply
+!C5 U+2295 circleplus
+!C6 U+2205 emptyset
+!C7 U+2229 intersection
+!C8 U+222A union
+!C9 U+2283 propersuperset
+!CA U+2287 reflexsuperset
+!CB U+2284 notsubset
+!CC U+2282 propersubset
+!CD U+2286 reflexsubset
+!CE U+2208 element
+!CF U+2209 notelement
+!D0 U+2220 angle
+!D1 U+2207 gradient
+!D2 U+F6DA registerserif
+!D3 U+F6D9 copyrightserif
+!D4 U+F6DB trademarkserif
+!D5 U+220F product
+!D6 U+221A radical
+!D7 U+22C5 dotmath
+!D8 U+00AC logicalnot
+!D9 U+2227 logicaland
+!DA U+2228 logicalor
+!DB U+21D4 arrowdblboth
+!DC U+21D0 arrowdblleft
+!DD U+21D1 arrowdblup
+!DE U+21D2 arrowdblright
+!DF U+21D3 arrowdbldown
+!E0 U+25CA lozenge
+!E1 U+2329 angleleft
+!E2 U+F8E8 registersans
+!E3 U+F8E9 copyrightsans
+!E4 U+F8EA trademarksans
+!E5 U+2211 summation
+!E6 U+F8EB parenlefttp
+!E7 U+F8EC parenleftex
+!E8 U+F8ED parenleftbt
+!E9 U+F8EE bracketlefttp
+!EA U+F8EF bracketleftex
+!EB U+F8F0 bracketleftbt
+!EC U+F8F1 bracelefttp
+!ED U+F8F2 braceleftmid
+!EE U+F8F3 braceleftbt
+!EF U+F8F4 braceex
+!F1 U+232A angleright
+!F2 U+222B integral
+!F3 U+2320 integraltp
+!F4 U+F8F5 integralex
+!F5 U+2321 integralbt
+!F6 U+F8F6 parenrighttp
+!F7 U+F8F7 parenrightex
+!F8 U+F8F8 parenrightbt
+!F9 U+F8F9 bracketrighttp
+!FA U+F8FA bracketrightex
+!FB U+F8FB bracketrightbt
+!FC U+F8FC bracerighttp
+!FD U+F8FD bracerightmid
!FE U+F8FE bracerightbt
\ No newline at end of file
diff --git a/public_html/fpdf/font/symbol.php b/public_html/fpdf/font/symbol.php
new file mode 100644
index 0000000..5546533
--- /dev/null
+++ b/public_html/fpdf/font/symbol.php
@@ -0,0 +1,24 @@
+1005,'Descent'=>-220,'CapHeight'=>1005,'Flags'=>32,'FontBBox'=>'[0 -220 1113 1005]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
+$up=-109;
+$ut=49;
+$cw=array(
+ chr(0)=>600,chr(1)=>600,chr(2)=>600,chr(3)=>600,chr(4)=>600,chr(5)=>600,chr(6)=>600,chr(7)=>600,chr(8)=>600,chr(9)=>600,chr(10)=>600,chr(11)=>600,chr(12)=>600,chr(13)=>600,chr(14)=>600,chr(15)=>600,chr(16)=>600,chr(17)=>600,chr(18)=>600,chr(19)=>600,chr(20)=>600,chr(21)=>600,
+ chr(22)=>600,chr(23)=>600,chr(24)=>600,chr(25)=>600,chr(26)=>600,chr(27)=>600,chr(28)=>600,chr(29)=>600,chr(30)=>600,chr(31)=>600,' '=>250,'!'=>333,'"'=>600,'#'=>500,'$'=>600,'%'=>833,'&'=>778,'\''=>600,'('=>333,')'=>333,'*'=>600,'+'=>549,
+ ','=>250,'-'=>600,'.'=>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,'@'=>600,'A'=>600,
+ 'B'=>600,'C'=>600,'D'=>600,'E'=>600,'F'=>600,'G'=>600,'H'=>600,'I'=>600,'J'=>600,'K'=>600,'L'=>600,'M'=>600,'N'=>600,'O'=>600,'P'=>600,'Q'=>600,'R'=>600,'S'=>600,'T'=>600,'U'=>600,'V'=>600,'W'=>600,
+ 'X'=>600,'Y'=>600,'Z'=>600,'['=>333,'\\'=>600,']'=>333,'^'=>600,'_'=>500,'`'=>600,'a'=>600,'b'=>600,'c'=>600,'d'=>600,'e'=>600,'f'=>600,'g'=>600,'h'=>600,'i'=>600,'j'=>600,'k'=>600,'l'=>600,'m'=>600,
+ 'n'=>600,'o'=>600,'p'=>600,'q'=>600,'r'=>600,'s'=>600,'t'=>600,'u'=>600,'v'=>600,'w'=>600,'x'=>600,'y'=>600,'z'=>600,'{'=>480,'|'=>200,'}'=>480,'~'=>600,chr(127)=>600,chr(128)=>600,chr(129)=>600,chr(130)=>600,chr(131)=>500,
+ chr(132)=>600,chr(133)=>1000,chr(134)=>600,chr(135)=>600,chr(136)=>600,chr(137)=>600,chr(138)=>600,chr(139)=>600,chr(140)=>600,chr(141)=>600,chr(142)=>600,chr(143)=>600,chr(144)=>600,chr(145)=>600,chr(146)=>600,chr(147)=>600,chr(148)=>600,chr(149)=>460,chr(150)=>600,chr(151)=>600,chr(152)=>600,chr(153)=>600,
+ chr(154)=>600,chr(155)=>600,chr(156)=>600,chr(157)=>600,chr(158)=>600,chr(159)=>600,chr(160)=>250,chr(161)=>600,chr(162)=>600,chr(163)=>600,chr(164)=>600,chr(165)=>600,chr(166)=>600,chr(167)=>600,chr(168)=>600,chr(169)=>600,chr(170)=>600,chr(171)=>600,chr(172)=>713,chr(173)=>600,chr(174)=>600,chr(175)=>600,
+ chr(176)=>400,chr(177)=>549,chr(178)=>600,chr(179)=>600,chr(180)=>600,chr(181)=>576,chr(182)=>600,chr(183)=>600,chr(184)=>600,chr(185)=>600,chr(186)=>600,chr(187)=>600,chr(188)=>600,chr(189)=>600,chr(190)=>600,chr(191)=>600,chr(192)=>600,chr(193)=>600,chr(194)=>600,chr(195)=>600,chr(196)=>600,chr(197)=>600,
+ chr(198)=>600,chr(199)=>600,chr(200)=>600,chr(201)=>600,chr(202)=>600,chr(203)=>600,chr(204)=>600,chr(205)=>600,chr(206)=>600,chr(207)=>600,chr(208)=>600,chr(209)=>600,chr(210)=>600,chr(211)=>600,chr(212)=>600,chr(213)=>600,chr(214)=>600,chr(215)=>549,chr(216)=>600,chr(217)=>600,chr(218)=>600,chr(219)=>600,
+ chr(220)=>600,chr(221)=>600,chr(222)=>600,chr(223)=>600,chr(224)=>600,chr(225)=>600,chr(226)=>600,chr(227)=>600,chr(228)=>600,chr(229)=>600,chr(230)=>600,chr(231)=>600,chr(232)=>600,chr(233)=>600,chr(234)=>600,chr(235)=>600,chr(236)=>600,chr(237)=>600,chr(238)=>600,chr(239)=>600,chr(240)=>600,chr(241)=>600,
+ chr(242)=>600,chr(243)=>600,chr(244)=>600,chr(245)=>600,chr(246)=>600,chr(247)=>549,chr(248)=>600,chr(249)=>600,chr(250)=>600,chr(251)=>600,chr(252)=>600,chr(253)=>600,chr(254)=>600,chr(255)=>600);
+$enc='cp1252';
+$diff='';
+$file='symbol.z';
+$originalsize=69464;
+?>
diff --git a/public_html/fpdf/font/symbol.z b/public_html/fpdf/font/symbol.z
new file mode 100644
index 0000000..7d2d90c
Binary files /dev/null and b/public_html/fpdf/font/symbol.z differ
diff --git a/public_html/fpdf/font/times.php b/public_html/fpdf/font/times.php
new file mode 100644
index 0000000..34a2b3c
--- /dev/null
+++ b/public_html/fpdf/font/times.php
@@ -0,0 +1,24 @@
+891,'Descent'=>-216,'CapHeight'=>662,'Flags'=>32,'FontBBox'=>'[-77 -216 1009 896]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>778);
+$up=-109;
+$ut=49;
+$cw=array(
+ chr(0)=>778,chr(1)=>778,chr(2)=>778,chr(3)=>778,chr(4)=>778,chr(5)=>778,chr(6)=>778,chr(7)=>778,chr(8)=>778,chr(9)=>778,chr(10)=>778,chr(11)=>778,chr(12)=>778,chr(13)=>778,chr(14)=>778,chr(15)=>778,chr(16)=>778,chr(17)=>778,chr(18)=>778,chr(19)=>778,chr(20)=>778,chr(21)=>778,
+ chr(22)=>778,chr(23)=>778,chr(24)=>778,chr(25)=>778,chr(26)=>778,chr(27)=>778,chr(28)=>778,chr(29)=>778,chr(30)=>778,chr(31)=>778,' '=>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)=>778,chr(128)=>500,chr(129)=>778,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)=>778,chr(142)=>611,chr(143)=>778,chr(144)=>778,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)=>778,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)=>778,
+ chr(176)=>400,chr(177)=>549,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>778,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+ chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>549,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
+$enc='cp1252';
+$diff='';
+$file='times.z';
+$originalsize=409280;
+?>
diff --git a/public_html/fpdf/font/times.z b/public_html/fpdf/font/times.z
new file mode 100644
index 0000000..d24c8f9
Binary files /dev/null and b/public_html/fpdf/font/times.z differ
diff --git a/public_html/fpdf/font/timesb.php b/public_html/fpdf/font/timesb.php
new file mode 100644
index 0000000..09cff86
--- /dev/null
+++ b/public_html/fpdf/font/timesb.php
@@ -0,0 +1,15 @@
+250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+ chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+ ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
+ 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
+ 'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
+ 'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ 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)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+ chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+ chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>
diff --git a/public_html/fpdf/font/timesbd.php b/public_html/fpdf/font/timesbd.php
new file mode 100644
index 0000000..86ce9b5
--- /dev/null
+++ b/public_html/fpdf/font/timesbd.php
@@ -0,0 +1,24 @@
+891,'Descent'=>-216,'CapHeight'=>662,'Flags'=>32,'FontBBox'=>'[-28 -216 1009 891]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>778);
+$up=-109;
+$ut=95;
+$cw=array(
+ chr(0)=>778,chr(1)=>778,chr(2)=>778,chr(3)=>778,chr(4)=>778,chr(5)=>778,chr(6)=>778,chr(7)=>778,chr(8)=>778,chr(9)=>778,chr(10)=>778,chr(11)=>778,chr(12)=>778,chr(13)=>778,chr(14)=>778,chr(15)=>778,chr(16)=>778,chr(17)=>778,chr(18)=>778,chr(19)=>778,chr(20)=>778,chr(21)=>778,
+ chr(22)=>778,chr(23)=>778,chr(24)=>778,chr(25)=>778,chr(26)=>778,chr(27)=>778,chr(28)=>778,chr(29)=>778,chr(30)=>778,chr(31)=>778,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+ ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
+ 'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
+ 'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
+ 'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>778,chr(128)=>500,chr(129)=>778,chr(130)=>333,chr(131)=>500,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>778,chr(142)=>667,chr(143)=>778,chr(144)=>778,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>778,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)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>778,
+ chr(176)=>400,chr(177)=>549,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>778,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+ chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>549,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+$enc='cp1252';
+$diff='';
+$file='timesbd.z';
+$originalsize=398372;
+?>
diff --git a/public_html/fpdf/font/timesbd.z b/public_html/fpdf/font/timesbd.z
new file mode 100644
index 0000000..faf4996
Binary files /dev/null and b/public_html/fpdf/font/timesbd.z differ
diff --git a/public_html/fpdf/font/timesbi.php b/public_html/fpdf/font/timesbi.php
new file mode 100644
index 0000000..779db93
--- /dev/null
+++ b/public_html/fpdf/font/timesbi.php
@@ -0,0 +1,24 @@
+891,'Descent'=>-216,'CapHeight'=>662,'Flags'=>96,'FontBBox'=>'[-170 -216 1009 887]','ItalicAngle'=>-17.3,'StemV'=>120,'MissingWidth'=>778);
+$up=-109;
+$ut=95;
+$cw=array(
+ chr(0)=>778,chr(1)=>778,chr(2)=>778,chr(3)=>778,chr(4)=>778,chr(5)=>778,chr(6)=>778,chr(7)=>778,chr(8)=>778,chr(9)=>778,chr(10)=>778,chr(11)=>778,chr(12)=>778,chr(13)=>778,chr(14)=>778,chr(15)=>778,chr(16)=>778,chr(17)=>778,chr(18)=>778,chr(19)=>778,chr(20)=>778,chr(21)=>778,
+ chr(22)=>778,chr(23)=>778,chr(24)=>778,chr(25)=>778,chr(26)=>778,chr(27)=>778,chr(28)=>778,chr(29)=>778,chr(30)=>778,chr(31)=>778,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+ ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
+ 'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
+ 'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+ 'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>778,chr(128)=>500,chr(129)=>778,chr(130)=>333,chr(131)=>500,
+ chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>778,chr(142)=>611,chr(143)=>778,chr(144)=>778,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+ chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>778,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>778,
+ chr(176)=>400,chr(177)=>549,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>778,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+ chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>549,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+$enc='cp1252';
+$diff='';
+$file='timesbi.z';
+$originalsize=239692;
+?>
diff --git a/public_html/fpdf/font/timesbi.z b/public_html/fpdf/font/timesbi.z
new file mode 100644
index 0000000..4e2c249
Binary files /dev/null and b/public_html/fpdf/font/timesbi.z differ
diff --git a/public_html/fpdf/font/timesi.php b/public_html/fpdf/font/timesi.php
new file mode 100644
index 0000000..52be331
--- /dev/null
+++ b/public_html/fpdf/font/timesi.php
@@ -0,0 +1,24 @@
+891,'Descent'=>-216,'CapHeight'=>662,'Flags'=>96,'FontBBox'=>'[-172 -216 986 880]','ItalicAngle'=>-17.3,'StemV'=>70,'MissingWidth'=>778);
+$up=-109;
+$ut=49;
+$cw=array(
+ chr(0)=>778,chr(1)=>778,chr(2)=>778,chr(3)=>778,chr(4)=>778,chr(5)=>778,chr(6)=>778,chr(7)=>778,chr(8)=>778,chr(9)=>778,chr(10)=>778,chr(11)=>778,chr(12)=>778,chr(13)=>778,chr(14)=>778,chr(15)=>778,chr(16)=>778,chr(17)=>778,chr(18)=>778,chr(19)=>778,chr(20)=>778,chr(21)=>778,
+ chr(22)=>778,chr(23)=>778,chr(24)=>778,chr(25)=>778,chr(26)=>778,chr(27)=>778,chr(28)=>778,chr(29)=>778,chr(30)=>778,chr(31)=>778,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
+ ','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
+ 'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
+ 'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
+ 'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>778,chr(128)=>500,chr(129)=>778,chr(130)=>333,chr(131)=>500,
+ chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>778,chr(142)=>556,chr(143)=>778,chr(144)=>778,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
+ chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>778,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>778,
+ chr(176)=>400,chr(177)=>549,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>778,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
+ chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+ chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+ chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>549,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+$enc='cp1252';
+$diff='';
+$file='timesi.z';
+$originalsize=248368;
+?>
diff --git a/public_html/fpdf/font/timesi.z b/public_html/fpdf/font/timesi.z
new file mode 100644
index 0000000..948ccd9
Binary files /dev/null and b/public_html/fpdf/font/timesi.z differ
diff --git a/public_html/fpdf/font/zapfdingbats.php b/public_html/fpdf/font/zapfdingbats.php
new file mode 100644
index 0000000..1f926a8
--- /dev/null
+++ b/public_html/fpdf/font/zapfdingbats.php
@@ -0,0 +1,15 @@
+0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
+ chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
+ ','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
+ 'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
+ 'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
+ 'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
+ chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,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)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
+ chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
+ chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
+ chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
+ chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
+?>
diff --git a/public_html/fpdf/fpdf.orig.php b/public_html/fpdf/fpdf.orig.php
new file mode 100644
index 0000000..6303523
--- /dev/null
+++ b/public_html/fpdf/fpdf.orig.php
@@ -0,0 +1,1641 @@
+_dochecks();
+ //Initialization of properties
+ $this->page=0;
+ $this->n=2;
+ $this->buffer='';
+ $this->pages=array();
+ $this->OrientationChanges=array();
+ $this->state=0;
+ $this->fonts=array();
+ $this->FontFiles=array();
+ $this->diffs=array();
+ $this->images=array();
+ $this->links=array();
+ $this->InFooter=false;
+ $this->lasth=0;
+ $this->FontFamily='';
+ $this->FontStyle='';
+ $this->FontSizePt=12;
+ $this->underline=false;
+ $this->DrawColor='0 G';
+ $this->FillColor='0 g';
+ $this->TextColor='0 g';
+ $this->ColorFlag=false;
+ $this->ws=0;
+ //Standard fonts
+ $this->CoreFonts=array('courier'=>'Courier','courierB'=>'Courier-Bold','courierI'=>'Courier-Oblique','courierBI'=>'Courier-BoldOblique',
+ 'helvetica'=>'Helvetica','helveticaB'=>'Helvetica-Bold','helveticaI'=>'Helvetica-Oblique','helveticaBI'=>'Helvetica-BoldOblique',
+ 'times'=>'Times-Roman','timesB'=>'Times-Bold','timesI'=>'Times-Italic','timesBI'=>'Times-BoldItalic',
+ 'symbol'=>'Symbol','zapfdingbats'=>'ZapfDingbats');
+ //Scale factor
+ if($unit=='pt')
+ $this->k=1;
+ elseif($unit=='mm')
+ $this->k=72/25.4;
+ elseif($unit=='cm')
+ $this->k=72/2.54;
+ elseif($unit=='in')
+ $this->k=72;
+ else
+ $this->Error('Incorrect unit: '.$unit);
+ //Page format
+ if(is_string($format))
+ {
+ $format=strtolower($format);
+ if($format=='a3')
+ $format=array(841.89,1190.55);
+ elseif($format=='a4')
+ $format=array(595.28,841.89);
+ elseif($format=='a5')
+ $format=array(420.94,595.28);
+ elseif($format=='letter')
+ $format=array(612,792);
+ elseif($format=='legal')
+ $format=array(612,1008);
+ else
+ $this->Error('Unknown page format: '.$format);
+ $this->fwPt=$format[0];
+ $this->fhPt=$format[1];
+ }
+ else
+ {
+ $this->fwPt=$format[0]*$this->k;
+ $this->fhPt=$format[1]*$this->k;
+ }
+ $this->fw=$this->fwPt/$this->k;
+ $this->fh=$this->fhPt/$this->k;
+ //Page orientation
+ $orientation=strtolower($orientation);
+ if($orientation=='p' || $orientation=='portrait')
+ {
+ $this->DefOrientation='P';
+ $this->wPt=$this->fwPt;
+ $this->hPt=$this->fhPt;
+ }
+ elseif($orientation=='l' || $orientation=='landscape')
+ {
+ $this->DefOrientation='L';
+ $this->wPt=$this->fhPt;
+ $this->hPt=$this->fwPt;
+ }
+ else
+ $this->Error('Incorrect orientation: '.$orientation);
+ $this->CurOrientation=$this->DefOrientation;
+ $this->w=$this->wPt/$this->k;
+ $this->h=$this->hPt/$this->k;
+ //Page margins (1 cm)
+ $margin=28.35/$this->k;
+ $this->SetMargins($margin,$margin);
+ //Interior cell margin (1 mm)
+ $this->cMargin=$margin/10;
+ //Line width (0.2 mm)
+ $this->LineWidth=.567/$this->k;
+ //Automatic page break
+ $this->SetAutoPageBreak(true,2*$margin);
+ //Full width display mode
+ $this->SetDisplayMode('fullwidth');
+ //Enable compression
+ $this->SetCompression(true);
+ //Set default PDF version number
+ $this->PDFVersion='1.3';
+}
+
+function SetMargins($left,$top,$right=-1)
+{
+ //Set left, top and right margins
+ $this->lMargin=$left;
+ $this->tMargin=$top;
+ if($right==-1)
+ $right=$left;
+ $this->rMargin=$right;
+}
+
+function SetLeftMargin($margin)
+{
+ //Set left margin
+ $this->lMargin=$margin;
+ if($this->page>0 && $this->x<$margin)
+ $this->x=$margin;
+}
+
+function SetTopMargin($margin)
+{
+ //Set top margin
+ $this->tMargin=$margin;
+}
+
+function SetRightMargin($margin)
+{
+ //Set right margin
+ $this->rMargin=$margin;
+}
+
+function SetAutoPageBreak($auto,$margin=0)
+{
+ //Set auto page break mode and triggering margin
+ $this->AutoPageBreak=$auto;
+ $this->bMargin=$margin;
+ $this->PageBreakTrigger=$this->h-$margin;
+}
+
+function SetDisplayMode($zoom,$layout='continuous')
+{
+ //Set display mode in viewer
+ if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
+ $this->ZoomMode=$zoom;
+ else
+ $this->Error('Incorrect zoom display mode: '.$zoom);
+ if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
+ $this->LayoutMode=$layout;
+ else
+ $this->Error('Incorrect layout display mode: '.$layout);
+}
+
+function SetCompression($compress)
+{
+ //Set page compression
+ if(function_exists('gzcompress'))
+ $this->compress=$compress;
+ else
+ $this->compress=false;
+}
+
+function SetTitle($title)
+{
+ //Title of document
+ $this->title=$title;
+}
+
+function SetSubject($subject)
+{
+ //Subject of document
+ $this->subject=$subject;
+}
+
+function SetAuthor($author)
+{
+ //Author of document
+ $this->author=$author;
+}
+
+function SetKeywords($keywords)
+{
+ //Keywords of document
+ $this->keywords=$keywords;
+}
+
+function SetCreator($creator)
+{
+ //Creator of document
+ $this->creator=$creator;
+}
+
+function AliasNbPages($alias='{nb}')
+{
+ //Define an alias for total number of pages
+ $this->AliasNbPages=$alias;
+}
+
+function Error($msg)
+{
+ //Fatal error
+ die('FPDF error: '.$msg);
+}
+
+function Open()
+{
+ //Begin document
+ $this->state=1;
+}
+
+function Close()
+{
+ //Terminate document
+ if($this->state==3)
+ return;
+ if($this->page==0)
+ $this->AddPage();
+ //Page footer
+ $this->InFooter=true;
+ $this->Footer();
+ $this->InFooter=false;
+ //Close page
+ $this->_endpage();
+ //Close document
+ $this->_enddoc();
+}
+
+function AddPage($orientation='')
+{
+ //Start a new page
+ if($this->state==0)
+ $this->Open();
+ $family=$this->FontFamily;
+ $style=$this->FontStyle.($this->underline ? 'U' : '');
+ $size=$this->FontSizePt;
+ $lw=$this->LineWidth;
+ $dc=$this->DrawColor;
+ $fc=$this->FillColor;
+ $tc=$this->TextColor;
+ $cf=$this->ColorFlag;
+ if($this->page>0)
+ {
+ //Page footer
+ $this->InFooter=true;
+ $this->Footer();
+ $this->InFooter=false;
+ //Close page
+ $this->_endpage();
+ }
+ //Start new page
+ $this->_beginpage($orientation);
+ //Set line cap style to square
+ $this->_out('2 J');
+ //Set line width
+ $this->LineWidth=$lw;
+ $this->_out(sprintf('%.2f w',$lw*$this->k));
+ //Set font
+ if($family)
+ $this->SetFont($family,$style,$size);
+ //Set colors
+ $this->DrawColor=$dc;
+ if($dc!='0 G')
+ $this->_out($dc);
+ $this->FillColor=$fc;
+ if($fc!='0 g')
+ $this->_out($fc);
+ $this->TextColor=$tc;
+ $this->ColorFlag=$cf;
+ //Page header
+ $this->Header();
+ //Restore line width
+ if($this->LineWidth!=$lw)
+ {
+ $this->LineWidth=$lw;
+ $this->_out(sprintf('%.2f w',$lw*$this->k));
+ }
+ //Restore font
+ if($family)
+ $this->SetFont($family,$style,$size);
+ //Restore colors
+ if($this->DrawColor!=$dc)
+ {
+ $this->DrawColor=$dc;
+ $this->_out($dc);
+ }
+ if($this->FillColor!=$fc)
+ {
+ $this->FillColor=$fc;
+ $this->_out($fc);
+ }
+ $this->TextColor=$tc;
+ $this->ColorFlag=$cf;
+}
+
+function Header()
+{
+ //To be implemented in your own inherited class
+}
+
+function Footer()
+{
+ //To be implemented in your own inherited class
+}
+
+function PageNo()
+{
+ //Get current page number
+ return $this->page;
+}
+
+function SetDrawColor($r,$g=-1,$b=-1)
+{
+ //Set color for all stroking operations
+ if(($r==0 && $g==0 && $b==0) || $g==-1)
+ $this->DrawColor=sprintf('%.3f G',$r/255);
+ else
+ $this->DrawColor=sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255);
+ if($this->page>0)
+ $this->_out($this->DrawColor);
+}
+
+function SetFillColor($r,$g=-1,$b=-1)
+{
+ //Set color for all filling operations
+ if(($r==0 && $g==0 && $b==0) || $g==-1)
+ $this->FillColor=sprintf('%.3f g',$r/255);
+ else
+ $this->FillColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
+ $this->ColorFlag=($this->FillColor!=$this->TextColor);
+ if($this->page>0)
+ $this->_out($this->FillColor);
+}
+
+function SetTextColor($r,$g=-1,$b=-1)
+{
+ //Set color for text
+ if(($r==0 && $g==0 && $b==0) || $g==-1)
+ $this->TextColor=sprintf('%.3f g',$r/255);
+ else
+ $this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
+ $this->ColorFlag=($this->FillColor!=$this->TextColor);
+}
+
+function GetStringWidth($s)
+{
+ //Get width of a string in the current font
+ $s=(string)$s;
+ $cw=&$this->CurrentFont['cw'];
+ $w=0;
+ $l=strlen($s);
+ for($i=0;$i<$l;$i++)
+ $w+=$cw[$s[$i]];
+ return $w*$this->FontSize/1000;
+}
+
+function SetLineWidth($width)
+{
+ //Set line width
+ $this->LineWidth=$width;
+ if($this->page>0)
+ $this->_out(sprintf('%.2f w',$width*$this->k));
+}
+
+function Line($x1,$y1,$x2,$y2)
+{
+ //Draw a line
+ $this->_out(sprintf('%.2f %.2f m %.2f %.2f l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
+}
+
+function Rect($x,$y,$w,$h,$style='')
+{
+ //Draw a rectangle
+ if($style=='F')
+ $op='f';
+ elseif($style=='FD' || $style=='DF')
+ $op='B';
+ else
+ $op='S';
+ $this->_out(sprintf('%.2f %.2f %.2f %.2f re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+}
+
+function AddFont($family,$style='',$file='')
+{
+ //Add a TrueType or Type1 font
+ $family=strtolower($family);
+ if($file=='')
+ $file=str_replace(' ','',$family).strtolower($style).'.php';
+ if($family=='arial')
+ $family='helvetica';
+ $style=strtoupper($style);
+ if($style=='IB')
+ $style='BI';
+ $fontkey=$family.$style;
+ if(isset($this->fonts[$fontkey]))
+ $this->Error('Font already added: '.$family.' '.$style);
+ include($this->_getfontpath().$file);
+ if(!isset($name))
+ $this->Error('Could not include font definition file');
+ $i=count($this->fonts)+1;
+ $this->fonts[$fontkey]=array('i'=>$i,'type'=>$type,'name'=>$name,'desc'=>$desc,'up'=>$up,'ut'=>$ut,'cw'=>$cw,'enc'=>$enc,'file'=>$file);
+ if($diff)
+ {
+ //Search existing encodings
+ $d=0;
+ $nb=count($this->diffs);
+ for($i=1;$i<=$nb;$i++)
+ {
+ if($this->diffs[$i]==$diff)
+ {
+ $d=$i;
+ break;
+ }
+ }
+ if($d==0)
+ {
+ $d=$nb+1;
+ $this->diffs[$d]=$diff;
+ }
+ $this->fonts[$fontkey]['diff']=$d;
+ }
+ if($file)
+ {
+ if($type=='TrueType')
+ $this->FontFiles[$file]=array('length1'=>$originalsize);
+ else
+ $this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2);
+ }
+}
+
+function SetFont($family,$style='',$size=0)
+{
+ //Select a font; size given in points
+ global $fpdf_charwidths;
+
+ $family=strtolower($family);
+ if($family=='')
+ $family=$this->FontFamily;
+ if($family=='arial')
+ $family='helvetica';
+ elseif($family=='symbol' || $family=='zapfdingbats')
+ $style='';
+ $style=strtoupper($style);
+ if(strpos($style,'U')!==false)
+ {
+ $this->underline=true;
+ $style=str_replace('U','',$style);
+ }
+ else
+ $this->underline=false;
+ if($style=='IB')
+ $style='BI';
+ if($size==0)
+ $size=$this->FontSizePt;
+ //Test if font is already selected
+ if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)
+ return;
+ //Test if used for the first time
+ $fontkey=$family.$style;
+ if(!isset($this->fonts[$fontkey]))
+ {
+ //Check if one of the standard fonts
+ if(isset($this->CoreFonts[$fontkey]))
+ {
+ if(!isset($fpdf_charwidths[$fontkey]))
+ {
+ //Load metric file
+ $file=$family;
+ if($family=='times' || $family=='helvetica')
+ $file.=strtolower($style);
+ include($this->_getfontpath().$file.'.php');
+ if(!isset($fpdf_charwidths[$fontkey]))
+ $this->Error('Could not include font metric file');
+ }
+ $i=count($this->fonts)+1;
+ $this->fonts[$fontkey]=array('i'=>$i,'type'=>'core','name'=>$this->CoreFonts[$fontkey],'up'=>-100,'ut'=>50,'cw'=>$fpdf_charwidths[$fontkey]);
+ }
+ else
+ $this->Error('Undefined font: '.$family.' '.$style);
+ }
+ //Select it
+ $this->FontFamily=$family;
+ $this->FontStyle=$style;
+ $this->FontSizePt=$size;
+ $this->FontSize=$size/$this->k;
+ $this->CurrentFont=&$this->fonts[$fontkey];
+ if($this->page>0)
+ $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+}
+
+function SetFontSize($size)
+{
+ //Set font size in points
+ if($this->FontSizePt==$size)
+ return;
+ $this->FontSizePt=$size;
+ $this->FontSize=$size/$this->k;
+ if($this->page>0)
+ $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+}
+
+function AddLink()
+{
+ //Create a new internal link
+ $n=count($this->links)+1;
+ $this->links[$n]=array(0,0);
+ return $n;
+}
+
+function SetLink($link,$y=0,$page=-1)
+{
+ //Set destination of internal link
+ if($y==-1)
+ $y=$this->y;
+ if($page==-1)
+ $page=$this->page;
+ $this->links[$link]=array($page,$y);
+}
+
+function Link($x,$y,$w,$h,$link)
+{
+ //Put a link on the page
+ $this->PageLinks[$this->page][]=array($x*$this->k,$this->hPt-$y*$this->k,$w*$this->k,$h*$this->k,$link);
+}
+
+function Text($x,$y,$txt)
+{
+ //Output a string
+ $s=sprintf('BT %.2f %.2f Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
+ if($this->underline && $txt!='')
+ $s.=' '.$this->_dounderline($x,$y,$txt);
+ if($this->ColorFlag)
+ $s='q '.$this->TextColor.' '.$s.' Q';
+ $this->_out($s);
+}
+
+function AcceptPageBreak()
+{
+ //Accept automatic page break or not
+ return $this->AutoPageBreak;
+}
+
+function Cell($w,$h=0,$txt='',$border=0,$ln=0,$align='',$fill=0,$link='')
+{
+ //Output a cell
+ $k=$this->k;
+ if($this->y+$h>$this->PageBreakTrigger && !$this->InFooter && $this->AcceptPageBreak())
+ {
+ //Automatic page break
+ $x=$this->x;
+ $ws=$this->ws;
+ if($ws>0)
+ {
+ $this->ws=0;
+ $this->_out('0 Tw');
+ }
+ $this->AddPage($this->CurOrientation);
+ $this->x=$x;
+ if($ws>0)
+ {
+ $this->ws=$ws;
+ $this->_out(sprintf('%.3f Tw',$ws*$k));
+ }
+ }
+ if($w==0)
+ $w=$this->w-$this->rMargin-$this->x;
+ $s='';
+ if($fill==1 || $border==1)
+ {
+ if($fill==1)
+ $op=($border==1) ? 'B' : 'f';
+ else
+ $op='S';
+ $s=sprintf('%.2f %.2f %.2f %.2f re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
+ }
+ if(is_string($border))
+ {
+ $x=$this->x;
+ $y=$this->y;
+ if(strpos($border,'L')!==false)
+ $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+ if(strpos($border,'T')!==false)
+ $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+ if(strpos($border,'R')!==false)
+ $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+ if(strpos($border,'B')!==false)
+ $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+ }
+ if($txt!=='')
+ {
+ if($align=='R')
+ $dx=$w-$this->cMargin-$this->GetStringWidth($txt);
+ elseif($align=='C')
+ $dx=($w-$this->GetStringWidth($txt))/2;
+ else
+ $dx=$this->cMargin;
+ if($this->ColorFlag)
+ $s.='q '.$this->TextColor.' ';
+ $txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
+ $s.=sprintf('BT %.2f %.2f Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
+ if($this->underline)
+ $s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
+ if($this->ColorFlag)
+ $s.=' Q';
+ if($link)
+ $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
+ }
+ if($s)
+ $this->_out($s);
+ $this->lasth=$h;
+ if($ln>0)
+ {
+ //Go to next line
+ $this->y+=$h;
+ if($ln==1)
+ $this->x=$this->lMargin;
+ }
+ else
+ $this->x+=$w;
+}
+
+function MultiCell($w,$h,$txt,$border=0,$align='J',$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 && $s[$nb-1]=="\n")
+ $nb--;
+ $b=0;
+ if($border)
+ {
+ if($border==1)
+ {
+ $border='LTRB';
+ $b='LRT';
+ $b2='LR';
+ }
+ else
+ {
+ $b2='';
+ if(strpos($border,'L')!==false)
+ $b2.='L';
+ if(strpos($border,'R')!==false)
+ $b2.='R';
+ $b=(strpos($border,'T')!==false) ? $b2.'T' : $b2;
+ }
+ }
+ $sep=-1;
+ $i=0;
+ $j=0;
+ $l=0;
+ $ns=0;
+ $nl=1;
+ while($i<$nb)
+ {
+ //Get next character
+ $c=$s[$i];
+ if($c=="\n")
+ {
+ //Explicit line break
+ if($this->ws>0)
+ {
+ $this->ws=0;
+ $this->_out('0 Tw');
+ }
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+ $i++;
+ $sep=-1;
+ $j=$i;
+ $l=0;
+ $ns=0;
+ $nl++;
+ if($border && $nl==2)
+ $b=$b2;
+ continue;
+ }
+ if($c==' ')
+ {
+ $sep=$i;
+ $ls=$l;
+ $ns++;
+ }
+ $l+=$cw[$c];
+ if($l>$wmax)
+ {
+ //Automatic line break
+ if($sep==-1)
+ {
+ if($i==$j)
+ $i++;
+ if($this->ws>0)
+ {
+ $this->ws=0;
+ $this->_out('0 Tw');
+ }
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+ }
+ else
+ {
+ if($align=='J')
+ {
+ $this->ws=($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
+ $this->_out(sprintf('%.3f Tw',$this->ws*$this->k));
+ }
+ $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
+ $i=$sep+1;
+ }
+ $sep=-1;
+ $j=$i;
+ $l=0;
+ $ns=0;
+ $nl++;
+ if($border && $nl==2)
+ $b=$b2;
+ }
+ else
+ $i++;
+ }
+ //Last chunk
+ if($this->ws>0)
+ {
+ $this->ws=0;
+ $this->_out('0 Tw');
+ }
+ if($border && strpos($border,'B')!==false)
+ $b.='B';
+ $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+ $this->x=$this->lMargin;
+}
+
+function Write($h,$txt,$link='')
+{
+ //Output text in flowing mode
+ $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];
+ 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($c==' ')
+ $sep=$i;
+ $l+=$cw[$c];
+ if($l>$wmax)
+ {
+ //Automatic line break
+ if($sep==-1)
+ {
+ 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++;
+ $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=$sep+1;
+ }
+ $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++;
+ }
+ //Last chunk
+ if($i!=$j)
+ $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);
+}
+
+function Image($file,$x,$y,$w=0,$h=0,$type='',$link='')
+{
+ //Put an image on the page
+ if(!isset($this->images[$file]))
+ {
+ //First use of image, get info
+ if($type=='')
+ {
+ $pos=strrpos($file,'.');
+ if(!$pos)
+ $this->Error('Image file has no extension and no type was specified: '.$file);
+ $type=substr($file,$pos+1);
+ }
+ $type=strtolower($type);
+ if($type=='jpg' || $type=='jpeg')
+ $info=$this->_parsejpg($file);
+ elseif($type=='png')
+ $info=$this->_parsepng($file);
+ else
+ {
+ //Allow for additional formats
+ $mtd='_parse'.$type;
+ if(!method_exists($this,$mtd))
+ $this->Error('Unsupported image type: '.$type);
+ $info=$this->$mtd($file);
+ }
+ $info['i']=count($this->images)+1;
+ $this->images[$file]=$info;
+ }
+ else
+ $info=$this->images[$file];
+ //Automatic width and height calculation if needed
+ if($w==0 && $h==0)
+ {
+ //Put image at 72 dpi
+ $w=$info['w']/$this->k;
+ $h=$info['h']/$this->k;
+ }
+ if($w==0)
+ $w=$h*$info['w']/$info['h'];
+ if($h==0)
+ $h=$w*$info['h']/$info['w'];
+ $this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
+ if($link)
+ $this->Link($x,$y,$w,$h,$link);
+}
+
+function Ln($h='')
+{
+ //Line feed; default value is last cell height
+ $this->x=$this->lMargin;
+ if(is_string($h))
+ $this->y+=$this->lasth;
+ else
+ $this->y+=$h;
+}
+
+function GetX()
+{
+ //Get x position
+ return $this->x;
+}
+
+function SetX($x)
+{
+ //Set x position
+ if($x>=0)
+ $this->x=$x;
+ else
+ $this->x=$this->w+$x;
+}
+
+function GetY()
+{
+ //Get y position
+ return $this->y;
+}
+
+function SetY($y)
+{
+ //Set y position and reset x
+ $this->x=$this->lMargin;
+ if($y>=0)
+ $this->y=$y;
+ else
+ $this->y=$this->h+$y;
+}
+
+function SetXY($x,$y)
+{
+ //Set x and y positions
+ $this->SetY($y);
+ $this->SetX($x);
+}
+
+function Output($name='',$dest='')
+{
+ //Output PDF to some destination
+ //Finish document if necessary
+ if($this->state<3)
+ $this->Close();
+ //Normalize parameters
+ if(is_bool($dest))
+ $dest=$dest ? 'D' : 'F';
+ $dest=strtoupper($dest);
+ if($dest=='')
+ {
+ if($name=='')
+ {
+ $name='doc.pdf';
+ $dest='I';
+ }
+ else
+ $dest='F';
+ }
+ switch($dest)
+ {
+ case 'I':
+ //Send to standard output
+ if(ob_get_contents())
+ $this->Error('Some data has already been output, can\'t send PDF file');
+ if(php_sapi_name()!='cli')
+ {
+ //We send to a browser
+ header('Content-Type: application/pdf');
+ if(headers_sent())
+ $this->Error('Some data has already been output to browser, can\'t send PDF file');
+ header('Content-Length: '.strlen($this->buffer));
+ header('Content-disposition: inline; filename="'.$name.'"');
+ }
+ echo $this->buffer;
+ break;
+ case 'D':
+ //Download file
+ 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'))
+ header('Content-Type: application/force-download');
+ else
+ header('Content-Type: application/octet-stream');
+ if(headers_sent())
+ $this->Error('Some data has already been output to browser, can\'t send PDF file');
+ header('Content-Length: '.strlen($this->buffer));
+ header('Content-disposition: attachment; filename="'.$name.'"');
+ echo $this->buffer;
+ break;
+ case 'F':
+ //Save to local file
+ $f=fopen($name,'wb');
+ if(!$f)
+ $this->Error('Unable to create output file: '.$name);
+ fwrite($f,$this->buffer,strlen($this->buffer));
+ fclose($f);
+ break;
+ case 'S':
+ //Return as a string
+ return $this->buffer;
+ default:
+ $this->Error('Incorrect output destination: '.$dest);
+ }
+ return '';
+}
+
+/*******************************************************************************
+* *
+* Protected methods *
+* *
+*******************************************************************************/
+function _dochecks()
+{
+ //Check for locale-related bug
+ if(1.1==1)
+ $this->Error('Don\'t alter the locale before including class file');
+ //Check for decimal separator
+ if(sprintf('%.1f',1.0)!='1.0')
+ setlocale(LC_NUMERIC,'C');
+}
+
+function _getfontpath()
+{
+ if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))
+ define('FPDF_FONTPATH',dirname(__FILE__).'/font/');
+ return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
+}
+
+function _putpages()
+{
+ $nb=$this->page;
+ if(!empty($this->AliasNbPages))
+ {
+ //Replace number of pages
+ for($n=1;$n<=$nb;$n++)
+ $this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
+ }
+ if($this->DefOrientation=='P')
+ {
+ $wPt=$this->fwPt;
+ $hPt=$this->fhPt;
+ }
+ else
+ {
+ $wPt=$this->fhPt;
+ $hPt=$this->fwPt;
+ }
+ $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+ for($n=1;$n<=$nb;$n++)
+ {
+ //Page
+ $this->_newobj();
+ $this->_out('<_out('/Parent 1 0 R');
+ if(isset($this->OrientationChanges[$n]))
+ $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$hPt,$wPt));
+ $this->_out('/Resources 2 0 R');
+ if(isset($this->PageLinks[$n]))
+ {
+ //Links
+ $annots='/Annots [';
+ foreach($this->PageLinks[$n] as $pl)
+ {
+ $rect=sprintf('%.2f %.2f %.2f %.2f',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
+ $annots.='<_textstring($pl[4]).'>>>>';
+ else
+ {
+ $l=$this->links[$pl[4]];
+ $h=isset($this->OrientationChanges[$l[0]]) ? $wPt : $hPt;
+ $annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2f null]>>',1+2*$l[0],$h-$l[1]*$this->k);
+ }
+ }
+ $this->_out($annots.']');
+ }
+ $this->_out('/Contents '.($this->n+1).' 0 R>>');
+ $this->_out('endobj');
+ //Page content
+ $p=($this->compress) ? gzcompress($this->pages[$n]) : $this->pages[$n];
+ $this->_newobj();
+ $this->_out('<<'.$filter.'/Length '.strlen($p).'>>');
+ $this->_putstream($p);
+ $this->_out('endobj');
+ }
+ //Pages root
+ $this->offsets[1]=strlen($this->buffer);
+ $this->_out('1 0 obj');
+ $this->_out('<_out($kids.']');
+ $this->_out('/Count '.$nb);
+ $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$wPt,$hPt));
+ $this->_out('>>');
+ $this->_out('endobj');
+}
+
+function _putfonts()
+{
+ $nf=$this->n;
+ foreach($this->diffs as $diff)
+ {
+ //Encodings
+ $this->_newobj();
+ $this->_out('<>');
+ $this->_out('endobj');
+ }
+ foreach($this->FontFiles as $file=>$info)
+ {
+ //Font file embedding
+ $this->_newobj();
+ $this->FontFiles[$file]['n']=$this->n;
+ $font='';
+ $f=fopen($this->_getfontpath().$file,'rb',1);
+ if(!$f)
+ $this->Error('Font file not found');
+ while(!feof($f))
+ $font.=fread($f,8192);
+ fclose($f);
+ $compressed=(substr($file,-2)=='.z');
+ if(!$compressed && isset($info['length2']))
+ {
+ $header=(ord($font[0])==128);
+ if($header)
+ {
+ //Strip first binary header
+ $font=substr($font,6);
+ }
+ if($header && ord($font[$info['length1']])==128)
+ {
+ //Strip second binary header
+ $font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
+ }
+ }
+ $this->_out('< _out('/Filter /FlateDecode');
+ $this->_out('/Length1 '.$info['length1']);
+ if(isset($info['length2']))
+ $this->_out('/Length2 '.$info['length2'].' /Length3 0');
+ $this->_out('>>');
+ $this->_putstream($font);
+ $this->_out('endobj');
+ }
+ foreach($this->fonts as $k=>$font)
+ {
+ //Font objects
+ $this->fonts[$k]['n']=$this->n+1;
+ $type=$font['type'];
+ $name=$font['name'];
+ if($type=='core')
+ {
+ //Standard font
+ $this->_newobj();
+ $this->_out('<_out('/BaseFont /'.$name);
+ $this->_out('/Subtype /Type1');
+ if($name!='Symbol' && $name!='ZapfDingbats')
+ $this->_out('/Encoding /WinAnsiEncoding');
+ $this->_out('>>');
+ $this->_out('endobj');
+ }
+ elseif($type=='Type1' || $type=='TrueType')
+ {
+ //Additional Type1 or TrueType font
+ $this->_newobj();
+ $this->_out('<_out('/BaseFont /'.$name);
+ $this->_out('/Subtype /'.$type);
+ $this->_out('/FirstChar 32 /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('>>');
+ $this->_out('endobj');
+ //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='<$v)
+ $s.=' /'.$k.' '.$v;
+ $file=$font['file'];
+ if($file)
+ $s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+ $this->_out($s.'>>');
+ $this->_out('endobj');
+ }
+ else
+ {
+ //Allow for additional types
+ $mtd='_put'.strtolower($type);
+ if(!method_exists($this,$mtd))
+ $this->Error('Unsupported font type: '.$type);
+ $this->$mtd($font);
+ }
+ }
+}
+
+function _putimages()
+{
+ $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+ reset($this->images);
+ foreach ($this->images as $file => $info) {
+
+ $this->_newobj();
+ $this->images[$file]['n']=$this->n;
+ $this->_out('<_out('/Subtype /Image');
+ $this->_out('/Width '.$info['w']);
+ $this->_out('/Height '.$info['h']);
+ if($info['cs']=='Indexed')
+ $this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->n+1).' 0 R]');
+ else
+ {
+ $this->_out('/ColorSpace /'.$info['cs']);
+ if($info['cs']=='DeviceCMYK')
+ $this->_out('/Decode [1 0 1 0 1 0 1 0]');
+ }
+ $this->_out('/BitsPerComponent '.$info['bpc']);
+ if(isset($info['f']))
+ $this->_out('/Filter /'.$info['f']);
+ if(isset($info['parms']))
+ $this->_out($info['parms']);
+ if(isset($info['trns']) && is_array($info['trns']))
+ {
+ $trns='';
+ for($i=0;$i_out('/Mask ['.$trns.']');
+ }
+ $this->_out('/Length '.strlen($info['data']).'>>');
+ $this->_putstream($info['data']);
+ unset($this->images[$file]['data']);
+ $this->_out('endobj');
+ //Palette
+ if($info['cs']=='Indexed')
+ {
+ $this->_newobj();
+ $pal=($this->compress) ? gzcompress($info['pal']) : $info['pal'];
+ $this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
+ $this->_putstream($pal);
+ $this->_out('endobj');
+ }
+ }
+}
+
+function _putxobjectdict()
+{
+ foreach($this->images as $image)
+ $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
+}
+
+function _putresourcedict()
+{
+ $this->_out('/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
+ $this->_out('/Font <<');
+ foreach($this->fonts as $font)
+ $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
+ $this->_out('>>');
+ $this->_out('/XObject <<');
+ $this->_putxobjectdict();
+ $this->_out('>>');
+}
+
+function _putresources()
+{
+ $this->_putfonts();
+ $this->_putimages();
+ //Resource dictionary
+ $this->offsets[2]=strlen($this->buffer);
+ $this->_out('2 0 obj');
+ $this->_out('<<');
+ $this->_putresourcedict();
+ $this->_out('>>');
+ $this->_out('endobj');
+}
+
+function _putinfo()
+{
+ $this->_out('/Producer '.$this->_textstring('FPDF '.FPDF_VERSION));
+ if(!empty($this->title))
+ $this->_out('/Title '.$this->_textstring($this->title));
+ if(!empty($this->subject))
+ $this->_out('/Subject '.$this->_textstring($this->subject));
+ if(!empty($this->author))
+ $this->_out('/Author '.$this->_textstring($this->author));
+ if(!empty($this->keywords))
+ $this->_out('/Keywords '.$this->_textstring($this->keywords));
+ if(!empty($this->creator))
+ $this->_out('/Creator '.$this->_textstring($this->creator));
+ $this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis')));
+}
+
+function _putcatalog()
+{
+ $this->_out('/Type /Catalog');
+ $this->_out('/Pages 1 0 R');
+ if($this->ZoomMode=='fullpage')
+ $this->_out('/OpenAction [3 0 R /Fit]');
+ elseif($this->ZoomMode=='fullwidth')
+ $this->_out('/OpenAction [3 0 R /FitH null]');
+ elseif($this->ZoomMode=='real')
+ $this->_out('/OpenAction [3 0 R /XYZ null null 1]');
+ elseif(!is_string($this->ZoomMode))
+ $this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
+ if($this->LayoutMode=='single')
+ $this->_out('/PageLayout /SinglePage');
+ elseif($this->LayoutMode=='continuous')
+ $this->_out('/PageLayout /OneColumn');
+ elseif($this->LayoutMode=='two')
+ $this->_out('/PageLayout /TwoColumnLeft');
+}
+
+function _putheader()
+{
+ $this->_out('%PDF-'.$this->PDFVersion);
+}
+
+function _puttrailer()
+{
+ $this->_out('/Size '.($this->n+1));
+ $this->_out('/Root '.$this->n.' 0 R');
+ $this->_out('/Info '.($this->n-1).' 0 R');
+}
+
+function _enddoc()
+{
+ $this->_putheader();
+ $this->_putpages();
+ $this->_putresources();
+ //Info
+ $this->_newobj();
+ $this->_out('<<');
+ $this->_putinfo();
+ $this->_out('>>');
+ $this->_out('endobj');
+ //Catalog
+ $this->_newobj();
+ $this->_out('<<');
+ $this->_putcatalog();
+ $this->_out('>>');
+ $this->_out('endobj');
+ //Cross-ref
+ $o=strlen($this->buffer);
+ $this->_out('xref');
+ $this->_out('0 '.($this->n+1));
+ $this->_out('0000000000 65535 f ');
+ for($i=1;$i<=$this->n;$i++)
+ $this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
+ //Trailer
+ $this->_out('trailer');
+ $this->_out('<<');
+ $this->_puttrailer();
+ $this->_out('>>');
+ $this->_out('startxref');
+ $this->_out($o);
+ $this->_out('%%EOF');
+ $this->state=3;
+}
+
+function _beginpage($orientation)
+{
+ $this->page++;
+ $this->pages[$this->page]='';
+ $this->state=2;
+ $this->x=$this->lMargin;
+ $this->y=$this->tMargin;
+ $this->FontFamily='';
+ //Page orientation
+ if(!$orientation)
+ $orientation=$this->DefOrientation;
+ else
+ {
+ $orientation=strtoupper($orientation[0]);
+ if($orientation!=$this->DefOrientation)
+ $this->OrientationChanges[$this->page]=true;
+ }
+ if($orientation!=$this->CurOrientation)
+ {
+ //Change orientation
+ if($orientation=='P')
+ {
+ $this->wPt=$this->fwPt;
+ $this->hPt=$this->fhPt;
+ $this->w=$this->fw;
+ $this->h=$this->fh;
+ }
+ else
+ {
+ $this->wPt=$this->fhPt;
+ $this->hPt=$this->fwPt;
+ $this->w=$this->fh;
+ $this->h=$this->fw;
+ }
+ $this->PageBreakTrigger=$this->h-$this->bMargin;
+ $this->CurOrientation=$orientation;
+ }
+}
+
+function _endpage()
+{
+ //End of page contents
+ $this->state=1;
+}
+
+function _newobj()
+{
+ //Begin a new object
+ $this->n++;
+ $this->offsets[$this->n]=strlen($this->buffer);
+ $this->_out($this->n.' 0 obj');
+}
+
+function _dounderline($x,$y,$txt)
+{
+ //Underline text
+ $up=$this->CurrentFont['up'];
+ $ut=$this->CurrentFont['ut'];
+ $w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
+ return sprintf('%.2f %.2f %.2f %.2f re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
+}
+
+function _parsejpg($file)
+{
+ //Extract info from a JPEG file
+ $a=GetImageSize($file);
+ if(!$a)
+ $this->Error('Missing or incorrect image file: '.$file);
+ if($a[2]!=2)
+ $this->Error('Not a JPEG file: '.$file);
+ if(!isset($a['channels']) || $a['channels']==3)
+ $colspace='DeviceRGB';
+ elseif($a['channels']==4)
+ $colspace='DeviceCMYK';
+ else
+ $colspace='DeviceGray';
+ $bpc=isset($a['bits']) ? $a['bits'] : 8;
+ //Read whole file
+ $f=fopen($file,'rb');
+ $data='';
+ while(!feof($f))
+ $data.=fread($f,4096);
+ fclose($f);
+ return array('w'=>$a[0],'h'=>$a[1],'cs'=>$colspace,'bpc'=>$bpc,'f'=>'DCTDecode','data'=>$data);
+}
+
+function _parsepng($file)
+{
+ //Extract info from a PNG file
+ $f=fopen($file,'rb');
+ if(!$f)
+ $this->Error('Can\'t open image file: '.$file);
+ //Check signature
+ if(fread($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
+ $this->Error('Not a PNG file: '.$file);
+ //Read header chunk
+ fread($f,4);
+ if(fread($f,4)!='IHDR')
+ $this->Error('Incorrect PNG file: '.$file);
+ $w=$this->_freadint($f);
+ $h=$this->_freadint($f);
+ $bpc=ord(fread($f,1));
+ if($bpc>8)
+ $this->Error('16-bit depth not supported: '.$file);
+ $ct=ord(fread($f,1));
+ if($ct==0)
+ $colspace='DeviceGray';
+ elseif($ct==2)
+ $colspace='DeviceRGB';
+ elseif($ct==3)
+ $colspace='Indexed';
+ else
+ $this->Error('Alpha channel not supported: '.$file);
+ if(ord(fread($f,1))!=0)
+ $this->Error('Unknown compression method: '.$file);
+ if(ord(fread($f,1))!=0)
+ $this->Error('Unknown filter method: '.$file);
+ if(ord(fread($f,1))!=0)
+ $this->Error('Interlacing not supported: '.$file);
+ fread($f,4);
+ $parms='/DecodeParms <>';
+ //Scan chunks looking for palette, transparency and image data
+ $pal='';
+ $trns='';
+ $data='';
+ do
+ {
+ $n=$this->_freadint($f);
+ $type=fread($f,4);
+ if($type=='PLTE')
+ {
+ //Read palette
+ $pal=fread($f,$n);
+ fread($f,4);
+ }
+ elseif($type=='tRNS')
+ {
+ //Read transparency info
+ $t=fread($f,$n);
+ if($ct==0)
+ $trns=array(ord(substr($t,1,1)));
+ elseif($ct==2)
+ $trns=array(ord(substr($t,1,1)),ord(substr($t,3,1)),ord(substr($t,5,1)));
+ else
+ {
+ $pos=strpos($t,chr(0));
+ if($pos!==false)
+ $trns=array($pos);
+ }
+ fread($f,4);
+ }
+ elseif($type=='IDAT')
+ {
+ //Read image data block
+ $data.=fread($f,$n);
+ fread($f,4);
+ }
+ elseif($type=='IEND')
+ break;
+ else
+ fread($f,$n+4);
+ }
+ while($n);
+ if($colspace=='Indexed' && empty($pal))
+ $this->Error('Missing palette in '.$file);
+ fclose($f);
+ return array('w'=>$w,'h'=>$h,'cs'=>$colspace,'bpc'=>$bpc,'f'=>'FlateDecode','parms'=>$parms,'pal'=>$pal,'trns'=>$trns,'data'=>$data);
+}
+
+function _freadint($f)
+{
+ //Read a 4-byte integer from file
+ $a=unpack('Ni',fread($f,4));
+ return $a['i'];
+}
+
+function _textstring($s)
+{
+ //Format a text string
+ return '('.$this->_escape($s).')';
+}
+
+function _escape($s)
+{
+ //Add \ before \, ( and )
+ return str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$s)));
+}
+
+function _putstream($s)
+{
+ $this->_out('stream');
+ $this->_out($s);
+ $this->_out('endstream');
+}
+
+function _out($s)
+{
+ //Add a line to the document
+ if($this->state==2)
+ $this->pages[$this->page].=$s."\n";
+ else
+ $this->buffer.=$s."\n";
+}
+//End of class
+}
+
+//Handle special IE contype request
+if(isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT']=='contype')
+{
+ header('Content-Type: application/pdf');
+ exit;
+}
+
+}
+?>
diff --git a/public_html/fpdf/fpdf.php b/public_html/fpdf/fpdf.php
index dbc99c6..5f1d83b 100644
--- a/public_html/fpdf/fpdf.php
+++ b/public_html/fpdf/fpdf.php
@@ -78,7 +78,7 @@ function out(&$handler) {
$handler->_out($handler->_indirect_object($this));
$this->_out_nested($handler);
- };
+ }
}
/**
@@ -93,9 +93,9 @@ function _out_nested(&$handler) {
return true;
}
- function PDFIndirectObject(&$handler,
- $object_id,
- $generation_id) {
+ function __construct(&$handler,
+ $object_id,
+ $generation_id) {
$this->object_id = $object_id;
$this->generation_id = $generation_id;
}
@@ -112,10 +112,10 @@ function _dict() {
class PDFPage extends PDFIndirectObject {
var $annotations;
- function PDFPage(&$handler,
- $object_id,
- $generation_id) {
- $this->PDFIndirectObject($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id) {
+ PDFIndirectObject::__construct($handler,
$object_id,
$generation_id);
}
@@ -132,11 +132,11 @@ function _annotations(&$handler) {
class PDFAppearanceStream extends PDFIndirectObject {
var $_content;
- function PDFAppearanceStream(&$handler,
- $object_id,
- $generation_id,
- $content) {
- $this->PDFIndirectObject($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $content) {
+ PDFIndirectObject::__construct($handler,
$object_id,
$generation_id);
@@ -163,10 +163,10 @@ function pdf(&$handler) {
}
class PDFAnnotation extends PDFIndirectObject {
- function PDFAnnotation(&$handler,
- $object_id,
- $generation_id) {
- $this->PDFIndirectObject($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id) {
+ PDFIndirectObject::__construct($handler,
$object_id,
$generation_id);
}
@@ -183,7 +183,7 @@ class PDFRect {
var $w;
var $h;
- function PDFRect($x,$y,$w,$h) {
+ function __construct($x, $y, $w, $h) {
$this->x = $x;
$this->y = $y;
$this->w = $w;
@@ -219,12 +219,12 @@ class PDFAnnotationExternalLink extends PDFAnnotation {
var $rect;
var $link;
- function PDFAnnotationExternalLink(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $link) {
- $this->PDFAnnotation($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $link) {
+ PDFAnnotation::__construct($handler,
$object_id,
$generation_id);
@@ -247,12 +247,12 @@ class PDFAnnotationInternalLink extends PDFAnnotation {
var $rect;
var $link;
- function PDFAnnotationInternalLink(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $link) {
- $this->PDFAnnotation($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $link) {
+ PDFAnnotation::__construct($handler,
$object_id,
$generation_id);
@@ -267,7 +267,7 @@ function pdf(&$handler) {
} else {
$wPt=$handler->fhPt;
$hPt=$handler->fwPt;
- };
+ }
$l = $handler->links[$this->link];
$h = isset($handler->OrientationChanges[$l[0]]) ? $wPt : $hPt;
@@ -300,11 +300,11 @@ function pdf(&$handler) {
class PDFAnnotationWidget extends PDFAnnotation {
var $_rect;
- function PDFAnnotationWidget(&$handler,
- $object_id,
- $generation_id,
- $rect) {
- $this->PDFAnnotation($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect) {
+ PDFAnnotation::__construct($handler,
$object_id,
$generation_id);
@@ -325,11 +325,11 @@ class PDFFieldGroup extends PDFIndirectObject {
var $_kids;
var $_group_name;
- function PDFFieldGroup(&$handler,
- $object_id,
- $generation_id,
- $group_name) {
- $this->PDFIndirectObject($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $group_name) {
+ PDFIndirectObject::__construct($handler,
$object_id,
$generation_id);
@@ -338,7 +338,7 @@ function PDFFieldGroup(&$handler,
*/
if (is_null($group_name) || $group_name == "") {
$group_name = sprintf("FieldGroup%d", $this->get_object_id());
- };
+ }
$this->_group_name = $group_name;
$this->_kids = array();
@@ -351,7 +351,7 @@ function _check_field_name($field) {
if (trim($field->get_field_name()) == "") {
error_log(sprintf("Found form field with empty name"));
return false;
- };
+ }
/**
* Check if field name is unique inside this form! If we will not do it,
@@ -364,7 +364,7 @@ function _check_field_name($field) {
$kid->get_field_name()));
return false;
}
- };
+ }
return true;
}
@@ -377,7 +377,7 @@ function add_field(&$field) {
$field->set_field_name(sprintf("%s_FieldObject%d",
$field->get_field_name(),
$field->get_object_id()));
- };
+ }
$this->_kids[] =& $field;
$field->set_parent($this);
@@ -416,12 +416,12 @@ class PDFField extends PDFAnnotationWidget {
*/
var $_parent;
- function PDFField(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name) {
- $this->PDFAnnotationWidget($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name) {
+ PDFAnnotationWidget::__construct($handler,
$object_id,
$generation_id,
$rect);
@@ -432,7 +432,7 @@ function PDFField(&$handler,
*/
if (is_null($field_name) || $field_name == "") {
$field_name = sprintf("FieldObject%d", $this->get_object_id());
- };
+ }
$this->_field_name = $field_name;
}
@@ -442,7 +442,7 @@ function get_field_name() {
return $this->_field_name;
} else {
return sprintf("FormObject%d", $this->get_object_id());
- };
+ }
}
function _dict(&$handler) {
@@ -477,14 +477,14 @@ class PDFFieldCheckBox extends PDFField {
var $_appearance_off;
var $_checked;
- function PDFFieldCheckBox(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name,
- $value,
- $checked) {
- $this->PDFField($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name,
+ $value,
+ $checked) {
+ PDFField::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -540,13 +540,13 @@ function _out_nested(&$handler) {
$this->_appearance->out($handler);
}
- function PDFFieldPushButton(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $fontindex,
- $fontsize) {
- $this->PDFField($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $fontindex,
+ $fontsize) {
+ PDFField::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -583,16 +583,16 @@ function _dict(&$handler) {
class PDFFieldPushButtonImage extends PDFFieldPushButton {
var $_link;
- function PDFFieldPushButtonImage(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $fontindex,
- $fontsize,
- $field_name,
- $value,
- $link) {
- $this->PDFFieldPushButton($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $fontindex,
+ $fontsize,
+ $field_name,
+ $value,
+ $link) {
+ PDFFieldPushButton::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -619,16 +619,16 @@ class PDFFieldPushButtonSubmit extends PDFFieldPushButton {
var $_link;
var $_caption;
- function PDFFieldPushButtonSubmit(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $fontindex,
- $fontsize,
- $field_name,
- $value,
- $link) {
- $this->PDFFieldPushButton($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $fontindex,
+ $fontsize,
+ $field_name,
+ $value,
+ $link) {
+ PDFFieldPushButton::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -654,13 +654,13 @@ function _action(&$handler) {
}
class PDFFieldPushButtonReset extends PDFFieldPushButton {
- function PDFFieldPushButtonReset(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $fontindex,
- $fontsize) {
- $this->PDFFieldPushButton($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $fontindex,
+ $fontsize) {
+ PDFFieldPushButton::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -696,12 +696,12 @@ class PDFFieldRadio extends PDFAnnotationWidget {
var $_appearance_on;
var $_appearance_off;
- function PDFFieldRadio(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $value) {
- $this->PDFAnnotationWidget($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $value) {
+ PDFAnnotationWidget::__construct($handler,
$object_id,
$generation_id,
$rect);
@@ -755,7 +755,7 @@ class PDFFieldRadioGroup extends PDFFieldGroup {
var $_parent;
var $_checked;
- function _dict($handler) {
+ function _dict(&$handler) {
return array_merge(parent::_dict($handler),
array(
'DV' => $this->_checked ? $handler->_name($this->_checked) : "/Off",
@@ -774,11 +774,11 @@ function _check_field_name($field) {
return true;
}
- function PDFFieldRadioGroup(&$handler,
- $object_id,
- $generation_id,
- $group_name) {
- $this->PDFFieldGroup($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $group_name) {
+ PDFFieldGroup::__construct($handler,
$object_id,
$generation_id,
$group_name);
@@ -812,7 +812,7 @@ function _dict(&$handler) {
$options[] = $handler->_array(sprintf("%s %s",
$handler->_textstring($arr[0]),
$handler->_textstring($arr[1])));
- };
+ }
$options_str = $handler->_array(implode(" ",$options));
@@ -825,14 +825,14 @@ function _dict(&$handler) {
'Opt' => $options_str));
}
- function PDFFieldSelect(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name,
- $value,
- $options) {
- $this->PDFField($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name,
+ $value,
+ $options) {
+ PDFField::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -877,15 +877,15 @@ function _out_nested(&$handler) {
// $this->_appearance->out($handler);
}
- function PDFFieldText(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name,
- $value,
- $fontindex,
- $fontsize) {
- $this->PDFField($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name,
+ $value,
+ $fontindex,
+ $fontsize) {
+ PDFField::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -913,15 +913,15 @@ function _dict(&$handler) {
* "Password" text input field
*/
class PDFFieldPassword extends PDFFieldText {
- function PDFFieldPassword(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name,
- $value,
- $fontindex,
- $fontsize) {
- $this->PDFFieldText($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name,
+ $value,
+ $fontindex,
+ $fontsize) {
+ PDFFieldText::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -1044,8 +1044,8 @@ function y_coord($y) {
// assigned in any arbitrary order.
// * A non-negative integer generation number. In a newly created file, all indirect
// objects have generation numbers of 0. Nonzero generation numbers may be introduced
- // when the file is later updated; see Sections 3.4.3, “Cross-Reference
- // Table,” and 3.4.5, “Incremental Updates.”
+ // when the file is later updated; see Sections 3.4.3, �Cross-Reference
+ // Table,� and 3.4.5, �Incremental Updates.�
// Together, the combination of an object number and a generation number uniquely
// identifies an indirect object. The object retains the same object number and
// generation number throughout its existence, even if its value is modified.
@@ -1075,7 +1075,7 @@ function _dictionary($dict) {
$content = "";
foreach ($dict as $key => $value) {
$content .= "/$key $value\n";
- };
+ }
return "<<\n".$content."\n>>";
}
@@ -1093,7 +1093,7 @@ function _reference_array($object_array) {
$array_str = "";
for ($i=0; $i_reference($object_array[$i])." ";
- };
+ }
return $this->_array($array_str);
}
@@ -1111,7 +1111,7 @@ function add_form($name) {
}
function add_field_select($x, $y, $w, $h, $name, $value, $options) {
- $field =& new PDFFieldSelect($this,
+ $field= new PDFFieldSelect($this,
$this->_generate_new_object_number(), // Object identifier
0, // Generation
new PDFRect($x, $y, $w, $h), // Annotation rectangle
@@ -1138,7 +1138,7 @@ function add_field_select($x, $y, $w, $h, $name, $value, $options) {
* @TODO check if fully qualified field name will be unique in PDF file
*/
function add_field_checkbox($x, $y, $w, $h, $name, $value, $checked) {
- $field =& new PDFFieldCheckBox($this,
+ $field= new PDFFieldCheckBox($this,
$this->_generate_new_object_number(), // Object identifier
0, // Generation
new PDFRect($x, $y, $w, $h), // Annotation rectangle
@@ -1169,7 +1169,7 @@ function ¤t_form() {
0,
$name);
$this->_forms[] =& $form;
- };
+ }
return $this->_forms[count($this->_forms)-1];
}
@@ -1178,7 +1178,7 @@ function add_field_radio($x, $y, $w, $h, $group_name, $value, $checked) {
if (isset($this->_form_radios[$group_name])) {
$field =& $this->_form_radios[$group_name];
} else {
- $field =& new PDFFieldRadioGroup($this,
+ $field= new PDFFieldRadioGroup($this,
$this->_generate_new_object_number(),
0,
$group_name);
@@ -1187,15 +1187,15 @@ function add_field_radio($x, $y, $w, $h, $group_name, $value, $checked) {
$current_form->add_field($field);
$this->_form_radios[$group_name] =& $field;
- };
+ }
- $radio =& new PDFFieldRadio($this,
+ $radio= new PDFFieldRadio($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
$value);
$field->add_field($radio);
- if ($checked) { $field->set_checked($value); };
+ if ($checked) { $field->set_checked($value); }
$this->_pages[count($this->_pages)-1]->add_annotation($radio);
}
@@ -1213,7 +1213,7 @@ function add_field_radio($x, $y, $w, $h, $group_name, $value, $checked) {
* @return Field number
*/
function add_field_text($x, $y, $w, $h, $value, $field_name) {
- $field =& new PDFFieldText($this,
+ $field= new PDFFieldText($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1229,7 +1229,7 @@ function add_field_text($x, $y, $w, $h, $value, $field_name) {
}
function add_field_multiline_text($x, $y, $w, $h, $value, $field_name) {
- $field =& new PDFFieldMultilineText($this,
+ $field= new PDFFieldMultilineText($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1257,7 +1257,7 @@ function add_field_multiline_text($x, $y, $w, $h, $value, $field_name) {
* @return Field number
*/
function add_field_password($x, $y, $w, $h, $value, $field_name) {
- $field =& new PDFFieldPassword($this,
+ $field= new PDFFieldPassword($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1273,7 +1273,7 @@ function add_field_password($x, $y, $w, $h, $value, $field_name) {
}
function add_field_pushbuttonimage($x, $y, $w, $h, $field_name, $value, $actionURL) {
- $field =& new PDFFieldPushButtonImage($this,
+ $field= new PDFFieldPushButtonImage($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1290,7 +1290,7 @@ function add_field_pushbuttonimage($x, $y, $w, $h, $field_name, $value, $actionU
}
function add_field_pushbuttonsubmit($x, $y, $w, $h, $field_name, $value, $actionURL) {
- $field =& new PDFFieldPushButtonSubmit($this,
+ $field= new PDFFieldPushButtonSubmit($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1307,7 +1307,7 @@ function add_field_pushbuttonsubmit($x, $y, $w, $h, $field_name, $value, $action
}
function add_field_pushbuttonreset($x, $y, $w, $h) {
- $field =& new PDFFieldPushButtonReset($this,
+ $field= new PDFFieldPushButtonReset($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1322,7 +1322,7 @@ function add_field_pushbuttonreset($x, $y, $w, $h) {
}
function add_field_pushbutton($x, $y, $w, $h) {
- $field =& new PDFFieldPushButton($this,
+ $field= new PDFFieldPushButton($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1393,9 +1393,9 @@ function SetDecoration($underline, $overline, $strikeout) {
}
function ClipPath($path) {
- if (count($path) < 3) {
+ if (is_countable($path) && count($path) < 3) {
die("Attempt to clip on the path containing less than three points");
- };
+ }
$this->MakePath($path);
$this->Clip();
@@ -1427,10 +1427,10 @@ function _LoadFont($fontkey, $family, $encoding, $style) {
$fontkey.'.php',
$encoding);
ob_end_clean();
- };
+ }
$this->AddFont($fontkey, $family, "", $encoding, $fontkey.'.php', $embed);
- };
+ }
}
function _MakeFontKey($family, $encoding) {
@@ -1475,13 +1475,13 @@ function MakePath($path) {
for ($i=1; $i_out(sprintf("%.2f %.2f l", $path[$i]['x'], $path[$i]['y']));
- };
+ }
}
function FillPath($path) {
- if (count($path) < 3) {
+ if (is_countable($path) && count($path) < 3) {
die("Attempt to fill path containing less than three points");
- };
+ }
$this->_out($this->FillColor);
$this->MakePath($path);
@@ -1523,7 +1523,7 @@ function Circle($x, $y, $r) {
* Public methods *
* *
*******************************************************************************/
- function FPDF($orientation='P',$unit='mm',$format='A4') {
+ function __construct($orientation='P', $unit='mm', $format='A4') {
$this->_forms = array();
$this->_form_radios = array();
$this->_pages = array();
@@ -1573,7 +1573,7 @@ function FPDF($orientation='P',$unit='mm',$format='A4') {
$this->k = 72;
default:
$this->Error('Incorrect unit: '.$unit);
- };
+ }
//Page format
if (is_string($format)) {
@@ -1592,13 +1592,13 @@ function FPDF($orientation='P',$unit='mm',$format='A4') {
$format=array(612,1008); break;
default:
$this->Error('Unknown page format: '.$format);
- };
+ }
$this->fwPt=$format[0];
$this->fhPt=$format[1];
} else {
$this->fwPt=$format[0]*$this->k;
$this->fhPt=$format[1]*$this->k;
- };
+ }
$this->fw=$this->fwPt/$this->k;
$this->fh=$this->fhPt/$this->k;
@@ -1615,7 +1615,7 @@ function FPDF($orientation='P',$unit='mm',$format='A4') {
$this->hPt=$this->fwPt;
} else {
$this->Error('Incorrect orientation: '.$orientation);
- };
+ }
$this->CurOrientation=$this->DefOrientation;
$this->w=$this->wPt/$this->k;
@@ -1751,11 +1751,11 @@ function Close() {
//Terminate document
if ($this->state==3) {
return;
- };
+ }
if ($this->page==0) {
$this->AddPage();
- };
+ }
//Page footer
$this->InFooter=true;
@@ -1768,12 +1768,12 @@ function Close() {
}
function AddPage($orientation='') {
- $this->_pages[] =& new PDFPage($this, $this->_generate_new_object_number(), 0);
+ $this->_pages[]= new PDFPage($this, $this->_generate_new_object_number(), 0);
//Start a new page
if ($this->state==0) {
$this->Open();
- };
+ }
$family=$this->FontFamily;
@@ -1806,12 +1806,12 @@ function AddPage($orientation='') {
$this->DrawColor=$dc;
if ($dc!='0 G') {
$this->_out($dc);
- };
+ }
$this->FillColor=$fc;
if ($fc!='0 g') {
$this->_out($fc);
- };
+ }
$this->TextColor=$tc;
$this->ColorFlag=$cf;
@@ -1838,7 +1838,7 @@ function AddPage($orientation='') {
if (!is_null($this->CurrentFont)) {
$this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
- };
+ }
}
function Header()
@@ -1863,12 +1863,12 @@ function SetDrawColor($r,$g=-1,$b=-1) {
$new_color = sprintf('%.3f G',$r/255);
} else {
$new_color = sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255);
- };
+ }
if ($this->page > 0 /*&& $this->DrawColor != $new_color*/) {
$this->DrawColor = $new_color;
$this->_out($this->DrawColor);
- };
+ }
}
function SetFillColor($r,$g=-1,$b=-1) {
@@ -1877,13 +1877,13 @@ function SetFillColor($r,$g=-1,$b=-1) {
$new_color = sprintf('%.3f g',$r/255);
} else {
$new_color = sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
- };
+ }
if ($this->page>0 /*&& $this->FillColor != $new_color*/) {
$this->FillColor = $new_color;
$this->ColorFlag=($this->FillColor!=$this->TextColor);
$this->_out($this->FillColor);
- };
+ }
}
function SetTextColor($r,$g=-1,$b=-1) {
@@ -1892,7 +1892,7 @@ function SetTextColor($r,$g=-1,$b=-1) {
$this->TextColor=sprintf('%.3f g',$r/255);
} else {
$this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
- };
+ }
$this->ColorFlag=($this->FillColor!=$this->TextColor);
}
@@ -1905,8 +1905,8 @@ function GetStringWidth($s) {
$l=strlen($s);
for($i=0; $i<$l; $i++) {
- $w+=$cw[$s{$i}];
- };
+ $w+=$cw[$s[$i]];
+ }
return $w*$this->FontSize/1000;
}
@@ -1939,14 +1939,14 @@ function AddFont($fontkey, $family, $style, $encoding, $file, $bEmbed) {
//Add a TrueType or Type1 font
if ($file=='') {
$file=str_replace(' ','',$family).strtolower($style).'.php';
- };
+ }
$style=strtoupper($style);
- if ($style=='IB') { $style='BI'; };
+ if ($style=='IB') { $style='BI'; }
if(isset($this->fonts[$fontkey])) {
$this->Error('Font already added: '.$family.' '.$style);
- };
+ }
$filepath = $this->_getfontpath().$file;
include($filepath);
@@ -1954,11 +1954,11 @@ function AddFont($fontkey, $family, $style, $encoding, $file, $bEmbed) {
// After we've executed 'include' the $file variable
// have been overwritten by $file declared in font definition file; if we do not want
// to embed the font in the PDF file, we should set to empty string
- if (!$bEmbed) { $file = ''; };
+ if (!$bEmbed) { $file = ''; }
if(!isset($name)) {
$this->Error("Could not include font definition file: $filepath");
- };
+ }
$i=count($this->fonts)+1;
$this->fonts[$fontkey]=array('i' =>$i,
@@ -1994,7 +1994,7 @@ function AddFont($fontkey, $family, $style, $encoding, $file, $bEmbed) {
$this->FontFiles[$file]=array('length1'=>$originalsize);
} else {
$this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2);
- };
+ }
}
}
@@ -2008,12 +2008,12 @@ function SetFont($family,$encoding, $style='',$size=0) {
$style=str_replace('U','',$style);
} else {
$this->underline=false;
- };
- if ($style=='IB') { $style='BI'; };
+ }
+ if ($style=='IB') { $style='BI'; }
if ($size==0) {
$size = $this->FontSizePt;
- };
+ }
$fontkey = $this->_MakeFontKey($family, $encoding);
$this->_LoadFont($fontkey, $family, $encoding, $style);
@@ -2029,20 +2029,20 @@ function SetFont($family,$encoding, $style='',$size=0) {
$this->CurrentFont = &$this->fonts[$fontkey];
$this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
- };
+ }
}
// function SetFontSize($size) {
// //Set font size in points
// if ($this->FontSizePt == $size) {
// return;
-// };
+// }
// $this->FontSizePt=$size;
// $this->FontSize=$size/$this->k;
// if ($this->page>0) {
// $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
-// };
+// }
// }
function AddLink() {
@@ -2056,10 +2056,10 @@ function SetLink($link,$y=0,$page=-1) {
//Set destination of internal link
if ($y==-1) {
$y=$this->y;
- };
+ }
if ($page==-1) {
$page=$this->page;
- };
+ }
$this->links[$link]=array($page,$y);
}
@@ -2182,18 +2182,18 @@ function Cell($w,$h=0,$txt='',$border=0,$ln=0,$align='',$fill=0,$link='')
$dx=($w-$this->GetStringWidth($txt))/2;
} else {
$dx=$this->cMargin;
- };
+ }
if ($this->ColorFlag) {
$s.='q '.$this->TextColor.' ';
- };
+ }
$txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
$s.=sprintf('BT %.2f %.2f Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
if ($this->underline) {
$s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
- };
+ }
if($this->ColorFlag)
$s.=' Q';
@@ -2253,7 +2253,7 @@ function MultiCell($w,$h,$txt,$border=0,$align='J',$fill=0)
while($i<$nb)
{
//Get next character
- $c=$s{$i};
+ $c=$s[$i];
if($c=="\n")
{
//Explicit line break
@@ -2341,7 +2341,7 @@ function Write($h, $txt, $link='') {
$nl=1;
while ($i<$nb) {
//Get next character
- $c=$s{$i};
+ $c=$s[$i];
if ($c=="\n") {
//Explicit line break
$this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
@@ -2359,7 +2359,7 @@ function Write($h, $txt, $link='') {
}
if ($c==' ') {
$sep=$i;
- };
+ }
$l+=$cw[$c];
if ($l>$wmax) {
//Automatic line break
@@ -2376,7 +2376,7 @@ function Write($h, $txt, $link='') {
}
if ($i==$j) {
$i++;
- };
+ }
$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);
@@ -2414,8 +2414,6 @@ function Image($file,$x,$y,$w=0,$h=0,$type='',$link='')
$type=substr($file,$pos+1);
}
$type=strtolower($type);
- $mqr=get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
if($type=='jpg' || $type=='jpeg')
$info=$this->_parsejpg($file);
elseif($type=='png')
@@ -2428,13 +2426,12 @@ function Image($file,$x,$y,$w=0,$h=0,$type='',$link='')
$this->Error('Unsupported image type: '.$type);
$info=$this->$mtd($file);
}
- set_magic_quotes_runtime($mqr);
$info['i']=count($this->images)+1;
$this->images[$file]=$info;
}
else {
$info=$this->images[$file];
- };
+ }
//Automatic width and height calculation if needed
if ($w==0 && $h==0) {
@@ -2445,16 +2442,16 @@ function Image($file,$x,$y,$w=0,$h=0,$type='',$link='')
if ($w==0) {
$w=$h*$info['w']/$info['h'];
- };
+ }
if ($h==0) {
$h=$w*$info['h']/$info['w'];
- };
+ }
$this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
if ($link) {
$this->Link($x,$y,$w,$h,$link);
- };
+ }
}
function Ln($h='')
@@ -2601,7 +2598,7 @@ function _putpages() {
//Replace number of pages
for ($n=1; $n<=$nb; $n++) {
$this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
- };
+ }
}
if ($this->DefOrientation=='P') {
@@ -2610,7 +2607,7 @@ function _putpages() {
} else {
$wPt=$this->fhPt;
$hPt=$this->fwPt;
- };
+ }
$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
@@ -2630,7 +2627,7 @@ function _putpages() {
if (isset($this->OrientationChanges[$n])) {
$this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$hPt,$wPt));
- };
+ }
$this->_out('/Resources 2 0 R');
@@ -2645,11 +2642,11 @@ function _putpages() {
// Output annotation object for this page
$annotations = $this->_pages[$n-1]->annotations;
- $size = count($annotations);
+ $size = is_countable($annotations) ? count($annotations) : 0;
for ($j=0; $j<$size; $j++) {
$annotations[$j]->out($this);
- };
+ }
}
//Pages root
@@ -2678,8 +2675,6 @@ function _putfonts() {
$this->_out('endobj');
}
- $mqr=get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
foreach ($this->FontFiles as $file=>$info) {
//Font file embedding
$this->_newobj();
@@ -2688,19 +2683,19 @@ function _putfonts() {
$f=fopen($this->_getfontpath().$file,'rb',1);
if (!$f) {
$this->Error('Font file not found');
- };
+ }
- while(!feof($f)) { $font.=fread($f,8192); };
+ while(!feof($f)) { $font.=fread($f,8192); }
fclose($f);
$compressed=(substr($file,-2)=='.z');
if(!$compressed && isset($info['length2'])) {
- $header=(ord($font{0})==128);
+ $header=(ord($font[0])==128);
if($header) {
//Strip first binary header
$font=substr($font,6);
}
- if($header && ord($font{$info['length1']})==128) {
+ if($header && ord($font[$info['length1']])==128) {
//Strip second binary header
$font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
}
@@ -2709,17 +2704,16 @@ function _putfonts() {
if ($compressed) {
$this->_out('/Filter /FlateDecode');
- };
+ }
$this->_out('/Length1 '.$info['length1']);
if(isset($info['length2'])) {
$this->_out('/Length2 '.$info['length2'].' /Length3 0');
- };
+ }
$this->_out('>>');
$this->_putstream($font);
$this->_out('endobj');
}
- set_magic_quotes_runtime($mqr);
foreach ($this->fonts as $k=>$font) {
//Font objects
@@ -2740,7 +2734,7 @@ function _putfonts() {
$this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
} else {
$this->_out('/Encoding /WinAnsiEncoding');
- };
+ }
}
$this->_out('>>');
$this->_out('endobj');
@@ -2751,7 +2745,7 @@ function _putfonts() {
$s='[';
for ($i=32;$i<=255;$i++) {
$s.=$cw[chr($i)].' ';
- };
+ }
$this->_out($s.']');
$this->_out('endobj');
//Descriptor
@@ -2759,11 +2753,11 @@ function _putfonts() {
$s='<$v) {
$s.=' /'.$k.' '.$v;
- };
+ }
$file=$font['file'];
if($file) {
$s.=' /FontFile'.($type=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
- };
+ }
$this->_out($s.'>>');
$this->_out('endobj');
} else {
@@ -2779,7 +2773,7 @@ function _putfonts() {
function _putimages() {
$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
reset($this->images);
- while (list($file,$info) = each($this->images)) {
+ foreach ($this->images as $file => $info) {
$this->_newobj();
$this->images[$file]['n']=$this->n;
$this->_out('<_out('/ColorSpace /'.$info['cs']);
if($info['cs']=='DeviceCMYK') {
$this->_out('/Decode [1 0 1 0 1 0 1 0]');
- };
+ }
}
$this->_out('/BitsPerComponent '.$info['bpc']);
if (isset($info['f'])) {
$this->_out('/Filter /'.$info['f']);
- };
+ }
if(isset($info['parms'])) {
$this->_out($info['parms']);
- };
+ }
if(isset($info['trns']) && is_array($info['trns'])) {
$trns='';
for ($i=0;$i_out('/Mask ['.$trns.']');
- };
+ }
$this->_out('/Length '.strlen($info['data']).'>>');
$this->_putstream($info['data']);
@@ -2823,7 +2817,7 @@ function _putimages() {
$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
$this->_putstream($pal);
$this->_out('endobj');
- };
+ }
}
}
@@ -2886,7 +2880,7 @@ function _putcatalog($pages_start_obj_number) {
$this->_out("/OpenAction [$pages_start_obj_number 0 R /XYZ null null 1]");
} elseif (!is_string($this->ZoomMode)) {
$this->_out("/OpenAction [$pages_start_obj_number 0 R /XYZ null null ".($this->ZoomMode/100).']');
- };
+ }
if ($this->LayoutMode=='single') {
$this->_out('/PageLayout /SinglePage');
@@ -2894,7 +2888,7 @@ function _putcatalog($pages_start_obj_number) {
$this->_out('/PageLayout /OneColumn');
} elseif ($this->LayoutMode=='two') {
$this->_out('/PageLayout /TwoColumnLeft');
- };
+ }
if (count($this->_forms) > 0) {
$this->_out('/AcroForm <<');
@@ -2902,7 +2896,7 @@ function _putcatalog($pages_start_obj_number) {
$this->_out('/DR 2 0 R');
$this->_out('/NeedAppearances true');
$this->_out('>>');
- };
+ }
}
function _putheader() {
@@ -2938,7 +2932,7 @@ function _enddoc() {
// if (isset($form->appearance)) {
// $this->offsets[$form->appearance->get_object_id()] = strlen($this->buffer);
// $this->_out($this->_indirect_object($form->appearance));
-// };
+// }
// if (isset($form->_radios)) {
@@ -2947,13 +2941,13 @@ function _enddoc() {
// // $radio = $form->_radios[$i];
// // $this->offsets[$radio->get_object_id()] = strlen($this->buffer);
// // $this->_out($this->_indirect_object($radio));
-// };
+// }
// }
// Not required, as forms fields are annotations which are output at the end of the page
// $this->offsets[$form->get_object_id()] = strlen($this->buffer);
// $this->_out($this->_indirect_object($form));
- };
+ }
//Catalog
$this->_newobj();
@@ -2970,7 +2964,7 @@ function _enddoc() {
for ($i=1; $i<=$this->n; $i++) {
$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
- };
+ }
//Trailer
$this->_out('trailer');
@@ -2995,10 +2989,10 @@ function _beginpage($orientation) {
if(!$orientation) {
$orientation=$this->DefOrientation;
} else {
- $orientation=strtoupper($orientation{0});
+ $orientation=strtoupper($orientation[0]);
if($orientation!=$this->DefOrientation) {
$this->OrientationChanges[$this->page]=true;
- };
+ }
}
if($orientation!=$this->CurOrientation) {
@@ -3040,11 +3034,11 @@ function _parsejpg($file)
if (!$a) {
$this->Error('Missing or incorrect image file: '.$file);
- };
+ }
if ($a[2]!=2) {
$this->Error('Not a JPEG file: '.$file);
- };
+ }
if (!isset($a['channels']) || $a['channels']==3) {
$colspace='DeviceRGB';
@@ -3052,7 +3046,7 @@ function _parsejpg($file)
$colspace='DeviceCMYK';
} else {
$colspace='DeviceGray';
- };
+ }
$bpc=isset($a['bits']) ? $a['bits'] : 8;
@@ -3061,7 +3055,7 @@ function _parsejpg($file)
$data = '';
while (!feof($f)) {
$data .= fread($f,4096);
- };
+ }
fclose($f);
return array('w'=>$a[0],'h'=>$a[1],'cs'=>$colspace,'bpc'=>$bpc,'f'=>'DCTDecode','data'=>$data);
}
@@ -3071,18 +3065,18 @@ function _parsepng($file) {
$f=fopen($file,'rb');
if (!$f) {
$this->Error('Can\'t open image file: '.$file);
- };
+ }
//Check signature
if (fread($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
$this->Error('Not a PNG file: '.$file);
- };
+ }
//Read header chunk
fread($f,4);
if (fread($f,4)!='IHDR') {
$this->Error('Incorrect PNG file: '.$file);
- };
+ }
$w=$this->_freadint($f);
$h=$this->_freadint($f);
@@ -3090,7 +3084,7 @@ function _parsepng($file) {
if ($bpc>8) {
$this->Error('16-bit depth not supported: '.$file);
- };
+ }
$ct=ord(fread($f,1));
if ($ct==0) {
@@ -3101,19 +3095,19 @@ function _parsepng($file) {
$colspace='Indexed';
} else {
$this->Error('Alpha channel not supported: '.$file);
- };
+ }
if (ord(fread($f,1))!=0) {
$this->Error('Unknown compression method: '.$file);
- };
+ }
if (ord(fread($f,1))!=0) {
$this->Error('Unknown filter method: '.$file);
- };
+ }
if (ord(fread($f,1))!=0) {
$this->Error('Interlacing not supported: '.$file);
- };
+ }
fread($f,4);
$parms='/DecodeParms <>';
diff --git a/public_html/height.php b/public_html/height.php
index 816c9f1..8c98c1a 100644
--- a/public_html/height.php
+++ b/public_html/height.php
@@ -13,11 +13,11 @@
function merge_height_constraint($hc1, $hc2) {
// First constraint is constant; return this, as second constraint
// will never override it
- if (!is_null($hc1->constant)) { return $hc1; };
+ if (!is_null($hc1->constant)) { return $hc1; }
// Second constraint is constant; first is not constant;
// return second, as it is more important
- if (!is_null($hc2->constant)) { return $hc2; };
+ if (!is_null($hc2->constant)) { return $hc2; }
// Ok, both constraints are not constant. Check if there's any diapason
// constraints
@@ -25,10 +25,10 @@ function merge_height_constraint($hc1, $hc2) {
// Second constraint is free constraint, return first one, as
// if it is a non-free it should have precedence, otherwise
// it will be free constraint too
- if (is_null($hc2->min) && is_null($hc2->max)) { return $hc1; };
+ if (is_null($hc2->min) && is_null($hc2->max)) { return $hc1; }
// The same rule applied if the first constraint is free constraint
- if (is_null($hc1->min) && is_null($hc1->max)) { return $hc2; };
+ if (is_null($hc1->min) && is_null($hc1->max)) { return $hc2; }
// If we got here it means both constraints are diapason constraints.
return $hc1;
@@ -56,12 +56,12 @@ function applicable(&$box) {
$applicable_min = false;
if (!is_null($this->min)) {
$applicable_min = $this->applicable_value($this->min, $box);
- };
+ }
$applicable_max = false;
if (!is_null($this->max)) {
$applicable_max = $this->applicable_value($this->max, $box);
- };
+ }
return $applicable_min || $applicable_max;
}
@@ -77,9 +77,9 @@ function applicable_value($value, &$box) {
return true;
// Constant constraints always applicable
-// if (!$value[1]) { return true; };
+// if (!$value[1]) { return true; }
-// if (!$box->parent) { return false; };
+// if (!$box->parent) { return false; }
// return $box->parent->_height_constraint->applicable($box->parent);
}
@@ -114,17 +114,17 @@ function _fix_value($value, &$box, $default, $no_table_recursion) {
is_null($box->parent->_height_constraint->min) &&
is_null($box->parent->_height_constraint->max)) {
return $default;
- };
+ }
if ($box->parent->isCell()) {
if (!$no_table_recursion) {
$rhc = $box->parent->parent->get_rhc($box->parent->row);
- if ($rhc->is_null()) { return $default; };
+ if ($rhc->is_null()) { return $default; }
return $rhc->apply($box->parent->get_height(), $box, true) * $value[0] / 100;
} else {
return $box->parent->parent->get_height() * $value[0] / 100;
- };
- };
+ }
+ }
return $box->parent->get_height() * $value[0] / 100;
} else {
@@ -135,7 +135,7 @@ function _fix_value($value, &$box, $default, $no_table_recursion) {
function &create(&$box) {
// Determine if there's constant restriction
- $value = $box->get_css_property(CSS_HEIGHT);
+ $value = $box->getCSSProperty(CSS_HEIGHT);
if ($value->isAuto($value)) {
$constant = null;
@@ -143,29 +143,29 @@ function &create(&$box) {
$constant = array($value->getPercentage(), true);
} else {
$constant = array($value->getPoints(), false);
- };
+ }
// Determine if there's min restriction
- $value = $box->get_css_property(CSS_MIN_HEIGHT);
+ $value = $box->getCSSProperty(CSS_MIN_HEIGHT);
if ($value->isAuto($value)) {
$min = null;
} elseif ($value->isPercentage()) {
$min = array($value->getPercentage(), true);
} else {
$min = array($value->getPoints(), false);
- };
+ }
// Determine if there's max restriction
- $value = $box->get_css_property(CSS_MAX_HEIGHT);
+ $value = $box->getCSSProperty(CSS_MAX_HEIGHT);
if ($value->isAuto($value)) {
$max = null;
} elseif ($value->isPercentage()) {
$max = array($value->getPercentage(), true);
} else {
$max = array($value->getPoints(), false);
- };
+ }
- $constraint =& new HCConstraint($constant, $min, $max);
+ $constraint= new HCConstraint($constant, $min, $max);
return $constraint;
}
@@ -175,7 +175,7 @@ function &create(&$box) {
// @param $min value of minimal box height or null if none
// @param $max value of maximal box height or null if none
//
- function HCConstraint($constant, $min, $max) {
+ function __construct($constant = null, $min = null, $max = null) {
$this->constant = $constant;
$this->min = $min;
$this->max = $max;
@@ -215,7 +215,7 @@ function apply($value, &$box, $no_table_recursion = false) {
function is_min_null() {
if (is_null($this->min)) {
return true;
- };
+ }
return $this->min[0] == 0;
}
diff --git a/public_html/help/api.html b/public_html/help/api.html
index e3d5a0d..c1cfe8b 100644
--- a/public_html/help/api.html
+++ b/public_html/help/api.html
@@ -99,13 +99,10 @@ Conversion pipeline
var $destination;
function Pipeline();
-
- function configure($options);
+
function process($data_id, &$media);
function process_batch($data_id_array, &$media);
function error_message();
-
- function &get_dispatcher();
}
diff --git a/public_html/help/api_dom.html b/public_html/help/api_dom.html
index fdb8541..335b16c 100644
--- a/public_html/help/api_dom.html
+++ b/public_html/help/api_dom.html
@@ -1,42 +1,42 @@
-
-
-DOM compatibility
-DOM compatibility
-
-Minimal at the moment.
-
-
-
-get_element_by_id($string) - returns a reference to document element with given ID.
-
-
-
-
+
+
+DOM compatibility
+DOM compatibility
+
+Minimal at the moment.
+
+
+
+get_element_by_id($string) - returns a reference to document element with given ID.
+
+
+
+
\ No newline at end of file
diff --git a/public_html/help/calling.html b/public_html/help/calling.html
index 5582570..56e25a5 100644
--- a/public_html/help/calling.html
+++ b/public_html/help/calling.html
@@ -63,35 +63,27 @@ html2ps/pdf script parameters
HTML string containing text to insert to every page footer.
-You may use 'style' attribute to control header/footer appearance; for example:
+You may use 'style' attribute to control header/footer appearance; for example,
<div style="background: red;">SOME TEXT</div>
-Note this string must be (almost) valid XHTML (almost means that HTML/HEAD/BODY tags may be omitted). In particular:
-
-you should replace &,< and > with &,< and > correspondingly.
-All tags should be closed (including self-closing tags like BR or IMG).
-Tag and attribute names should be in lower case.
-
-See also: XHTML 1.0: Differences with HTML 4 .
-For more sophisticated control over the header/footer data, please refer to CSS 3 margin boxes
+Note this string must be (almost) valid XHTML (almost means that HTML/HEAD/BODY tags may be omitted). In particular,
+you should replace &,< and > with &,< and > correspondingly.
+For more sophisticated
+control over the header/footer data, please refer to CSS 3 margin boxes
-
-HTML string containing text to insert to every page header.
-You may use 'style' attribute to control header/footer appearance; for example:
+ HTML string containing text to insert to every page header.
+You may use 'style' attribute to control header/footer appearance; for example,
<div style="background: red;">SOME TEXT</div>
-Note this string must be (almost) valid XHTML (almost means that HTML/HEAD/BODY tags may be omitted). In particular:
-
-you should replace &,< and > with &,< and > correspondingly.
-All tags should be closed (including self-closing tags like BR or IMG).
-Tag and attribute names should be in lower case.
-
-See also: XHTML 1.0: Differences with HTML 4 .
-For more sophisticated control over the header/footer data, please refer to CSS 3 margin boxes
+Note this string must be (almost) valid XHTML (almost means that HTML/HEAD/BODY tags may be omitted). In particular,
+you should replace &,< and > with &,< and > correspondingly. All tags should be
+closed (including self-closing tags like BR or IMG).
+ For more sophisticated
+control over the header/footer data, please refer to CSS 3 margin boxes
@@ -114,8 +106,7 @@ html2ps/pdf script parameters
leftmargin, rightmargin, topmargin, bottommargin
Page margins (millimeters). Note that you may calculate top and bottom margin height automatically
- to fit header/footer content (provided it is defined using CSS 3 margin boxes) by specifying zero values for
- topmargin AND bottommargin at the same time.
+ to fit header/footer content by specifying zero values for topmargin AND bottommargin at the same time.
@@ -257,22 +248,6 @@ html2ps/pdf script parameters
are not affected by this option.
-
-toc
-Flag indicating whether script should automatically generate table of contents
-
-
-
-toc-location
-Defines the place where to place generated table of contents:
-
-before — on the first (separate) pageafter — on the last (separate) page (default)placeholder — replace placeholder DIV
-
-
-
URL
diff --git a/public_html/help/compatibility.css.3.html b/public_html/help/compatibility.css.3.html
index 046404b..9b35fb9 100644
--- a/public_html/help/compatibility.css.3.html
+++ b/public_html/help/compatibility.css.3.html
@@ -8,28 +8,6 @@ html2ps/pdf CSS 3 Compatibility List
Back to table of contents
-
-
-CSS 3 paged media module provides a means of controlling media size and margins.
-html2ps understangs 'size' and 'margin' properties when they're used in @page context; thus,
-you can set page size and margins in your CSS file, overriding defaults. For example:
-
-@page {
- size: 100mm 200mm;
- margin: 10mm;
-}
-
-or
-
-@page {
- size: A4 landscape;
- margin: 5% 10mm;
-}
-
-
-More complete information on 'size' and 'margin' value formats is available on w3c.org.
-
-
Margin boxes
html2ps supports margin boxes in accordance to CSS 3. For example, you may render a header
@@ -52,7 +30,7 @@
Margin boxes
@page {
@top-left {
- -html2ps-html-content: "<span style="font-weight: bold;">My</span> Page";
+ -html2ps-html-content: "<span style="font-weight: bold;">My</span> Page";
}
@top-right {
content: "Page " counter(page) " of " counter(pages);
@@ -77,6 +55,7 @@ Margin boxes
For further information please refer to
CSS 3 Paged Media Module .
+Note that html2ps at the moment does not support setting page size and margins via CSS.
diff --git a/public_html/help/configuration.html b/public_html/help/configuration.html
index f515c4a..35137d1 100644
--- a/public_html/help/configuration.html
+++ b/public_html/help/configuration.html
@@ -190,28 +190,6 @@
-
-FILE_PROTOCOL_RESTRICT
-
-Determines the prefix of the filesystem path allowed to be referred via 'file' protocol. By default,
-you may refer files in html2ps directory and below; to use files from C:\images directory you'll need to
-store C:\images\ value in this constant. Note the trailing backslash; if it is omitted, the prefix may match several directories,
-e.g. both C:\images \C:\images -private\
-
-
-
-FONT_EMBEDDING_MODE
-
-Determines how font files are embedded. May be:
-
-'all' — embed all fonts
-'none' — do not embed any fonts
-'config' — whether font is embedded is determined by html2ps.config 'embed' attribute value for this font
-
-
-
-
html2ps/pdf FAQ
No output at all. Broken output.
Broken layout. Customizing output.
Using script API.
@@ -50,7 +38,6 @@ html2ps/pdf FAQ
How could I convert HTML file from my local drive? How could I convert HTML contained in variable? Can I convert a page using some authentication mechanism using the html2ps webinterface? I'm using API to convert files and images and / or CSS files seems to be ignored. Fonts. National symbols.
@@ -65,7 +52,7 @@ html2ps/pdf FAQ
Interactive forms. Frames. Miscellaneous.
+Miscellanous.
Is it possible to reduce the size of output PDF file? Is it possible to use a custom file name when outputting the pdf file? Installation.
Using PHP from the command line
-How can I determine the script version?
-Look in config.inc.php for HTML2PS_VERSION_MAJOR, HTML2PS_VERSION_MINOR and HTML2PS_SUBVERSION constants. The full version number is
- MAJOR.MINOR.SUBVERSION. If you cannot find these constants, you're using very old html2ps release.
No output at all. Broken output.
@@ -113,10 +97,7 @@ No output at all. Broken output.
regexp usage; it is recommended to increase pcre.backtrack_limit value to 1000000.
-Warning: DOMDocument::loadXML() [function.DOMDocument-loadXML]: Input is not proper UTF-8, indicate encoding ....
-The page you're trying to convert specifies UTF8 encoding in header / meta tag, but is face uses different encoding. You need
-to switch from "Autodetect" encoding to the real one (in most cases iso-8859-1 will do) if you want to convert such page.
-
+
HTML2PS returns blank page. There's some strange messages in PHP error log, for example:
Parent: child process exited with status 3221225477 -- Restarting.
@@ -128,13 +109,12 @@ No output at all. Broken output.
All I'm getting is a blank page; no error messages in PHP error log. Whats happened?
-
-The script is probably running out of memory or execution time. Try increasing
-the values of max_execution_time and/or memory_limit PHP configuration variables.
-Recommended values are 120 seconds and 32 megabytes. Nevertheless, if you're
-using VERY big images, you'll probably need to increase these values
-even more.
-
+ The script is probably running out of memory or execution time. Try increasing
+ the values of max_execution_time and/or memory_limit PHP configuration variables.
+ Recommended values are 120 seconds and 32 megabytes. Nevertheless, if you're
+ using VERY big images, you'll probably need to increase these values
+ even more.
+
Another cause may be a JavaScript or META redirect on page you're trying to convert. As HTML2PS script is not designed
as interactive user agent, it will not follow such redirects for you. You may try to open the url in question in your browser
@@ -147,10 +127,6 @@ No output at all. Broken output.
This may lead to problem similar to one described in previous paragraph; the solution is the same: open URL in browser and
check it will change.
-
-Yet another cause may be browser built-in timeout; in particular, Safari for Windows has a built-in timeout of 60 seconds. In this case
-you will not be able to get the PDF file if conversion takes more than a minute.
-
I got the following error message: Fatal error: Allowed memory size of … bytes exhausted (tried to allocate … bytes) in&hellip
The script is running out of memory. Please refer to memory_limit PHP.net documentation regarding increasing memory limit.
@@ -185,45 +161,31 @@ No output at all. Broken output.
html2ps tries to take encoding from HTTP headers and META tags. If no encoding information found,
html2ps assumes iso-8851-1.
-
-I cannot fetch files from local hard disk using 'file' procolol.
-
-First of all, please ensure you're providing URL, not the file path; for example, if you're trying to use
-image from c:\foo\bar\baz.gif , you'll need to use the following URL: file:///C:/foo/bar/baz.gif .
-Second, due the security reasons, files accessed via 'file' protocol are limited to html2ps directory by default. This restriction
-is controlled by FILE_PROTOCOL_RESTRICT constant in the config.inc.php file. Note that this constant
-contains file path prefix ; for example, to use files from C:\images directory you'll need to
-store C:\images\ value in this constant.
-
-Some characters are missing in my PDFs on some Acrobat Reader versions / different OSes
+Some characters are missing in my PDFs on some Acrobat Reader versions / different OSes
Try enabling font embedding (set 'embed' property in html2ps.config to value 1 for fonts used in your documents).
-Sites are cut-off on the right side when I'm using 640 pixels page width. What can I do?
- Nothing. Treat this as a feature. Just increase the page width. Most sites
- are NOT designed for such small resolutions and will cause a horizontal
- scrollbar to appear in browser in such cases.
+Sites are cut-off on the right side when I'm using 640 pixels page width. What can I do?
+ Nothing. Treat this as a feature. Just increase the page width. Most sites
+ are NOT designed for such small resolutions and will cause a horizontal
+ scrollbar to appear in browser in such cases.
-I've disabled the "Keep screen pixel/point ratio" option and the
- page layout is completely broken! What can I do?
- Nothing. Treat this as a feature. If you want to get the layout close to
- the image rendered by the browser, never disable this option. The only
- time you'll need it is when you need to render text having the exact
- size specified in points.
+ I've disabled the "Keep screen pixel/point ratio" option and the
+ page layout is completely broken! What can I do?
+ Nothing. Treat this as a feature. If you want to get the layout close to
+ the image rendered by the browser, never disable this option. The only
+ time you'll need it is when you need to render text having the exact
+ size specified in points.
-Some images are rendered inside black rectangles!
+Some images are rendered inside black rectangles!
PNG images with alpha channel are NOT supported. Swicth to single-color transparency, if you need it.
-Horizontal lines (e.g. line under the text) look like they consist of several parts with slightly different width.
+Horizontal lines (e.g. line under the text) look like they consist of several parts with slightly different width.
Try disabling antialiasing in your PDF reader.
-My absolute-positioned content is cut at the last page
-Note that absolute and fixed-positioned content do not generate page breaks (see CSS 2.1. 13.2.3 Content outside the page box). The simplest
-workaround is to add static-positioned div with fixed height.
-
Use CSS 3 margin boxes .
Note that when you use PreTreeFilterHeaderFooter or Header/Footer fields in web interface,
-content is implicitly placed in fixed-positioned div; you may think of this as follows:
+content is implicitly placed in fixed-positioned div; you may thing of this as follows:
...
<body>
@@ -273,10 +235,6 @@
-Important note: HTML code added via PreTreeFilterHeaderFooter should be (almost) valid XHTML
-(see XHTML 1.0: Differences with HTML 4 );
-in particular, all tags / attributes should be in lower case. Almost means that you don't need to specify
-wrapping html , head and body tags for the header content.
I've added headers and footers to my HTML pages, but how I can prevent them from showing up in the browser? Can I control media size / margins via CSS?
-
-Yes. Use CSS 3 'size' and 'margin' properties. In addition,
-html2ps provides '-html2ps-pixels' property which allows you to override 'pixels' value specified
-in pipeline configuration code.
-
-
-
Yes, it is a documented feature. ##PAGES## always refer to the number of pages in file being processed.
@@ -315,17 +265,6 @@ API
object with your custom one able to bypass authentication. Still, the recommended approach
is html2ps API usage; in this case, you store your HTML code in a PHP variable instead of outputting it to the browser
and call conversion engine directly.
-I'm using API to convert files and images and / or CSS files seems to be ignored.
-
-Most likely, you're using relative URLs and, at the same time, converting either HTML string from memory or
-local file. In this case script doesn't know the base URL to use while resolving relative paths, so
-these URLs are ignored. You have two options in this case:
-
-Change relative URI to absolute in your HTML code
-Implement 'get_base_url' function in the fetcher object you're using so it return valid meaningful value.
-
-
-
Fonts. National symbols.
@@ -407,14 +346,14 @@
Is it possible to reduce the size of output PDF file?
Yes. By default HTML2PS embeds fonts used during conversion in the generated PDF. You may disable this option by
setting 'embed' attribute to '0' for these fonts in html2ps.config. Note that it will probably cause problems
with national symbols on older versions of Acrobat Reader; also, this assumes that users have all fonts used in PDF
-files on their machines. Also, refer to the description of FONT_EMBEDDING_MODE configuration constant.
+files on their machines.
Is it possible to use a custom file name when outputting the pdf file? As of right now, the filename is long ugly string and doesn't look very clean.
Can I pass the script a varible such as &saveas=thispdffile.pdf and use that for the file name when saving in the browser?
diff --git a/public_html/help/generated_toc.html b/public_html/help/generated_toc.html
index 867ed82..844cd62 100644
--- a/public_html/help/generated_toc.html
+++ b/public_html/help/generated_toc.html
@@ -1,122 +1,122 @@
-
-
-Generated Content: Table of Contents
-Generated Content: Table of Contents
-Features and limitations
-The TOC is generated using H1-H9 tags from the original document; you don't need to
-do anything specific with these tags, they're included automatically. If you've enabled
-hyperlinks rendering, TOC items will be clickable, pointing to the appropriate pages.
-
TOC may be placed at the beginning or at the end of the document on separate page or
-it may be inserted at the appropriate place in the document. In the latter
-case you should insert the following code in the document:
-
-<div id="html2ps-toc"></div>
-
-If this DIV is not empty, TOC will be rendered after content (it is not replaced).
-
-Note that TOC feature will not work in batch mode from the same reasons
-page numbering doesn't. In batch mode TOC will be generated for each document
-in batch.
-
-How can I control TOC appearance?
-TOC appearance may be controlled by following CSS selectors:
-
-
-
-.html2ps-toc
-Applies to the TOC as a whole
-
-
-.html2ps-toc-wrapper
-Applies to every TOC item
-
-
-.html2ps-toc-L-wrapper
-Applies to TOC item of the given level of nesting
-
-
-.html2ps-toc-name
-Applies to the textual TOC item name
-
-
-.html2ps-toc-L-name
-Applies to the textual TOC item name on the Lth level of nesting
-
-
-.html2ps-toc-page
-Applies to TOC page number
-
-
-.html2ps-toc-L-page
-Applies to TOC page number on the Lth level of nesting
-
-
-#html2ps-toc-X
-Applies to Xth TOC item as a whole
-
-
-#html2ps-toc-name-X
-Applies to Xth TOC item name
-
-
-#html2ps-toc-page-X
-Applies to Xth TOC item page number
-
-
-
-Note that every TOC item may be represented by a following code:
-
-<div id="html2ps-toc-X" class="html2ps-toc-wrapper html2ps-toc-L-wrapper">
-<div id="html2ps-toc-name-X" class="html2ps-toc-name html2ps-toc-L-name">NAME</div>
-<div id="html2ps-toc-page-X" class="html2ps-toc-page html2ps-toc-L-page">PAGE NUMBER</div>
-</div>
-
-
-How can I generate TOC using the webinterface?
-Provide 'toc' parameter (set the "Table of contents" flag) and choose one of 'after', 'before' or 'placeholder' values for 'toc-location' parameter
-(select appropriate value from "Place TOC at" pull-down).
-
-How can I generate TOC using API?
-
-Use the following PHP code:
-
-$pipeline->add_feature('toc', array('location' => $location_code);
-
-where $location_code should contains one of the 'after', 'before' or 'placeholder' values.
-
-
-How can I override the default TOC generator behaviour?
-You may override the following:
-
-items being selected as TOC items;
-how document is being modified (the place TOC is added to);
-
-First of all, access the feature object:
-
-$toc_feature =& FeatureFactory::get('toc');
-
-(note that it is bad-bad-bad idea to create feature objects by yourself;
-use FeatureFactory factory class instead).
-
-After this, you may use 'set_anchor_locator' and 'set_document_updater' to override
-these behaviours. Both methods accepts single parameter: an behaviour (strategy) object.
-It should implement one 'run' method taking $toc_box (preparent document element for the TOC),
-$media and $document as parameters. Anchor locating strategy object should return an array,
-every element of which is an associative array containing the following items:
-
-'name' — TOC item text
-'level' — nesting level
-'anchor' — ID of the target element
-'element' — target element itself
-
-Document updater strategy object does not need to return anything.
-
-
-For sample code refer to features/toc.php file.
-
-
-
-
+
+
+Generated Content: Table of Contents
+Generated Content: Table of Contents
+Features and limitations
+The TOC is generated using H1-H9 tags from the original document; you don't need to
+do anything specific with these tags, they're included automatically. If you've enabled
+hyperlinks rendering, TOC items will be clickable, pointing to the appropriate pages.
+
TOC may be placed at the beginning or at the end of the document on separate page or
+it may be inserted at the appropriate place in the document. In the latter
+case you should insert the following code in the document:
+
+<div id="html2ps-toc"></div>
+
+If this DIV is not empty, TOC will be rendered after content (it is not replaced).
+
+Note that TOC feature will not work in batch mode from the same reasons
+page numbering doesn't. In batch mode TOC will be generated for each document
+in batch.
+
+How can I control TOC appearance?
+TOC appearance may be controlled by following CSS selectors:
+
+
+
+.html2ps-toc
+Applies to the TOC as a whole
+
+
+.html2ps-toc-wrapper
+Applies to every TOC item
+
+
+.html2ps-toc-L-wrapper
+Applies to TOC item of the given level of nesting
+
+
+.html2ps-toc-name
+Applies to the textual TOC item name
+
+
+.html2ps-toc-L-name
+Applies to the textual TOC item name on the Lth level of nesting
+
+
+.html2ps-toc-page
+Applies to TOC page number
+
+
+.html2ps-toc-L-page
+Applies to TOC page number on the Lth level of nesting
+
+
+#html2ps-toc-X
+Applies to Xth TOC item as a whole
+
+
+#html2ps-toc-name-X
+Applies to Xth TOC item name
+
+
+#html2ps-toc-page-X
+Applies to Xth TOC item page number
+
+
+
+Note that every TOC item may be represented by a following code:
+
+<div id="html2ps-toc-X" class="html2ps-toc-wrapper html2ps-toc-L-wrapper">
+<div id="html2ps-toc-name-X" class="html2ps-toc-name html2ps-toc-L-name">NAME</div>
+<div id="html2ps-toc-page-X" class="html2ps-toc-page html2ps-toc-L-page">PAGE NUMBER</div>
+</div>
+
+
+How can I generate TOC using the webinterface?
+Provide 'toc' parameter (set the "Table of contents" flag) and choose one of 'after', 'before' or 'placeholder' values for 'toc-location' parameter
+(select appropriate value from "Place TOC at" pull-down).
+
+How can I generate TOC using API?
+
+Use the following PHP code:
+
+$pipeline->add_feature('toc', array('location' => $location_code);
+
+where $location_code should contains one of the 'after', 'before' or 'placeholder' values.
+
+
+How can I override the default TOC generator behaviour?
+You may override the following:
+
+items being selected as TOC items;
+how document is being modified (the place TOC is added to);
+
+First of all, access the feature object:
+
+$toc_feature =& FeatureFactory::get('toc');
+
+(note that it is bad-bad-bad idea to create feature objects by yourself;
+use FeatureFactory factory class instead).
+
+After this, you may use 'set_anchor_locator' and 'set_document_updater' to override
+these behaviours. Both methods accepts single parameter: an behaviour (strategy) object.
+It should implement one 'run' method taking $toc_box (preparent document element for the TOC),
+$media and $document as parameters. Anchor locating strategy object should return an array,
+every element of which is an associative array containing the following items:
+
+'name' — TOC item text
+'level' — nesting level
+'anchor' — ID of the target element
+'element' — target element itself
+
+Document updater strategy object does not need to return anything.
+
+
+For sample code refer to features/toc.php file.
+
+
+
+
diff --git a/public_html/help/howto_fonts.html b/public_html/help/howto_fonts.html
index f6de48a..e297ec1 100644
--- a/public_html/help/howto_fonts.html
+++ b/public_html/help/howto_fonts.html
@@ -7,46 +7,11 @@
HOWTO: Install custom fonts
Back to table of contents
-
-Keep in mind that most likely you will be using FPDF output method, as it covers 90% of your needs.
-Installing fonts for PDFLIB and Postscript output methods is required only if you're using
-non-default output driver.
-
-
- FPDF
Postscript Postscript (PS2PDF) PDFLIB
-
-
-FPDF output method
-Let's assume that you're going to install Trebuchet MS for the FPDF output method.
-
-Copy font files (trebuc.ttf , treducdb.ttf , trebucbi.ttf and trebucit.ttf )
-to TTF_FONTS_REPOSITORY directory (by default it points to 'fonts' subdirectory)
-Generate font metrics file for these fonts files
-and put it into the same directory. Note that metrics file should have the same name as font file and
-extension .afm (this step is optional if you're using a html2ps version more recent than 1.9.4)Register new font family in html2ps.config: add the following lines to html2ps.config in
-the FONTS-PDF section (between <fonts-pdf> and </fonts-pdf> tags):
-
- <family name="Trebuchet MS">
- <normal normal="TrebuchetMS" italic="TrebuchetMS-Italic" oblique="TrebuchetMS-Italic"/>
- <bold normal="TrebuchetMS-Bold" italic="TrebuchetMS-Bold-Italic" oblique="TrebuchetMS-Bold-Italic"/>
- </family>
-
-
-Register font files: add the following to the FONTS-PDF section:
-
- <ttf typeface="TrebuchetMS" embed="0" file="trebuc.ttf"/>
- <ttf typeface="TrebuchetMS-Bold" embed="0" file="trebucbd.ttf"/>
- <ttf typeface="TrebuchetMS-Italic" embed="0" file="trebucit.ttf"/>
- <ttf typeface="TrebuchetMS-Bold-Italic" embed="0" file="trebucbi.ttf"/>
-
-Note that you may want to replace embed="0" with embed="1" if you intend
-to distribute generated PDF to users without Trebuchet MS font installed in their machines.
-
+ FPDF
Postscript output method
@@ -137,5 +102,34 @@ PS2PDF output method
PDFLIB output method
Please refer to PDFLib Documentation.
+FPDF output method
+Let's assume that you're going to install Trebuchet MS for the FPDF output method.
+
+Copy font files (trebuc.ttf , treducdb.ttf , trebucbi.ttf and trebucit.ttf )
+to TTF_FONTS_REPOSITORY directory (by default it points to 'fonts' subdirectory)
+Generate font metrics file for these fonts files
+and put it into the same directory. Note that metrics file should have the same name as font file and
+extension .afm (this step is optional if you're using a html2ps version more recent than 1.9.4)Register new font family in html2ps.config: add the following lines to html2ps.config in
+the FONTS-PDF section (between <fonts-pdf> and </fonts-pdf> tags):
+
+ <family name="Trebuchet MS">
+ <normal normal="TrebuchetMS" italic="TrebuchetMS-Italic" oblique="TrebuchetMS-Italic"/>
+ <bold normal="TrebuchetMS-Bold" italic="TrebuchetMS-Bold-Italic" oblique="TrebuchetMS-Bold-Italic"/>
+ </family>
+
+
+Register font files: add the following to the FONTS-PDF section:
+
+ <ttf typeface="TrebuchetMS" embed="0" file="trebuc.ttf"/>
+ <ttf typeface="TrebuchetMS-Bold" embed="0" file="trebucbd.ttf"/>
+ <ttf typeface="TrebuchetMS-Italic" embed="0" file="trebucit.ttf"/>
+ <ttf typeface="TrebuchetMS-Bold-Italic" embed="0" file="trebucbi.ttf"/>
+
+Note that you may want to replace embed="0" with embed="1" if you intend
+to distribute generated PDF to users without Trebuchet MS font installed in their machines.
+
+
+
\ No newline at end of file
diff --git a/public_html/help/index.html b/public_html/help/index.html
index ae73048..6e6177f 100644
--- a/public_html/help/index.html
+++ b/public_html/help/index.html
@@ -13,24 +13,11 @@ html2ps/pdf documentation
Calling html2ps/pdf html2ps/pdf HTML directives Interactive forms Generated content
-
- Table of Contents
-
- Internals
-
- Page breaking algorithm Reserved names
-
API
API description How do "fetchers" work? Minimal code samples API events DOM compatibility
HOWTO: Use custom fonts Page breaking algorithm
-Page breaking algorithm
-
-First of all, keep in mind that "smart" page breaking algorithm is available in 2.0 branch since 2.0.9; there's no reason
-to use 2.1 experimental versions, as all features were ported. The difference between 2.1 and 2.0 is, in particular,
-in the following: 2.1 has smart page breaks enabled by default, while 2.0 uses it only if 'smartpagebreak' setting is set to true.
-If you're calling 'configure' when initializing pipeline, you notice no difference, as it will be enabled by default.
-If you're not using 'configure' call ($g_config is set up manually) you should explicitly set 'smartpagebreak' element in your $g_config to 'true'.
-
-
-
-To find the exact position of the next page break, script calculates a penalty (a badness, if you prefer) of every possible page break position, and
-selects one with the minimal penalty value. Possible break positions are horizontal lines between line and block-level boxes; inside tables they're horizontal row boundaries and horizontal
-lines passing between line boxes in all table cells in a row (thus, if you're using different font sizes or aligments in different cells, there's
-a big chance there won't be suitable page break places inside this row at all).
-
-
-
-Penalty is assigned for the following:
-
-
-breaking the 'page-break-inside: avoid' rule
-PAGE_BREAK_INSIDE_AVOID_PENALTY
-
-
-breaking the 'page-break-after: avoid' rule
-PAGE_BREAK_AFTER_AVOID_PENALTY
-
-
-breaking the 'page-break-before: avoid' rule
-PAGE_BREAK_BEFORE_AVOID_PENALTY
-
-
-leaving less than 'orphans' lines on the next page
-PAGE_BREAK_ORPHANS_PENALTY
-
-
-leaving less than 'widows' lines on the next page
-PAGE_BREAK_WIDOWS_PENALTY
-
-
-breaking between line boxes instead of block-level boxes
-PAGE_BREAK_LINE_PENALTY
-
-
-breaking inside box having non-zero padding or border
-PAGE_BREAK_BORDER_PENALTY
-
-
-
-
-
-All assigned penalties stack for each positions; after that a "free space" penalty is added. This additional value is
-used to prevent too much free space at the bottom of the page and is calculated using the following rules:
-
-free space penalty = 0, if distance from the bottom page edge / page height < MAX_UNPENALIZED_FREE_FACTION, or
-free space penalty = MAX_PAGE_BREAK_HEIGHT_PENALTY, if distance from the bottom page edge / page height > MAX_FREE_FACTION, or
-free space penalty = MAX_PAGE_BREAK_HEIGHT_PENALTY * ((distance from the bottom page edge / page height) - MAX_UNPENALIZED_FREE_FRACTION) / (MAX_FREE_FRACTION - MAX_UNPENALIZED_FREE_FRACTION), otherwise
-
-
-After this, script selects the position with the least penalty value and proceeds to the next page.
-
-Refer to default.css for the default CSS rules related to page breaking, and to config.inc.php for default values of penalties
-
-
+
+
+Page breaking algorithm
+Page breaking algorithm
+
+First of all, keep in mind that "smart" page breaking algorithm is available in 2.0 branch since 2.0.9; there's no reason
+to use 2.1 experimental versions, as all features were ported. The difference between 2.1 and 2.0 is, in particular,
+in the following: 2.1 has smart page breaks enabled by default, while 2.0 uses it only if 'smartpagebreak' setting is set to true.
+If you're calling 'configure' when initializing pipeline, you notice no difference, as it will be enabled by default.
+If you're not using 'configure' call ($g_config is set up manually) you should explicitly set 'smartpagebreak' element in your $g_config to 'true'.
+
+
+
+To find the exact position of the next page break, script calculates a penalty (a badness, if you prefer) of every possible page break position, and
+selects one with the minimal penalty value. Possible break positions are horizontal lines between line and block-level boxes; inside tables they're horizontal row boundaries and horizontal
+lines passing between line boxes in all table cells in a row (thus, if you're using different font sizes or aligments in different cells, there's
+a big chance there won't be suitable page break places inside this row at all).
+
+
+
+Penalty is assigned for the following:
+
+
+breaking the 'page-break-inside: avoid' rule
+PAGE_BREAK_INSIDE_AVOID_PENALTY
+
+
+breaking the 'page-break-after: avoid' rule
+PAGE_BREAK_AFTER_AVOID_PENALTY
+
+
+breaking the 'page-break-before: avoid' rule
+PAGE_BREAK_BEFORE_AVOID_PENALTY
+
+
+leaving less than 'orphans' lines on the next page
+PAGE_BREAK_ORPHANS_PENALTY
+
+
+leaving less than 'widows' lines on the next page
+PAGE_BREAK_WIDOWS_PENALTY
+
+
+breaking between line boxes instead of block-level boxes
+PAGE_BREAK_LINE_PENALTY
+
+
+breaking inside box having non-zero padding or border
+PAGE_BREAK_BORDER_PENALTY
+
+
+
+
+
+All assigned penalties stack for each positions; after that a "free space" penalty is added. This additional value is
+used to prevent too much free space at the bottom of the page and is calculated using the following rules:
+
+free space penalty = 0, if distance from the bottom page edge / page height < MAX_UNPENALIZED_FREE_FACTION, or
+free space penalty = MAX_PAGE_BREAK_HEIGHT_PENALTY, if distance from the bottom page edge / page height > MAX_FREE_FACTION, or
+free space penalty = MAX_PAGE_BREAK_HEIGHT_PENALTY * ((distance from the bottom page edge / page height) - MAX_UNPENALIZED_FREE_FRACTION) / (MAX_FREE_FRACTION - MAX_UNPENALIZED_FREE_FRACTION), otherwise
+
+
+After this, script selects the position with the least penalty value and proceeds to the next page.
+
+Refer to default.css for the default CSS rules related to page breaking, and to config.inc.php for default values of penalties
+
+
\ No newline at end of file
diff --git a/public_html/help/internals_reserved.html b/public_html/help/internals_reserved.html
index d92b4e4..f18ab6f 100644
--- a/public_html/help/internals_reserved.html
+++ b/public_html/help/internals_reserved.html
@@ -1,15 +1,15 @@
-
-
-Reserved names
-Reserved names
-
-Names (i.e. CSS classes, CSS property names or identifiers) starting with 'html2ps-...' and '-html2ps-...' are reserved
-for a future use. Using such names for your own purposes is strongly discouraged .
-
-
-
+
+
+Reserved names
+Reserved names
+
+Names (i.e. CSS classes, CSS property names or identifiers) starting with 'html2ps-...' and '-html2ps-...' are reserved
+for a future use. Using such names for your own purposes is strongly discouraged .
+
+
+
\ No newline at end of file
diff --git a/public_html/html.attrs.inc.php b/public_html/html.attrs.inc.php
index 1e5ce3e..0136837 100644
--- a/public_html/html.attrs.inc.php
+++ b/public_html/html.attrs.inc.php
@@ -1,5 +1,5 @@
'attr_height'
),
'ol' => array(
- 'start' => 'attr_start',
- 'type' => 'attr_ol_type'
+ 'start' => 'attr_start'
),
'p' => array(
'align' => 'attr_align'
@@ -145,8 +144,7 @@
'height' => 'attr_height'
),
'ul' => array(
- 'start' => 'attr_start',
- 'type' => 'attr_ul_type'
+ 'start' => 'attr_start'
)
);
@@ -162,50 +160,50 @@ function execute_attrs(&$root, $suffix, &$pipeline) {
if ($root->has_attribute($attr)) {
$fun = $fun.$suffix;
$fun($root, $pipeline);
- };
- };
+ }
+ }
if (array_key_exists($root->tagname(), $g_tag_attrs)) {
foreach ($g_tag_attrs[$root->tagname()] as $attr => $fun) {
if ($root->has_attribute($attr)) {
$fun = $fun.$suffix;
$fun($root, $pipeline);
- };
- };
- };
-};
+ }
+ }
+ }
+}
// ========= Handlers
// A NAME
function attr_name_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HTML2PS_LINK_DESTINATION);
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_LINK_DESTINATION);
$handler->css($root->get_attribute('name'), $pipeline);
}
-function attr_name_after_styles(&$root, &$pipeline) {};
-function attr_name_after(&$root, &$pipeline) {};
+function attr_name_after_styles(&$root, &$pipeline) {}
+function attr_name_after(&$root, &$pipeline) {}
// A ID
function attr_id_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HTML2PS_LINK_DESTINATION);
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_LINK_DESTINATION);
$handler->css($root->get_attribute('id'), $pipeline);
}
-function attr_id_after_styles(&$root, &$pipeline) {};
-function attr_id_after(&$root, &$pipeline) {};
+function attr_id_after_styles(&$root, &$pipeline) {}
+function attr_id_after(&$root, &$pipeline) {}
// A HREF
function attr_href_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HTML2PS_LINK_TARGET);
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_LINK_TARGET);
$handler->css($root->get_attribute('href'), $pipeline);
}
-function attr_href_after_styles(&$root, &$pipeline) {};
-function attr_href_after(&$root, &$pipeline) {};
+function attr_href_after_styles(&$root, &$pipeline) {}
+function attr_href_after(&$root, &$pipeline) {}
// IFRAME
function attr_frameborder_before(&$root, &$pipeline) {
- $css_state =& $pipeline->get_current_css_state();
- $handler =& CSS::get_handler(CSS_BORDER);
+ $css_state =& $pipeline->getCurrentCSSState();
+ $handler =& (new CSS())->get_handler(CSS_BORDER);
switch ($root->get_attribute('frameborder')) {
case '1':
@@ -214,37 +212,37 @@ function attr_frameborder_before(&$root, &$pipeline) {
case '0':
$handler->css('none', $pipeline);
break;
- };
+ }
}
-function attr_frameborder_after_styles(&$root, &$pipeline) {};
-function attr_frameborder_after(&$root, &$pipeline) {};
+function attr_frameborder_after_styles(&$root, &$pipeline) {}
+function attr_frameborder_after(&$root, &$pipeline) {}
function attr_iframe_marginheight_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_PADDING_TOP);
+ $handler =& (new CSS())->get_handler(CSS_PADDING_TOP);
$handler->css((int)$root->get_attribute('marginheight').'px',$pipeline);
- $handler =& CSS::get_handler(CSS_PADDING_BOTTOM);
+ $handler =& (new CSS())->get_handler(CSS_PADDING_BOTTOM);
$handler->css((int)$root->get_attribute('marginheight').'px',$pipeline);
}
-function attr_iframe_marginheight_after_styles(&$root, &$pipeline) {};
-function attr_iframe_marginheight_after(&$root, &$pipeline) {};
+function attr_iframe_marginheight_after_styles(&$root, &$pipeline) {}
+function attr_iframe_marginheight_after(&$root, &$pipeline) {}
function attr_iframe_marginwidth_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_PADDING_RIGHT);
+ $handler =& (new CSS())->get_handler(CSS_PADDING_RIGHT);
$handler->css((int)$root->get_attribute('marginwidth').'px',$pipeline);
- $handler =& CSS::get_handler(CSS_PADDING_LEFT);
+ $handler =& (new CSS())->get_handler(CSS_PADDING_LEFT);
$handler->css((int)$root->get_attribute('marginwidth').'px',$pipeline);
}
-function attr_iframe_marginwidth_after_styles(&$root, &$pipeline) {};
-function attr_iframe_marginwidth_after(&$root, &$pipeline) {};
+function attr_iframe_marginwidth_after_styles(&$root, &$pipeline) {}
+function attr_iframe_marginwidth_after(&$root, &$pipeline) {}
// BODY-specific
function attr_body_text_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_COLOR);
+ $handler =& (new CSS())->get_handler(CSS_COLOR);
$handler->css($root->get_attribute('text'),$pipeline);
}
-function attr_body_text_after_styles(&$root, &$pipeline) {};
-function attr_body_text_after(&$root, &$pipeline) {};
+function attr_body_text_after_styles(&$root, &$pipeline) {}
+function attr_body_text_after(&$root, &$pipeline) {}
function attr_body_link_before(&$root, &$pipeline) {
$color = $root->get_attribute('link');
@@ -253,63 +251,63 @@ function attr_body_link_before(&$root, &$pipeline) {
// this fake rule
$collection = new CSSPropertyCollection();
- $collection->add_property(CSSPropertyDeclaration::create(CSS_COLOR, $color, $pipeline));
+ $collection->addProperty((new CSSPropertyDeclaration())->create(CSS_COLOR, $color, $pipeline));
$rule = array(array(SELECTOR_SEQUENCE, array(array(SELECTOR_TAG, 'a'),
array(SELECTOR_PSEUDOCLASS_LINK_LOW_PRIORITY))),
$collection,
'',
-1000);
- $css =& $pipeline->get_current_css();
+ $css =& $pipeline->getCurrentCSS();
$css->add_rule($rule, $pipeline);
}
-function attr_body_link_after_styles(&$root, &$pipeline) {};
-function attr_body_link_after(&$root, &$pipeline) {};
+function attr_body_link_after_styles(&$root, &$pipeline) {}
+function attr_body_link_after(&$root, &$pipeline) {}
function attr_body_topmargin_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_MARGIN_TOP);
+ $handler =& (new CSS())->get_handler(CSS_MARGIN_TOP);
$handler->css((int)$root->get_attribute('topmargin').'px',$pipeline);
}
-function attr_body_topmargin_after_styles(&$root, &$pipeline) {};
-function attr_body_topmargin_after(&$root, &$pipeline) {};
+function attr_body_topmargin_after_styles(&$root, &$pipeline) {}
+function attr_body_topmargin_after(&$root, &$pipeline) {}
function attr_body_leftmargin_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_MARGIN_LEFT);
+ $handler =& (new CSS())->get_handler(CSS_MARGIN_LEFT);
$handler->css((int)$root->get_attribute('leftmargin').'px',$pipeline);
}
-function attr_body_leftmargin_after_styles(&$root, &$pipeline) {};
-function attr_body_leftmargin_after(&$root, &$pipeline) {};
+function attr_body_leftmargin_after_styles(&$root, &$pipeline) {}
+function attr_body_leftmargin_after(&$root, &$pipeline) {}
function attr_body_marginheight_before(&$root, &$pipeline) {
- $css_state =& $pipeline->get_current_css_state();
+ $css_state =& $pipeline->getCurrentCSSState();
- $h_top =& CSS::get_handler(CSS_MARGIN_TOP);
- $h_bottom =& CSS::get_handler(CSS_MARGIN_BOTTOM);
+ $h_top =& (new CSS())->get_handler(CSS_MARGIN_TOP);
+ $h_bottom =& (new CSS())->get_handler(CSS_MARGIN_BOTTOM);
$top = $h_top->get($css_state->getState());
$h_bottom->css(((int)$root->get_attribute('marginheight') - $top->value).'px',$pipeline);
}
-function attr_body_marginheight_after_styles(&$root, &$pipeline) {};
-function attr_body_marginheight_after(&$root, &$pipeline) {};
+function attr_body_marginheight_after_styles(&$root, &$pipeline) {}
+function attr_body_marginheight_after(&$root, &$pipeline) {}
function attr_body_marginwidth_before(&$root, &$pipeline) {
- $css_state =& $pipeline->get_current_css_state();
+ $css_state =& $pipeline->getCurrentCSSState();
- $h_left =& CSS::get_handler(CSS_MARGIN_LEFT);
- $h_right =& CSS::get_handler(CSS_MARGIN_RIGHT);
+ $h_left =& (new CSS())->get_handler(CSS_MARGIN_LEFT);
+ $h_right =& (new CSS())->get_handler(CSS_MARGIN_RIGHT);
$left = $h_left->get($css_state->getState());
$h_right->css(((int)$root->get_attribute('marginwidth') - $left->value).'px',$pipeline);
}
-function attr_body_marginwidth_after_styles(&$root, &$pipeline) {};
-function attr_body_marginwidth_after(&$root, &$pipeline) {};
+function attr_body_marginwidth_after_styles(&$root, &$pipeline) {}
+function attr_body_marginwidth_after(&$root, &$pipeline) {}
// === nowrap
function attr_nowrap_before(&$root, &$pipeline) {
- $css_state =& $pipeline->get_current_css_state();
- $css_state->set_property(CSS_HTML2PS_NOWRAP, NOWRAP_NOWRAP);
+ $css_state =& $pipeline->getCurrentCSSState();
+ $css_state->setProperty(CSS_HTML2PS_NOWRAP, NOWRAP_NOWRAP);
}
function attr_nowrap_after_styles(&$root, &$pipeline) {}
@@ -318,9 +316,9 @@ function attr_nowrap_after(&$root, &$pipeline) {}
// === hspace
function attr_hspace_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_PADDING_LEFT);
+ $handler =& (new CSS())->get_handler(CSS_PADDING_LEFT);
$handler->css((int)$root->get_attribute('hspace').'px',$pipeline);
- $handler =& CSS::get_handler(CSS_PADDING_RIGHT);
+ $handler =& (new CSS())->get_handler(CSS_PADDING_RIGHT);
$handler->css((int)$root->get_attribute('hspace').'px',$pipeline);
}
@@ -331,9 +329,9 @@ function attr_hspace_after(&$root, &$pipeline) {}
// === vspace
function attr_vspace_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_PADDING_TOP);
+ $handler =& (new CSS())->get_handler(CSS_PADDING_TOP);
$handler->css((int)$root->get_attribute('vspace').'px',$pipeline);
- $handler =& CSS::get_handler(CSS_PADDING_BOTTOM);
+ $handler =& (new CSS())->get_handler(CSS_PADDING_BOTTOM);
$handler->css((int)$root->get_attribute('vspace').'px',$pipeline);
}
@@ -343,7 +341,7 @@ function attr_vspace_after(&$root, &$pipeline) {}
// === background
function attr_background_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_BACKGROUND_IMAGE);
+ $handler =& (new CSS())->get_handler(CSS_BACKGROUND_IMAGE);
$handler->css('url('.$root->get_attribute('background').')',$pipeline);
}
function attr_background_after_styles(&$root, &$pipeline) {}
@@ -354,39 +352,39 @@ function attr_background_after(&$root, &$pipeline) {}
function attr_table_float_align_before(&$root, &$pipeline) {}
function attr_table_float_align_after_styles(&$root, &$pipeline) {
if ($root->get_attribute('align') === 'center') {
- $margin_left =& CSS::get_handler(CSS_MARGIN_LEFT);
+ $margin_left =& (new CSS())->get_handler(CSS_MARGIN_LEFT);
$margin_left->css('auto',$pipeline);
- $margin_right =& CSS::get_handler(CSS_MARGIN_RIGHT);
+ $margin_right =& (new CSS())->get_handler(CSS_MARGIN_RIGHT);
$margin_right->css('auto',$pipeline);
} else {
- $float =& CSS::get_handler(CSS_FLOAT);
- $css_state =& $pipeline->get_current_css_state();
+ $float =& (new CSS())->get_handler(CSS_FLOAT);
+ $css_state =& $pipeline->getCurrentCSSState();
$float->replace($float->parse($root->get_attribute('align')),
$css_state);
- };
+ }
}
function attr_table_float_align_after(&$root, &$pipeline) {}
function attr_img_align_before(&$root, &$pipeline) {
if (preg_match('/left|right/', $root->get_attribute('align'))) {
- $float =& CSS::get_handler(CSS_FLOAT);
- $css_state =& $pipeline->get_current_css_state();
+ $float =& (new CSS())->get_handler(CSS_FLOAT);
+ $css_state =& $pipeline->getCurrentCSSState();
$float->replace($float->parse($root->get_attribute('align')),
$css_state);
} else {
- $handler =& CSS::get_handler(CSS_VERTICAL_ALIGN);
- $css_state =& $pipeline->get_current_css_state();
+ $handler =& (new CSS())->get_handler(CSS_VERTICAL_ALIGN);
+ $css_state =& $pipeline->getCurrentCSSState();
$handler->replace($handler->parse($root->get_attribute('align')),
$css_state);
- };
+ }
}
function attr_img_align_after_styles(&$root, &$pipeline) {}
function attr_img_align_after(&$root, &$pipeline) {}
function attr_self_align_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HTML2PS_LOCALALIGN);
- $css_state =& $pipeline->get_current_css_state();
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_LOCALALIGN);
+ $css_state =& $pipeline->getCurrentCSSState();
switch ($root->get_attribute('align')) {
case 'left':
@@ -405,7 +403,7 @@ function attr_self_align_before(&$root, &$pipeline) {
$handler->replace(LA_LEFT,
$css_state);
break;
- };
+ }
}
function attr_self_align_after_styles(&$root, &$pipeline) {}
@@ -416,8 +414,8 @@ function attr_self_align_after(&$root, &$pipeline) {}
function attr_table_bordercolor_before(&$root, &$pipeline) {
$color = parse_color_declaration($root->get_attribute('bordercolor'));
- $css_state =& $pipeline->get_current_css_state();
- $border =& $css_state->get_property(CSS_HTML2PS_TABLE_BORDER);
+ $css_state =& $pipeline->getCurrentCSSState();
+ $border =& $css_state->getProperty(CSS_HTML2PS_TABLE_BORDER);
$border =& $border->copy();
$border->left->color = $color;
@@ -425,21 +423,21 @@ function attr_table_bordercolor_before(&$root, &$pipeline) {
$border->top->color = $color;
$border->bottom->color = $color;
-// $css_state->pushState();
-// $css_state->set_property(CSS_HTML2PS_TABLE_BORDER, $border);
+ $css_state->pushState();
+ $css_state->setProperty(CSS_HTML2PS_TABLE_BORDER, $border);
-// $css_state->pushState();
-// $css_state->set_property(CSS_BORDER, $border);
+ $css_state->pushState();
+ $css_state->setProperty(CSS_BORDER, $border);
}
function attr_table_bordercolor_after_styles(&$root, &$pipeline) {
-// $css_state =& $pipeline->get_current_css_state();
-// $css_state->popState();
+ $css_state =& $pipeline->getCurrentCSSState();
+ $css_state->popState();
}
function attr_table_bordercolor_after(&$root, &$pipeline) {
-// $css_state =& $pipeline->get_current_css_state();
-// $css_state->popState();
+ $css_state =& $pipeline->getCurrentCSSState();
+ $css_state->popState();
}
// === border
@@ -447,21 +445,21 @@ function attr_table_bordercolor_after(&$root, &$pipeline) {
function attr_border_before(&$root, &$pipeline) {
$width = (int)$root->get_attribute('border');
- $css_state =& $pipeline->get_current_css_state();
- $border =& $css_state->get_property(CSS_BORDER);
+ $css_state =& $pipeline->getCurrentCSSState();
+ $border =& $css_state->getProperty(CSS_BORDER);
$border =& $border->copy();
- $border->left->width = Value::fromData($width, UNIT_PX);
- $border->right->width = Value::fromData($width, 'px');
- $border->top->width = Value::fromData($width, 'px');
- $border->bottom->width = Value::fromData($width, 'px');
+ $border->left->width = (new Value())->fromData($width, UNIT_PX);
+ $border->right->width = (new Value())->fromData($width, 'px');
+ $border->top->width = (new Value())->fromData($width, 'px');
+ $border->bottom->width = (new Value())->fromData($width, 'px');
$border->left->style = BS_SOLID;
$border->right->style = BS_SOLID;
$border->top->style = BS_SOLID;
$border->bottom->style = BS_SOLID;
- $css_state->set_property(CSS_BORDER, $border);
+ $css_state->setProperty(CSS_BORDER, $border);
}
function attr_border_after_styles(&$root, &$pipeline) {}
@@ -475,8 +473,8 @@ function attr_table_rules_before(&$root, &$pipeline) {
*/
$rules = $root->get_attribute('rules');
- $css_state =& $pipeline->get_current_css_state();
- $border = $css_state->get_property(CSS_HTML2PS_TABLE_BORDER);
+ $css_state =& $pipeline->getCurrentCSSState();
+ $border = $css_state->getProperty(CSS_HTML2PS_TABLE_BORDER);
switch ($rules) {
case 'none':
@@ -498,9 +496,9 @@ function attr_table_rules_before(&$root, &$pipeline) {
break;
case 'all':
break;
- };
+ }
- $css_state->set_property(CSS_HTML2PS_TABLE_BORDER, $border);
+ $css_state->setProperty(CSS_HTML2PS_TABLE_BORDER, $border);
}
function attr_table_rules_after_styles(&$root, &$pipeline) {}
@@ -511,37 +509,37 @@ function attr_table_rules_after(&$root, &$pipeline) {}
function attr_table_border_before(&$root, &$pipeline) {
$width = (int)$root->get_attribute('border');
- $css_state =& $pipeline->get_current_css_state();
- $border =& $css_state->get_property(CSS_HTML2PS_TABLE_BORDER);
+ $css_state =& $pipeline->getCurrentCSSState();
+ $border =& $css_state->getProperty(CSS_HTML2PS_TABLE_BORDER);
$border =& $border->copy();
- $border->left->width = Value::fromData($width, UNIT_PX);
- $border->right->width = Value::fromData($width, UNIT_PX);
- $border->top->width = Value::fromData($width, UNIT_PX);
- $border->bottom->width = Value::fromData($width, UNIT_PX);
+ $border->left->width = (new Value())->fromData($width, UNIT_PX);
+ $border->right->width = (new Value())->fromData($width, UNIT_PX);
+ $border->top->width = (new Value())->fromData($width, UNIT_PX);
+ $border->bottom->width = (new Value())->fromData($width, UNIT_PX);
$border->left->style = BS_SOLID;
$border->right->style = BS_SOLID;
$border->top->style = BS_SOLID;
$border->bottom->style = BS_SOLID;
- $css_state->set_property(CSS_BORDER, $border);
+ $css_state->setProperty(CSS_BORDER, $border);
$css_state->pushState();
$border =& $border->copy();
- $css_state->set_property(CSS_HTML2PS_TABLE_BORDER, $border);
+ $css_state->setProperty(CSS_HTML2PS_TABLE_BORDER, $border);
}
function attr_table_border_after_styles(&$root, &$pipeline) {}
function attr_table_border_after(&$root, &$pipeline) {
- $css_state =& $pipeline->get_current_css_state();
+ $css_state =& $pipeline->getCurrentCSSState();
$css_state->popState();
}
// === dir
function attr_dir_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_TEXT_ALIGN);
+ $handler =& (new CSS())->get_handler(CSS_TEXT_ALIGN);
switch (strtolower($root->get_attribute('dir'))) {
case 'ltr':
$handler->css('left',$pipeline);
@@ -549,7 +547,7 @@ function attr_dir_before(&$root, &$pipeline) {
case 'rtl':
$handler->css('right',$pipeline);
return;
- };
+ }
}
function attr_dir_after_styles(&$root, &$pipeline) {}
@@ -557,10 +555,10 @@ function attr_dir_after(&$root, &$pipeline) {}
// === align
function attr_align_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_TEXT_ALIGN);
+ $handler =& (new CSS())->get_handler(CSS_TEXT_ALIGN);
$handler->css($root->get_attribute('align'),$pipeline);
- $handler =& CSS::get_handler(CSS_HTML2PS_ALIGN);
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_ALIGN);
$handler->css($root->get_attribute('align'),$pipeline);
}
@@ -571,7 +569,7 @@ function attr_align_after(&$root, &$pipeline) {}
// valign
// 'valign' attribute value for table rows is inherited
function attr_row_valign_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_VERTICAL_ALIGN);
+ $handler =& (new CSS())->get_handler(CSS_VERTICAL_ALIGN);
$handler->css($root->get_attribute('valign'),$pipeline);
}
function attr_row_valign_after_styles(&$root, &$pipeline) {}
@@ -579,7 +577,7 @@ function attr_row_valign_after(&$root, &$pipeline) {}
// 'valign' attribute value for boxes other than table rows is not inherited
function attr_valign_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_VERTICAL_ALIGN);
+ $handler =& (new CSS())->get_handler(CSS_VERTICAL_ALIGN);
$handler->css($root->get_attribute('valign'),
$pipeline);
}
@@ -590,7 +588,7 @@ function attr_valign_after(&$root, &$pipeline) {}
// bgcolor
function attr_bgcolor_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_BACKGROUND_COLOR);
+ $handler =& (new CSS())->get_handler(CSS_BACKGROUND_COLOR);
$handler->css($root->get_attribute('bgcolor'), $pipeline);
}
function attr_bgcolor_after_styles(&$root, &$pipeline) {}
@@ -599,10 +597,10 @@ function attr_bgcolor_after(&$root, &$pipeline) {}
// width
function attr_width_before(&$root, &$pipeline) {
- $width =& CSS::get_handler(CSS_WIDTH);
+ $width =& (new CSS())->get_handler(CSS_WIDTH);
$value = $root->get_attribute('width');
- if (preg_match('/^\d+$/', $value)) { $value .= 'px'; };
+ if (preg_match('/^\d+$/', $value)) { $value .= 'px'; }
$width->css($value,$pipeline);
}
@@ -619,10 +617,10 @@ function attr_width_after(&$root, &$pipeline) {}
// that box height - marquee or iframe, for example
function attr_height_required_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HEIGHT);
+ $handler =& (new CSS())->get_handler(CSS_HEIGHT);
$value = $root->get_attribute('height');
- if (preg_match('/^\d+$/', $value)) { $value .= 'px'; };
+ if (preg_match('/^\d+$/', $value)) { $value .= 'px'; }
$handler->css($value,$pipeline);
}
@@ -631,10 +629,10 @@ function attr_height_required_after_styles(&$root, &$pipeline) {}
function attr_height_required_after(&$root, &$pipeline) {}
function attr_height_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_MIN_HEIGHT);
+ $handler =& (new CSS())->get_handler(CSS_MIN_HEIGHT);
$value = $root->get_attribute('height');
- if (preg_match('/^\d+$/', $value)) { $value .= 'px'; };
+ if (preg_match('/^\d+$/', $value)) { $value .= 'px'; }
$handler->css($value,$pipeline);
}
@@ -648,21 +646,21 @@ function attr_font_size_before(&$root, &$pipeline) {
/**
* Check if attribute value is empty; no actions will be taken in this case
*/
- if ($size == '') { return; };
+ if ($size == '') { return; }
- if ($size{0} == '-') {
+ if ($size[0] == '-') {
$koeff = 1;
$repeats = (int)substr($size,1);
for ($i=0; $i<$repeats; $i++) {
$koeff *= 1/1.2;
- };
+ }
$newsize = sprintf('%.2fem', round($koeff, 2));
- } else if ($size{0} == '+') {
+ } else if ($size[0] == '+') {
$koeff = 1;
$repeats = (int)substr($size,1);
for ($i=0; $i<$repeats; $i++) {
$koeff *= 1.2;
- };
+ }
$newsize = sprintf('%.2fem', round($koeff, 2));
} else {
switch ((int)$size) {
@@ -690,46 +688,46 @@ function attr_font_size_before(&$root, &$pipeline) {
default:
$newsize = BASE_FONT_SIZE_PT;
break;
- };
+ }
$newsize = $newsize . 'pt';
- };
+ }
- $handler =& CSS::get_handler(CSS_FONT_SIZE);
+ $handler =& (new CSS())->get_handler(CSS_FONT_SIZE);
$handler->css($newsize, $pipeline);
}
function attr_font_size_after_styles(&$root, &$pipeline) {}
function attr_font_size_after(&$root, &$pipeline) {}
function attr_font_color_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_COLOR);
+ $handler =& (new CSS())->get_handler(CSS_COLOR);
$handler->css($root->get_attribute('color'),$pipeline);
}
function attr_font_color_after_styles(&$root, &$pipeline) {}
function attr_font_color_after(&$root, &$pipeline) {}
function attr_font_face_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_FONT_FAMILY);
+ $handler =& (new CSS())->get_handler(CSS_FONT_FAMILY);
$handler->css($root->get_attribute('face'), $pipeline);
}
function attr_font_face_after_styles(&$root, &$pipeline) {}
function attr_font_face_after(&$root, &$pipeline) {}
function attr_form_action_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HTML2PS_FORM_ACTION);
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_FORM_ACTION);
if ($root->has_attribute('action')) {
$handler->css($pipeline->guess_url($root->get_attribute('action')),$pipeline);
} else {
$handler->css(null,$pipeline);
- };
+ }
}
function attr_form_action_after_styles(&$root, &$pipeline) {}
function attr_form_action_after(&$root, &$pipeline) {}
function attr_input_name_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HTML2PS_FORM_RADIOGROUP);
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_FORM_RADIOGROUP);
if ($root->has_attribute('name')) {
$handler->css($root->get_attribute('name'),$pipeline);
- };
+ }
}
function attr_input_name_after_styles(&$root, &$pipeline) {}
function attr_input_name_after(&$root, &$pipeline) {}
@@ -738,7 +736,7 @@ function attr_input_size_before(&$root, &$pipeline) {
// Check if current node has 'size' attribute
if (!$root->has_attribute('size')) {
return;
- };
+ }
$size = $root->get_attribute('size');
// Get the exact type of the input node, as 'size' has
@@ -746,17 +744,17 @@ function attr_input_size_before(&$root, &$pipeline) {
$type = 'text';
if ($root->has_attribute('type')) {
$type = strtolower($root->get_attribute('type'));
- };
+ }
switch ($type) {
case 'text':
case 'password':
- $handler =& CSS::get_handler(CSS_WIDTH);
+ $handler =& (new CSS())->get_handler(CSS_WIDTH);
$width = sprintf('%.2fem', INPUT_SIZE_BASE_EM + $size*INPUT_SIZE_EM_KOEFF);
$handler->css($width, $pipeline);
break;
- };
-};
+ }
+}
function attr_input_size_after_styles(&$root, &$pipeline) {}
function attr_input_size_after(&$root, &$pipeline) {}
@@ -764,18 +762,18 @@ function attr_input_size_after(&$root, &$pipeline) {}
// TABLE
function attr_cellspacing_before(&$root, &$pipeline) {
- $css_state =& $pipeline->get_current_css_state();
- $handler =& CSS::get_handler(CSS_HTML2PS_CELLSPACING);
- $handler->replace(Value::fromData((int)$root->get_attribute('cellspacing'), UNIT_PX),
+ $css_state =& $pipeline->getCurrentCSSState();
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_CELLSPACING);
+ $handler->replace((new Value())->fromData((int)$root->get_attribute('cellspacing'), UNIT_PX),
$css_state);
}
function attr_cellspacing_after_styles(&$root, &$pipeline) {}
function attr_cellspacing_after(&$root, &$pipeline) {}
function attr_cellpadding_before(&$root, &$pipeline) {
- $css_state =& $pipeline->get_current_css_state();
- $handler =& CSS::get_handler(CSS_HTML2PS_CELLPADDING);
- $handler->replace(Value::fromData((int)$root->get_attribute('cellpadding'), UNIT_PX),
+ $css_state =& $pipeline->getCurrentCSSState();
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_CELLPADDING);
+ $handler->replace((new Value())->fromData((int)$root->get_attribute('cellpadding'), UNIT_PX),
$css_state);
}
function attr_cellpadding_after_styles(&$root, &$pipeline) {}
@@ -783,92 +781,25 @@ function attr_cellpadding_after(&$root, &$pipeline) {}
// UL/OL 'start' attribute
function attr_start_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HTML2PS_LIST_COUNTER);
- $css_state =& $pipeline->get_current_css_state();
+ $handler =& (new CSS())->get_handler(CSS_HTML2PS_LIST_COUNTER);
+ $css_state =& $pipeline->getCurrentCSSState();
$handler->replace((int)$root->get_attribute('start'),
$css_state);
}
function attr_start_after_styles(&$root, &$pipeline) {}
function attr_start_after(&$root, &$pipeline) {}
-// UL 'type' attribute
-//
-// For the UL element, possible values for the type attribute are
-// disc, square, and circle. The default value depends on the level of
-// nesting of the current list. These values are case-insensitive.
-//
-// How each value is presented depends on the user agent. User agents
-// should attempt to present a "disc" as a small filled-in circle, a
-// "circle" as a small circle outline, and a "square" as a small
-// square outline.
-//
-function attr_ul_type_before(&$root, &$pipeline) {
- $type = (string)$root->get_attribute('type');
- $handler =& CSS::get_handler(CSS_LIST_STYLE_TYPE);
- $css_state =& $pipeline->get_current_css_state();
-
- switch (strtolower($type)) {
- case 'disc':
- $handler->replace(LST_DISC, $css_state);
- break;
- case 'circle':
- $handler->replace(LST_CIRCLE, $css_state);
- break;
- case 'square':
- $handler->replace(LST_SQUARE, $css_state);
- break;
- };
-}
-function attr_ul_type_after_styles(&$root, &$pipeline) {}
-function attr_ul_type_after(&$root, &$pipeline) {}
-
-// OL 'type' attribute
-//
-// For the OL element, possible values for the type attribute are summarized in the table below (they are case-sensitive):
-// Type Numbering style
-// 1 arabic numbers 1, 2, 3, ...
-// a lower alpha a, b, c, ...
-// A upper alpha A, B, C, ...
-// i lower roman i, ii, iii, ...
-// I upper roman I, II, III, ...
-//
-function attr_ol_type_before(&$root, &$pipeline) {
- $type = (string)$root->get_attribute('type');
- $handler =& CSS::get_handler(CSS_LIST_STYLE_TYPE);
- $css_state =& $pipeline->get_current_css_state();
-
- switch ($type) {
- case '1':
- $handler->replace(LST_DECIMAL, $css_state);
- break;
- case 'a':
- $handler->replace(LST_LOWER_LATIN, $css_state);
- break;
- case 'A':
- $handler->replace(LST_UPPER_LATIN, $css_state);
- break;
- case 'i':
- $handler->replace(LST_LOWER_ROMAN, $css_state);
- break;
- case 'I':
- $handler->replace(LST_UPPER_ROMAN, $css_state);
- break;
- };
-}
-function attr_ol_type_after_styles(&$root, &$pipeline) {}
-function attr_ol_type_after(&$root, &$pipeline) {}
-
// Textarea
function attr_textarea_rows_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_HEIGHT);
+ $handler =& (new CSS())->get_handler(CSS_HEIGHT);
$handler->css(sprintf('%dem', (int)$root->get_attribute('rows')*1.40),$pipeline);
}
function attr_textarea_rows_after_styles(&$root, &$pipeline) {}
function attr_textarea_rows_after(&$root, &$pipeline) {}
function attr_textarea_cols_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_WIDTH);
+ $handler =& (new CSS())->get_handler(CSS_WIDTH);
$handler->css(sprintf('%dem', (int)$root->get_attribute('cols')*0.675),$pipeline);
}
function attr_textarea_cols_after_styles(&$root, &$pipeline) {}
@@ -878,7 +809,7 @@ function attr_textarea_cols_after(&$root, &$pipeline) {}
* HR-specific attributes
*/
function attr_hr_color_before(&$root, &$pipeline) {
- $handler =& CSS::get_handler(CSS_BORDER_COLOR);
+ $handler =& (new CSS())->get_handler(CSS_BORDER_COLOR);
$handler->css($root->get_attribute('color'), $pipeline);
}
function attr_hr_color_after_styles(&$root, &$pipeline) {}
diff --git a/public_html/html.list.inc.php b/public_html/html.list.inc.php
new file mode 100644
index 0000000..fab5785
--- /dev/null
+++ b/public_html/html.list.inc.php
@@ -0,0 +1,37 @@
+
\ No newline at end of file
diff --git a/public_html/html2pdf.php b/public_html/html2pdf.php
new file mode 100644
index 0000000..5fad914
--- /dev/null
+++ b/public_html/html2pdf.php
@@ -0,0 +1,105 @@
+PDF conversion with default settings
+ *
+ * Warning: if you have any files (like CSS stylesheets and/or images referenced by this file,
+ * use absolute links (like http://my.host/image.gif).
+ *
+ * @param $path_to_html String path to source html file.
+ * @param $path_to_pdf String path to file to save generated PDF to.
+ */
+
+
+/**
+* Handles the saving generated PDF to user-defined output file on server
+*/
+class MyDestinationFile extends Destination {
+ /**
+ * @var String result file name / path
+ * @access private
+ */
+ var $_dest_filename;
+
+ function __construct($dest_filename) {
+ $this->_dest_filename = $dest_filename;
+ }
+
+ function process($tmp_filename, $content_type) {
+ copy($tmp_filename, $this->_dest_filename);
+ }
+}
+
+class MyFetcherLocalFile extends Fetcher {
+ var $_content;
+
+ function __construct($file) {
+ $this->_content = file_get_contents($file);
+ }
+
+ function get_data($dummy1) {
+ return new FetchedDataURL($this->_content, array(), "");
+ }
+
+ function get_base_url() {
+ return "";
+ }
+}
+
+function convert_to_pdf($path_to_html, $path_to_pdf, $margin_left=20, $margin_right=20, $margin_top = 30, $margin_bottom=50) {
+ global $aAllgEinstellungen;
+ini_set("memory_limit", "150M");
+
+
+ $pipeline = (new PipelineFactory())->create_default_pipeline("", // Attempt to auto-detect encoding
+ "");
+
+ // Override HTML source
+ $pipeline->fetchers[] = new MyFetcherLocalFile($path_to_html);
+
+ // Override destination to local file
+ $pipeline->destination = new MyDestinationFile($path_to_pdf);
+
+ $baseurl = "";
+ $media = (new Media())->predefined("A4");
+ $media->set_landscape(false);
+
+
+ if(!empty($aAllgEinstellungen['pdf_border_left'])) $margin_left = $aAllgEinstellungen['pdf_border_left'];
+ if(!empty($aAllgEinstellungen['pdf_border_right'])) $margin_right = $aAllgEinstellungen['pdf_border_right'];
+ if(!empty($aAllgEinstellungen['pdf_border_top'])) $margin_top = $aAllgEinstellungen['pdf_border_top'];
+ if(!empty($aAllgEinstellungen['pdf_border_bottom'])) $margin_bottom = $aAllgEinstellungen['pdf_border_bottom'];
+
+
+ $media->set_margins(array('left' => $margin_left,
+ 'right' => $margin_right,
+ 'top' => $margin_top,
+ 'bottom' => $margin_bottom));
+ $media->set_pixels(1024);
+
+ global $g_config;
+ $g_config = array(
+ 'cssmedia' => 'screen',
+ 'renderimages' => true,
+ 'renderlinks' => true,
+ 'renderfields' => true,
+ 'renderforms' => false,
+ 'mode' => 'html',
+ 'encoding' => '',
+ 'debugbox' => false,
+ 'pdfversion' => '1.4',
+ 'draw_page_border' => false
+ );
+
+ global $g_px_scale;
+ $g_px_scale = mm2pt($media->width() - $media->margins['left'] - $media->margins['right']) / $media->pixels;
+ global $g_pt_scale;
+ $g_pt_scale = $g_px_scale * 1.43;
+
+
+ $pipeline->process($baseurl, $media);
+ unset($pipeline);
+}
+
+?>
\ No newline at end of file
diff --git a/public_html/html2ps.config b/public_html/html2ps.config
index 00fdfb2..89419da 100644
--- a/public_html/html2ps.config
+++ b/public_html/html2ps.config
@@ -1,162 +1,195 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public_html/html2ps.config.recommended b/public_html/html2ps.config.recommended
index 235476f..76b871b 100644
--- a/public_html/html2ps.config.recommended
+++ b/public_html/html2ps.config.recommended
@@ -1,187 +1,187 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public_html/html2ps.php b/public_html/html2ps.php
new file mode 100644
index 0000000..4d8c401
--- /dev/null
+++ b/public_html/html2ps.php
@@ -0,0 +1,215 @@
+ isset($_REQUEST['cssmedia']) ? $_REQUEST['cssmedia'] : "screen",
+ 'media' => isset($_REQUEST['media']) ? $_REQUEST['media'] : "A4",
+ 'scalepoints' => isset($_REQUEST['scalepoints']),
+ 'renderimages' => isset($_REQUEST['renderimages']),
+ 'renderfields' => isset($_REQUEST['renderfields']),
+ 'renderforms' => isset($_REQUEST['renderforms']),
+ 'pslevel' => isset($_REQUEST['pslevel']) ? $_REQUEST['pslevel'] : 3,
+ 'renderlinks' => isset($_REQUEST['renderlinks']),
+ 'pagewidth' => isset($_REQUEST['pixels']) ? (int)$_REQUEST['pixels'] : 800,
+ 'landscape' => isset($_REQUEST['landscape']),
+ 'method' => isset($_REQUEST['method']) ? $_REQUEST['method'] : "fpdf" ,
+ 'margins' => array(
+ 'left' => isset($_REQUEST['leftmargin']) ? (int)$_REQUEST['leftmargin'] : 0,
+ 'right' => isset($_REQUEST['rightmargin']) ? (int)$_REQUEST['rightmargin'] : 0,
+ 'top' => isset($_REQUEST['topmargin']) ? (int)$_REQUEST['topmargin'] : 0,
+ 'bottom' => isset($_REQUEST['bottommargin']) ? (int)$_REQUEST['bottommargin'] : 0
+ ),
+ 'encoding' => isset($_REQUEST['encoding']) ? $_REQUEST['encoding'] : "",
+ 'ps2pdf' => isset($_REQUEST['ps2pdf']),
+ 'compress' => isset($_REQUEST['compress']),
+ 'output' => isset($_REQUEST['output']) ? $_REQUEST['output'] : 0,
+ 'pdfversion' => isset($_REQUEST['pdfversion']) ? $_REQUEST['pdfversion'] : "1.2",
+ 'transparency_workaround' => isset($_REQUEST['transparency_workaround']),
+ 'imagequality_workaround' => isset($_REQUEST['imagequality_workaround']),
+ 'draw_page_border' => isset($_REQUEST['pageborder']),
+ 'debugbox' => isset($_REQUEST['debugbox']),
+ 'html2xhtml' => !isset($_REQUEST['html2xhtml']),
+ 'mode' => 'html'
+ );
+
+ // ========== Entry point
+ parse_config_file('./html2ps.config');
+
+// validate input data
+if ($g_config['pagewidth'] == 0) {
+ die("Please specify non-zero value for the pixel width!");
+}
+
+// begin processing
+
+$g_media = (new Media())->predefined($g_config['media']);
+$g_media->set_landscape($g_config['landscape']);
+$g_media->set_margins($g_config['margins']);
+$g_media->set_pixels($g_config['pagewidth']);
+
+
+
+$g_px_scale = mm2pt($g_media->width() - $g_media->margins['left'] - $g_media->margins['right']) / $g_media->pixels;
+if ($g_config['scalepoints']) {
+ $g_pt_scale = $g_px_scale * 1.43; // This is a magic number, just don't touch it, or everything will explode!
+} else {
+ $g_pt_scale = 1.0;
+}
+
+// Initialize the coversion pipeline
+$pipeline = new Pipeline();
+
+// Configure the fetchers
+$pipeline->fetchers[] = new FetcherURL();
+
+// Configure the data filters
+$pipeline->data_filters[] = new DataFilterDoctype();
+$pipeline->data_filters[] = new DataFilterUTF8($g_config['encoding']);
+if ($g_config['html2xhtml']) {
+ $pipeline->data_filters[] = new DataFilterHTML2XHTML();
+} else {
+ $pipeline->data_filters[] = new DataFilterXHTML2XHTML();
+}
+
+$pipeline->parser = new ParserXHTML();
+
+// "PRE" tree filters
+
+$pipeline->pre_tree_filters = array();
+
+$header_html = isset($_REQUEST['headerhtml']) ? $_REQUEST['headerhtml'] : "";
+$footer_html = isset($_REQUEST['footerhtml']) ? $_REQUEST['footerhtml'] : "";
+$pipeline->pre_tree_filters[] = new PreTreeFilterHeaderFooter($header_html, $footer_html);
+
+if ($g_config['renderfields']) {
+ $pipeline->pre_tree_filters[] = new PreTreeFilterHTML2PSFields();
+}
+
+//
+
+if ($g_config['method'] === 'ps') {
+ $pipeline->layout_engine = new LayoutEnginePS();
+} else {
+ $pipeline->layout_engine = new LayoutEngineDefault();
+}
+
+$pipeline->post_tree_filters = array();
+
+// Configure the output format
+if ($g_config['pslevel'] == 3) {
+ $image_encoder = new PSL3ImageEncoderStream();
+} else {
+ $image_encoder = new PSL2ImageEncoderStream();
+}
+
+switch ($g_config['method']) {
+ case 'fastps':
+ if ($g_config['pslevel'] == 3) {
+ $pipeline->output_driver = new OutputDriverFastPS($image_encoder);
+ } else {
+ $pipeline->output_driver = new OutputDriverFastPSLevel2($image_encoder);
+ }
+ break;
+ case 'pdflib':
+ $pipeline->output_driver = new OutputDriverPDFLIB($g_config['pdfversion']);
+ break;
+ case 'fpdf':
+ $pipeline->output_driver = new OutputDriverFPDF();
+ break;
+ default:
+ die("Unknown output method");
+}
+
+// Setup watermark
+$watermark_html = isset($_REQUEST['watermarkhtml']) ? $_REQUEST['watermarkhtml'] : "";
+$pipeline->output_driver->set_watermark($watermark_html);
+
+if ($g_config['debugbox']) {
+ $pipeline->output_driver->set_debug_boxes(true);
+}
+
+if ($g_config['draw_page_border']) {
+ $pipeline->output_driver->set_show_page_border(true);
+}
+
+if ($g_config['ps2pdf']) {
+ $pipeline->output_filters[] = new OutputFilterPS2PDF($g_config['pdfversion']);
+}
+
+if ($g_config['compress']) {
+ $pipeline->output_filters[] = new OutputFilterGZip();
+}
+
+switch ($g_config['output']) {
+ case 0:
+ $pipeline->destination = new DestinationBrowser($g_baseurl);
+ break;
+ case 1:
+ $pipeline->destination = new DestinationDownload($g_baseurl);
+ break;
+ case 2:
+ $pipeline->destination = new DestinationFile($g_baseurl);
+ break;
+}
+
+// Start the conversion
+
+$time = time();
+if ($_REQUEST['process_mode'] == 'batch') {
+ $batch = $_REQUEST['batch'];
+
+ for ($i=0; $iprocess_batch($batch, $g_media);
+ }
+ }
+
+} else {
+
+ $status = $pipeline->process($g_baseurl, $g_media);exit("5");
+ exit('hallo welt11');
+ exit("6");
+}
+
+error_log(sprintf("Processing of '%s' completed in %u seconds", $g_baseurl, time() - $time));
+
+if ($status == null) {
+ print($pipeline->error_message());
+ error_log("Error in conversion pipeline");
+ die();
+}
+
+?>
\ No newline at end of file
diff --git a/public_html/image.class.php b/public_html/image.class.php
index 0249f31..c661097 100644
--- a/public_html/image.class.php
+++ b/public_html/image.class.php
@@ -14,151 +14,123 @@
$GLOBALS['g_image_cache'] = array();
class Image {
- var $_handle;
- var $_filename;
- var $_type;
-
- function Image($handle, $filename, $type) {
- $this->_handle = $handle;
- $this->_filename = $filename;
- $this->_type = $type;
- }
-
- function get_filename() {
- return $this->_filename;
- }
-
- function get_handle() {
- return $this->_handle;
- }
-
- function get_type() {
- return $this->_type;
- }
-
- function sx() {
- if (!$this->_handle) {
- return 0;
- };
-
- return imagesx($this->_handle);
- }
-
- function sy() {
- if (!$this->_handle) {
- return 0;
- };
-
- return imagesy($this->_handle);
- }
-}
-
-class ImageFactory {
// Static funcion; checks if given URL is already cached and either returns
// cached object or downloads the requested image
//
function get($url, &$pipeline) {
- global $g_config, $g_image_cache;
- if (!$g_config['renderimages']) {
- return null;
- };
-
- // Check if this URL have been cached
- //
- if (isset($g_image_cache[$url])) {
- // return do_image_open($g_image_cache[$url]);
- return $g_image_cache[$url];
- };
-
- // Download image; we should do it before we call do_image_open,
- // as it tries to open image file twice: first to determine image type
- // and second to actually create the image - PHP url wrappers do no caching
- // at all
- //
- $filename = ImageFactory::make_cache_filename($url);
-
- // REQUIRES: PHP 4.3.0+
- // we suppress warning messages, as missing image files will cause 'copy' to print
- // several warnings
- //
- // @TODO: change to fetcher class call
- //
-
- // simplify our url by fetcher simlify functionality
- $url = FetcherUrl::_simplify_path($url);
- $data = $pipeline->fetch($url);
-
- if (is_null($data)) {
- trigger_error("Cannot fetch image: ".$url, E_USER_WARNING);
- return null;
- };
-
- $file = fopen($filename, 'wb');
- fwrite($file, $data->content);
- fclose($file);
- $pipeline->pop_base_url();
-
- // register it in the cached objects array
- //
- $handle = do_image_open($filename, $type);
- if ($handle) {
- $g_image_cache[$url] =& new Image($handle,
- $filename,
- $type);
- } else {
- $g_image_cache[$url] = null;
- };
- // return image
- //
- // return do_image_open($filename);
- return $g_image_cache[$url];
+ global $g_config;
+ if (!$g_config['renderimages']) { return null; }
+
+ global $g_image_cache;
+
+ // Check if this URL have been cached
+ //
+ if (isset($g_image_cache[$url])) {
+ // return do_image_open($g_image_cache[$url]);
+ return $g_image_cache[$url]['handle'];
+ }
+
+ // Download image; we should do it before we call do_image_open,
+ // as it tries to open image file twice: first to determine image type
+ // and second to actually create the image - PHP url wrappers do no caching
+ // at all
+ //
+ $filename = (new Image())->make_cache_filename($url);
+
+ // REQUIRES: PHP 4.3.0+
+ // we suppress warning messages, as missing image files will cause 'copy' to print
+ // several warnings
+ //
+ // @TODO: change to fetcher class call
+ //
+
+ $data = $pipeline->fetch($url);
+
+
+ if(empty($data->content)){
+ $str_file = str_replace("http://www.druckerei-verwaltung.de", PATH . "/htdocs_admin", $url);
+
+ $handle = fopen($str_file, 'r');
+ $data->content = fread($handle, filesize($str_file));
+ fclose($handle);
+ }
+ #echo "";
+ #print_r($data);
+ #echo " ";
+ #exit;
+
+ if (is_null($data)) {
+ error_log("Cannot fetch image: ".$url);
+ return null;
+ }
+
+ $file = fopen($filename, 'wb');
+ fwrite($file, $data->content);
+ fclose($file);
+ $pipeline->pop_base_url();
+
+// if (!@copy($url, $filename)) {
+// error_log("Cannot fetch image: ".$url);
+// return null;
+// }
+
+ // register it in the cached objects array
+ //
+ // $g_image_cache[$url] = $filename;
+ $g_image_cache[$url] = array('filename' => $filename,
+ 'handle' => do_image_open($filename));
+
+ // return image
+ //
+ // return do_image_open($filename);
+ return $g_image_cache[$url]['handle'];
}
// Makes the filename to contain the cached version of URL
//
function make_cache_filename($url) {
- // We cannot use the $url as an cache image name as it could be longer than
- // allowed file name length (especially after escaping specialy symbols)
- // thus, we generate long almost random 32-character name using the md5 hash function
- //
- return CACHE_DIR.md5(time() + $url + rand());
+ // We cannot use the $url as an cache image name as it could be longer than
+ // allowed file name length (especially after escaping specialy symbols)
+ // thus, we generate long almost random 32-character name using the md5 hash function
+ //
+ return CACHE_DIR.md5(time() . $url . rand());
}
// Checks if cache directory is available
//
function check_cache_dir() {
- // TODO: some cool easily understandable error message for the case
- // image cache directory cannot be created or accessed
-
- // Check if CACHE_DIR exists
- //
- if (!is_dir(CACHE_DIR)) {
- // Cache directory does not exists; try to create it (with read/write rightss for the owner only)
- //
- if (!mkdir(CACHE_DIR, 0700)) { die("Cache directory cannot be created"); }
- };
-
- // Check if we can read and write to the CACHE_DIR
- //
- // Note that directory should have 'rwx' (7) permission, so the script will
- // be able to list directory contents; under Windows is_executable always returns false
- // for directories, so we need to drop this check in this case.
- //
- // A user's note for 'is_executable' function on PHP5:
- // "The change doesn't appear to be documented, so I thought I would mention it.
- // In php5, as opposed to php4, you can no longer rely on is_executable to check the executable bit
- // on a directory in 'nix. You can still use the first note's method to check if a directory is traversable:
- // @file_exists("adirectory/.");"
- //
- if (!is_readable(CACHE_DIR) ||
- !is_writeable(CACHE_DIR) ||
- (!@file_exists(CACHE_DIR.'.'))) {
- // omg. Cache directory exists, but useless
- //
- die("Check cache directory permissions; cannot either read or write to directory cache");
- };
-
- return;
+ // TODO: some cool easily understandable error message for the case
+ // image cache directory cannot be created or accessed
+
+ // Check if CACHE_DIR exists
+ //
+ if (!is_dir(CACHE_DIR)) {
+ // Cache directory does not exists; try to create it (with read/write rightss for the owner only)
+ //
+ if (!mkdir(CACHE_DIR, 0700)) { die("Cache directory cannot be created"); }
+ }
+
+ // Check if we can read and write to the CACHE_DIR
+ //
+ // Note that directory should have 'rwx' (7) permission, so the script will
+ // be able to list directory contents; under Windows is_executable always returns false
+ // for directories, so we need to drop this check in this case.
+ //
+ // A user's note for 'is_executable' function on PHP5:
+ // "The change doesn't appear to be documented, so I thought I would mention it.
+ // In php5, as opposed to php4, you can no longer rely on is_executable to check the executable bit
+ // on a directory in 'nix. You can still use the first note's method to check if a directory is traversable:
+ // @file_exists("adirectory/.");"
+ //
+ if (!is_readable(CACHE_DIR) ||
+ !is_writeable(CACHE_DIR) ||
+ (!@file_exists(CACHE_DIR.'.'))) {
+ // omg. Cache directory exists, but useless
+ //
+ die("Check cache directory permissions; cannot either read or write to directory cache");
+ }
+
+ return;
}
// Clears the image cache (as we're neither implemented checking of Last-Modified HTTP header nor
@@ -167,12 +139,10 @@ function check_cache_dir() {
// TODO: Will cause problems with simultaneous access to the same images
//
function clear_cache() {
- foreach ($GLOBALS['g_image_cache'] as $key => $value) {
- if (!is_null($value) && is_file($value->get_filename())) {
- unlink($value->get_filename());
- };
- };
- $g_image_cache = array();
+ foreach ($GLOBALS['g_image_cache'] as $key => $value) {
+ unlink($value['filename']);
+ }
+ $g_image_cache = array();
}
}
-?>
+?>
\ No newline at end of file
diff --git a/public_html/inline.content.builder.factory.php b/public_html/inline.content.builder.factory.php
index e1123c0..ea9e477 100644
--- a/public_html/inline.content.builder.factory.php
+++ b/public_html/inline.content.builder.factory.php
@@ -5,27 +5,27 @@ function &get($whitespace) {
switch ($whitespace) {
case WHITESPACE_NORMAL:
require_once(HTML2PS_DIR.'inline.content.builder.normal.php');
- $builder =& new InlineContentBuilderNormal();
+ $builder= new InlineContentBuilderNormal();
break;
case WHITESPACE_PRE:
require_once(HTML2PS_DIR.'inline.content.builder.pre.php');
- $builder =& new InlineContentBuilderPre();
+ $builder= new InlineContentBuilderPre();
break;
case WHITESPACE_NOWRAP:
require_once(HTML2PS_DIR.'inline.content.builder.nowrap.php');
- $builder =& new InlineContentBuilderNowrap();
+ $builder= new InlineContentBuilderNowrap();
break;
case WHITESPACE_PRE_WRAP:
require_once(HTML2PS_DIR.'inline.content.builder.pre.wrap.php');
- $builder =& new InlineContentBuilderPreWrap();
+ $builder= new InlineContentBuilderPreWrap();
break;
case WHITESPACE_PRE_LINE:
require_once(HTML2PS_DIR.'inline.content.builder.pre.line.php');
- $builder =& new InlineContentBuilderPreLine();
+ $builder= new InlineContentBuilderPreLine();
break;
default:
trigger_error('Internal error: unknown whitespace enumeration value', E_USER_ERROR);
- };
+ }
return $builder;
}
diff --git a/public_html/inline.content.builder.normal.php b/public_html/inline.content.builder.normal.php
index 171d817..ec88c4e 100644
--- a/public_html/inline.content.builder.normal.php
+++ b/public_html/inline.content.builder.normal.php
@@ -3,8 +3,8 @@
require_once(HTML2PS_DIR.'inline.content.builder.php');
class InlineContentBuilderNormal extends InlineContentBuilder {
- function InlineContentBuilderNormal() {
- $this->InlineContentBuilder();
+ function __construct() {
+ InlineContentBuilder::__construct();
}
/**
@@ -20,40 +20,32 @@ function build(&$box, $text, &$pipeline) {
// Whitespace-only text nodes sill result on only one whitespace box
if (trim($content) === '') {
- $whitespace =& WhitespaceBox::create($pipeline);
+ $whitespace =& (new WhitespaceBox())->create('', '', $pipeline);
$box->add_child($whitespace);
return;
}
// Add leading whispace box, if content stars with a space
- if (preg_match('/ /u', substr($content,0,1))) {
- $whitespace =& WhitespaceBox::create($pipeline);
+ if (preg_match('/ /u',substr($content,0,1))) {
+ $whitespace =& (new WhitespaceBox())->create('', '', $pipeline);
$box->add_child($whitespace);
}
$words = $this->break_into_words($content);
- $size = count($words);
+ $size = count((array) $words);
$pos = 0;
-
- // Check if text content has trailing whitespace
- $last_whitespace = substr($content, strlen($content) - 1, 1) == ' ';
-
+ $last_whitespace = substr(strlen($content)-1, 1);
foreach ($words as $word) {
$box->process_word($word, $pipeline);
$pos++;
$is_last_word = ($pos == $size);
-
- // Whitespace boxes should be added
- // 1) between words
- // 2) after the last word IF there was a space at the content end
- if (!$is_last_word ||
- $last_whitespace) {
- $whitespace =& WhitespaceBox::create($pipeline);
+ if (!$is_last_word || $last_whitespace) {
+ $whitespace =& (new WhitespaceBox())->create('', '', $pipeline);
$box->add_child($whitespace);
- };
- };
+ }
+ }
}
}
diff --git a/public_html/inline.content.builder.nowrap.php b/public_html/inline.content.builder.nowrap.php
index 885e416..e5b30f5 100644
--- a/public_html/inline.content.builder.nowrap.php
+++ b/public_html/inline.content.builder.nowrap.php
@@ -3,8 +3,8 @@
require_once(HTML2PS_DIR.'inline.content.builder.php');
class InlineContentBuilderNowrap extends InlineContentBuilder {
- function InlineContentBuilderNowrap() {
- $this->InlineContentBuilder();
+ function __construct() {
+ InlineContentBuilder::__construct();
}
/**
diff --git a/public_html/inline.content.builder.php b/public_html/inline.content.builder.php
index dddd405..51fb796 100644
--- a/public_html/inline.content.builder.php
+++ b/public_html/inline.content.builder.php
@@ -2,748 +2,16 @@
require_once(HTML2PS_DIR.'error.php');
-// Non-tailorable Line Breaking Classes
-define('UC_LINE_BREAK_BK', 1);
-define('UC_LINE_BREAK_CR', 2);
-define('UC_LINE_BREAK_LF', 3);
-define('UC_LINE_BREAK_CM', 4);
-define('UC_LINE_BREAK_NL', 5);
-define('UC_LINE_BREAK_SG', 6);
-define('UC_LINE_BREAK_WJ', 7);
-define('UC_LINE_BREAK_ZW', 8);
-define('UC_LINE_BREAK_GL', 9);
-define('UC_LINE_BREAK_SP', 10);
-
-// Break opportunities
-define('UC_LINE_BREAK_B2', 11);
-define('UC_LINE_BREAK_BA', 12);
-define('UC_LINE_BREAK_BB', 13);
-define('UC_LINE_BREAK_HY', 14);
-define('UC_LINE_BREAK_CB', 15);
-
-// Characters Prohibiting Certain Breaks
-define('UC_LINE_BREAK_CL', 16);
-define('UC_LINE_BREAK_EX', 17);
-define('UC_LINE_BREAK_IN', 18);
-define('UC_LINE_BREAK_NS', 19);
-define('UC_LINE_BREAK_OP', 20);
-define('UC_LINE_BREAK_QU', 21);
-
-// Numeric Context
-define('UC_LINE_BREAK_IS', 22);
-define('UC_LINE_BREAK_NU', 23);
-define('UC_LINE_BREAK_PO', 24);
-define('UC_LINE_BREAK_PR', 25);
-define('UC_LINE_BREAK_SY', 26);
-
-// Other Characters
-define('UC_LINE_BREAK_AI', 27);
-define('UC_LINE_BREAK_AL', 28);
-define('UC_LINE_BREAK_H2', 29);
-define('UC_LINE_BREAK_H3', 30);
-define('UC_LINE_BREAK_ID', 31);
-define('UC_LINE_BREAK_JL', 32);
-define('UC_LINE_BREAK_JV', 33);
-define('UC_LINE_BREAK_JT', 34);
-define('UC_LINE_BREAK_SA', 35);
-define('UC_LINE_BREAK_XX', 36);
-
-// Break modes
-define('LB_PROHIBITED', 1);
-define('LB_INDIRECT', 2);
-define('LB_PROHIBITED_CM', 3);
-define('LB_INDIRECT_CM', 4);
-define('LB_DIRECT', 5);
-define('LB_EXPLICIT', 6);
-
-$GLOBALS['_g_line_break_class_table'] =
-array(UC_LINE_BREAK_OP => array(UC_LINE_BREAK_OP => LB_PROHIBITED,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_PROHIBITED,
- UC_LINE_BREAK_GL => LB_PROHIBITED,
- UC_LINE_BREAK_NS => LB_PROHIBITED,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_PROHIBITED,
- UC_LINE_BREAK_PO => LB_PROHIBITED,
- UC_LINE_BREAK_NU => LB_PROHIBITED,
- UC_LINE_BREAK_AL => LB_PROHIBITED,
- UC_LINE_BREAK_ID => LB_PROHIBITED,
- UC_LINE_BREAK_IN => LB_PROHIBITED,
- UC_LINE_BREAK_HY => LB_PROHIBITED,
- UC_LINE_BREAK_BA => LB_PROHIBITED,
- UC_LINE_BREAK_BB => LB_PROHIBITED,
- UC_LINE_BREAK_B2 => LB_PROHIBITED,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_PROHIBITED_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_PROHIBITED,
- UC_LINE_BREAK_H3 => LB_PROHIBITED,
- UC_LINE_BREAK_JL => LB_PROHIBITED,
- UC_LINE_BREAK_JV => LB_PROHIBITED,
- UC_LINE_BREAK_JT => LB_PROHIBITED),
- UC_LINE_BREAK_CL => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_PROHIBITED,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_INDIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_QU => array(UC_LINE_BREAK_OP => LB_PROHIBITED,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_INDIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_INDIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_INDIRECT,
- UC_LINE_BREAK_B2 => LB_INDIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_INDIRECT,
- UC_LINE_BREAK_H3 => LB_INDIRECT,
- UC_LINE_BREAK_JL => LB_INDIRECT,
- UC_LINE_BREAK_JV => LB_INDIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT),
- UC_LINE_BREAK_GL => array(UC_LINE_BREAK_OP => LB_INDIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_INDIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_INDIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_INDIRECT,
- UC_LINE_BREAK_B2 => LB_INDIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_INDIRECT,
- UC_LINE_BREAK_H3 => LB_INDIRECT,
- UC_LINE_BREAK_JL => LB_INDIRECT,
- UC_LINE_BREAK_JV => LB_INDIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT),
- UC_LINE_BREAK_NS => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_EX => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_SY => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_IS => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_PR => array(UC_LINE_BREAK_OP => LB_INDIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_INDIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_INDIRECT,
- UC_LINE_BREAK_H3 => LB_INDIRECT,
- UC_LINE_BREAK_JL => LB_INDIRECT,
- UC_LINE_BREAK_JV => LB_INDIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT),
- UC_LINE_BREAK_PO => array(UC_LINE_BREAK_OP => LB_INDIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_NU => array(UC_LINE_BREAK_OP => LB_INDIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_INDIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_AL => array(UC_LINE_BREAK_OP => LB_INDIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_ID => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_IN => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_HY => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_BA => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_BB => array(UC_LINE_BREAK_OP => LB_INDIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_INDIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_INDIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_INDIRECT,
- UC_LINE_BREAK_B2 => LB_INDIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_INDIRECT,
- UC_LINE_BREAK_H3 => LB_INDIRECT,
- UC_LINE_BREAK_JL => LB_INDIRECT,
- UC_LINE_BREAK_JV => LB_INDIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT),
- UC_LINE_BREAK_B2 => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_PROHIBITED,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_ZW => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_DIRECT,
- UC_LINE_BREAK_QU => LB_DIRECT,
- UC_LINE_BREAK_GL => LB_DIRECT,
- UC_LINE_BREAK_NS => LB_DIRECT,
- UC_LINE_BREAK_EX => LB_DIRECT,
- UC_LINE_BREAK_SY => LB_DIRECT,
- UC_LINE_BREAK_IS => LB_DIRECT,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_DIRECT,
- UC_LINE_BREAK_HY => LB_DIRECT,
- UC_LINE_BREAK_BA => LB_DIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_DIRECT,
- UC_LINE_BREAK_WJ => LB_DIRECT,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_CM => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_DIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_WJ => array(UC_LINE_BREAK_OP => LB_INDIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_INDIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_INDIRECT,
- UC_LINE_BREAK_AL => LB_INDIRECT,
- UC_LINE_BREAK_ID => LB_INDIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_INDIRECT,
- UC_LINE_BREAK_B2 => LB_INDIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_INDIRECT,
- UC_LINE_BREAK_H3 => LB_INDIRECT,
- UC_LINE_BREAK_JL => LB_INDIRECT,
- UC_LINE_BREAK_JV => LB_INDIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT),
- UC_LINE_BREAK_H2 => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_INDIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT),
- UC_LINE_BREAK_H3 => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT),
- UC_LINE_BREAK_JL => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_INDIRECT,
- UC_LINE_BREAK_H3 => LB_INDIRECT,
- UC_LINE_BREAK_JL => LB_INDIRECT,
- UC_LINE_BREAK_JV => LB_INDIRECT,
- UC_LINE_BREAK_JT => LB_DIRECT),
- UC_LINE_BREAK_JV => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_INDIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT),
- UC_LINE_BREAK_JT => array(UC_LINE_BREAK_OP => LB_DIRECT,
- UC_LINE_BREAK_CL => LB_PROHIBITED,
- UC_LINE_BREAK_QU => LB_INDIRECT,
- UC_LINE_BREAK_GL => LB_INDIRECT,
- UC_LINE_BREAK_NS => LB_INDIRECT,
- UC_LINE_BREAK_EX => LB_PROHIBITED,
- UC_LINE_BREAK_SY => LB_PROHIBITED,
- UC_LINE_BREAK_IS => LB_PROHIBITED,
- UC_LINE_BREAK_PR => LB_DIRECT,
- UC_LINE_BREAK_PO => LB_INDIRECT,
- UC_LINE_BREAK_NU => LB_DIRECT,
- UC_LINE_BREAK_AL => LB_DIRECT,
- UC_LINE_BREAK_ID => LB_DIRECT,
- UC_LINE_BREAK_IN => LB_INDIRECT,
- UC_LINE_BREAK_HY => LB_INDIRECT,
- UC_LINE_BREAK_BA => LB_INDIRECT,
- UC_LINE_BREAK_BB => LB_DIRECT,
- UC_LINE_BREAK_B2 => LB_DIRECT,
- UC_LINE_BREAK_ZW => LB_PROHIBITED,
- UC_LINE_BREAK_CM => LB_INDIRECT_CM,
- UC_LINE_BREAK_WJ => LB_PROHIBITED,
- UC_LINE_BREAK_H2 => LB_DIRECT,
- UC_LINE_BREAK_H3 => LB_DIRECT,
- UC_LINE_BREAK_JL => LB_DIRECT,
- UC_LINE_BREAK_JV => LB_DIRECT,
- UC_LINE_BREAK_JT => LB_INDIRECT));
-
/**
* See CSS 2.1 16.6.1 The 'white-space' processing model
*/
class InlineContentBuilder {
- function InlineContentBuilder() {
+ function __construct() {
}
function add_line_break(&$box, &$pipeline) {
- $break_box =& new BRBox();
- $break_box->readCSS($pipeline->get_current_css_state());
+ $break_box= new BRBox();
+ $break_box->readCSS($pipeline->getCurrentCSSState());
$box->add_child($break_box);
}
@@ -756,282 +24,7 @@ function break_into_lines($content) {
}
function break_into_words($content) {
- $content = trim($content);
- if ($content == '') {
- return array();
- };
-
- // Extract Unicode characters from the raw content data
- $ptr = 0;
- $utf8_chars = array();
- $ucs2_chars = array();
- $size = strlen($content);
- while ($ptr < $size) {
- $utf8_char = ManagerEncoding::get_next_utf8_char($content, $ptr);
- $utf8_chars[] = $utf8_char;
- $ucs2_chars[] = utf8_to_code($utf8_char);
- };
-
- // Get unicode line breaking classes
- $classes = array_map(array($this, 'get_line_break_class'), $ucs2_chars);
- $this->find_line_break($classes, $breaks, count($classes));
-
- // Make words array
- $words = array();
- $word = '';
- for ($i = 0, $size = count($breaks); $i < $size; $i++) {
- $word .= $utf8_chars[$i];
-
- $break = $breaks[$i];
- if ($break == LB_INDIRECT ||
- $break == LB_INDIRECT_CM ||
- $break == LB_DIRECT ||
- $break == LB_EXPLICIT) {
- $words[] = trim($word);
- $word = '';
- };
- };
-
- return $words;
- }
-
- function find_complex_break($current_class, $classes, &$breaks, $offset, $length) {
- if ($offset >= $length) {
- return 0;
- };
-
- for ($i = $offset; $i < $length; $i++) {
- // TODO
- $breaks[$i - 1] = LB_PROHIBITED;
- if ($classes[$i] != UC_LINE_BREAK_SA) {
- break;
- };
- };
-
- return $i;
- }
-
- function find_line_break($classes, &$breaks, $length) {
- if (!$length) {
- return 0;
- };
-
- $class = $classes[0]; // class of 'before' character
-
- if ($class == UC_LINE_BREAK_LF ||
- $class == UC_LINE_BREAK_NL) {
- $class = UL_LINE_BREAK_BK;
- }
-
- // loop over all pairs in the string up to a hard break
- for ($i = 1; ($i < $length) && ($class != UC_LINE_BREAK_BK); $i++) {
- // handle explicit breaks here
- // handle BK, NL and LF explicitly
- if ($classes[$i] == UC_LINE_BREAK_BK ||
- $classes[$i] == UC_LINE_BREAK_NL ||
- $classes[$i] == UC_LINE_BREAK_LF) {
- $breaks[$i-1] = LB_PROHIBITED;
- $class = UC_LINE_BREAK_BK;
- continue;
- }
-
- // handle CR explicitly
- if ($classes[$i] == UC_LINE_BREAK_CR) {
- $breaks[$i-1] = LB_PROHIBITED;
- $class = UC_LINE_BREAK_CR;
- continue;
- }
-
- // handle spaces explicitly
- if ($classes[$i] == UC_LINE_BREAK_SP) {
- $breaks[$i-1] = LB_PROHIBITED;
- continue;
- };
-
- // handle complex scripts in a separate function
- if ($classes[$i] == UC_LINE_BREAK_SA) {
- $i += $this->find_complex_break($class, $classes, $breaks, $i, $length);
-
- if ($i < $length) {
- $class = $classes[$i];
- continue;
- };
- };
-
- // lookup pair table information
- $current_class = $classes[$i];
-
- $break = $GLOBALS['_g_line_break_class_table'][$class][$current_class];
- $breaks[$i - 1] = $break;
-
- if ($break == LB_INDIRECT) {
- if ($classes[$i - 1] == UC_LINE_BREAK_SP) {
- $breaks[$i - 1] = LB_INDIRECT;
- } else {
- $breaks[$i - 1] = LB_PROHIBITED;
- };
-
- // handle breaks involving a combining mark
- } elseif ($break == LB_INDIRECT_CM) {
- $breaks[$i - 1]= LB_PROHIBITED;
-
- if ($classes[$i - 1] == UC_LINE_BREAK_SP) {
- $breaks[$i - 1] = LB_INDIRECT_CM;
- } else {
- continue; // do not update cls
- };
- } elseif ($break == LB_PROHIBITED_CM) {
- $breaks[$i - 1] = LB_PROHIBITED_CM;
-
- if ($classes[$i - 1] != UC_LINE_BREAK_SP) {
- continue;
- };
- };
-
- // save cls of 'before' character (unless bypassed by 'continue')
- $class = $classes[$i];
- };
-
- $breaks[$i-1] = LB_EXPLICIT;
-
- return $i;
- }
-
- function is_break_allowed($previous_class, $current_class) {
- return true;
- }
-
- function get_line_break_class($ucs2_char) {
- static $class_cache = array();
-
- if (!isset($class_cache[$ucs2_char])) {
- $table_handle = $this->get_line_break_class_table_handle();
- fseek($table_handle, $ucs2_char /* as integer */ , SEEK_SET);
- $class_cache[$ucs2_char] = ord(fread($table_handle, 1));
- };
-
- // Apply rule LB1 from the Unicode algorithm:
- //
- // Assign a line breaking class to each code point of the
- // input. Resolve AI, CB, SA, SG, and XX into other line breaking
- // classes depending on criteria outside the scope of this
- // algorithm.
- //
- // In the absence of such criteria, it is recommended that classes
- // AI, SA, SG, and XX be resolved to AL, except that characters of
- // class SA that have General_Category Mn or Mc be resolved to CM
- // (see SA). Unresolved class CB is handled in rule LB20.
-
- // Resolve AI, SA, SG, and XX to AL
- if (in_array($class_cache[$ucs2_char],
- array(UC_LINE_BREAK_AI,
- UC_LINE_BREAK_SA,
- UC_LINE_BREAK_SG,
- UC_LINE_BREAK_XX))) {
- return UC_LINE_BREAK_AL;
- };
-
- return $class_cache[$ucs2_char];
- }
-
- function get_line_break_class_table_handle() {
- static $table_handle = null;
-
- if (is_null($table_handle)) {
- $filename = CACHE_DIR.'unicode.lb.classes.dat';
- if (!file_exists($filename)) {
- $this->generate_line_break_class_table($filename);
- };
-
- $table_handle = fopen($filename, 'rb');
- flock($table_handle, LOCK_SH);
- };
-
- return $table_handle;
- }
-
- function generate_line_break_class_table($output_filename) {
- $class_codes = array('BK' => 1,
- 'CR' => 2,
- 'LF' => 3,
- 'CM' => 4,
- 'NL' => 5,
- 'SG' => 6,
- 'WJ' => 7,
- 'ZW' => 8,
- 'GL' => 9,
- 'SP' => 10,
- 'B2' => 11,
- 'BA' => 12,
- 'BB' => 13,
- 'HY' => 14,
- 'CB' => 15,
- 'CL' => 16,
- 'EX' => 17,
- 'IN' => 18,
- 'NS' => 19,
- 'OP' => 20,
- 'QU' => 21,
- 'IS' => 22,
- 'NU' => 23,
- 'PO' => 24,
- 'PR' => 25,
- 'SY' => 26,
- 'AI' => 27,
- 'AL' => 28,
- 'H2' => 29,
- 'H3' => 30,
- 'ID' => 31,
- 'JL' => 32,
- 'JV' => 33,
- 'JT' => 34,
- 'SA' => 35,
- 'XX' => 36);
-
- $output_handle = fopen($output_filename, 'wb');
- flock($output_handle, LOCK_EX);
-
- $input_handle = fopen(HTML2PS_DIR.'/data/LineBreak.txt', 'r');
- $last_position = 0;
- while ($line = fgets($input_handle)) {
- $line = trim($line);
-
- if (strlen($line) == 0 || $line[0] == '#') {
- continue;
- };
-
- if (preg_match('/^([0-9a-f]+);(\w\w) #/i', $line, $matches)) {
- $unicode_position = hexdec($matches[1]);
- $class = $matches[2];
-
- if ($unicode_position > $last_position + 1) {
- fwrite($output_handle, str_repeat(chr(0), $unicode_position - $last_position - 1));
- };
-
- fwrite($output_handle, chr($class_codes[$class]));
-
- $last_position = $unicode_position;
- } elseif (preg_match('/^([0-9a-f]+)\.\.([0-9a-f]+);(\w\w) #/i', $line, $matches)) {
- $unicode_start_position = hexdec($matches[1]);
- $unicode_end_position = hexdec($matches[2]);
- $class = $matches[3];
-
- if ($unicode_start_position > $last_position + 1) {
- fwrite($output_handle, str_repeat(chr(0), $unicode_start_position - $last_position - 1));
- };
-
- fwrite($output_handle, str_repeat(chr($class_codes[$class]), $unicode_end_position - $unicode_start_position + 1));
-
- $last_position = $unicode_end_position;
- } else {
- var_dump($line); die();
- }
- };
-
- fclose($input_handle);
-
- flock($output_handle, LOCK_UN);
- fclose($output_handle);
+ return preg_split('/ /u', $content);
}
function collapse_whitespace($content) {
diff --git a/public_html/inline.content.builder.pre.line.php b/public_html/inline.content.builder.pre.line.php
index 5a789c3..6f98368 100644
--- a/public_html/inline.content.builder.pre.line.php
+++ b/public_html/inline.content.builder.pre.line.php
@@ -3,8 +3,8 @@
require_once(HTML2PS_DIR.'inline.content.builder.php');
class InlineContentBuilderPreLine extends InlineContentBuilder {
- function InlineContentBuilderPreLine() {
- $this->InlineContentBuilder();
+ function __construct() {
+ InlineContentBuilder::__construct();
}
/**
@@ -15,24 +15,20 @@ function InlineContentBuilderPreLine() {
function build(&$box, $text, &$pipeline) {
$text = $this->remove_leading_linefeeds($text);
$text = $this->remove_trailing_linefeeds($text);
- $lines = $this->break_into_lines($text);
- $parent =& $box->get_parent_node();
- for ($i=0, $size = count($lines); $i<$size; $i++) {
- $line = $lines[$i];
+ $lines = $this->break_into_lines($text);
+ foreach ($lines as $line) {
$words = $this->break_into_words($this->collapse_whitespace($line));
foreach ($words as $word) {
$box->process_word($word, $pipeline);
- $whitespace =& WhitespaceBox::create($pipeline);
+ $whitespace =& (new WhitespaceBox())->create('', '', $pipeline);
$box->add_child($whitespace);
- };
+ }
- if ((!$parent || $parent->isBlockLevel()) && $i < $size - 1) {
- $this->add_line_break($box, $pipeline);
- };
- };
+ $this->add_line_break($box, $pipeline);
+ }
}
}
diff --git a/public_html/inline.content.builder.pre.php b/public_html/inline.content.builder.pre.php
index 7eb42cb..843bd18 100644
--- a/public_html/inline.content.builder.pre.php
+++ b/public_html/inline.content.builder.pre.php
@@ -3,8 +3,8 @@
require_once(HTML2PS_DIR.'inline.content.builder.php');
class InlineContentBuilderPre extends InlineContentBuilder {
- function InlineContentBuilderPre() {
- $this->InlineContentBuilder();
+ function __construct() {
+ InlineContentBuilder::__construct();
}
/**
@@ -20,16 +20,10 @@ function build(&$box, $text, &$pipeline) {
$text = $this->remove_trailing_linefeeds($text);
$lines = $this->break_into_lines($text);
- $parent =& $box->get_parent_node();
-
- for ($i=0, $size = count($lines); $i<$size; $i++) {
- $line = $lines[$i];
+ foreach ($lines as $line) {
$box->process_word($line, $pipeline);
-
- if ((!$parent || $parent->isBlockLevel()) && $i < $size - 1) {
- $this->add_line_break($box, $pipeline);
- };
- };
+ $this->add_line_break($box, $pipeline);
+ }
}
}
diff --git a/public_html/inline.content.builder.pre.wrap.php b/public_html/inline.content.builder.pre.wrap.php
index 34cf097..0f72398 100644
--- a/public_html/inline.content.builder.pre.wrap.php
+++ b/public_html/inline.content.builder.pre.wrap.php
@@ -3,8 +3,8 @@
require_once(HTML2PS_DIR.'inline.content.builder.php');
class InlineContentBuilderPreWrap extends InlineContentBuilder {
- function InlineContentBuilderPreWrap() {
- $this->InlineContentBuilder();
+ function __construct() {
+ InlineContentBuilder::__construct();
}
/**
@@ -19,25 +19,20 @@ function InlineContentBuilderPreWrap() {
*/
function build(&$box, $text, &$pipeline) {
$text = $this->remove_trailing_linefeeds($text);
- $parent =& $box->get_parent_node();
- $lines = $this->break_into_lines($text);
-
- for ($i=0, $size = count($lines); $i<$size; $i++) {
- $line = $lines[$i];
+ $lines = $this->break_into_lines($text);
+ foreach ($lines as $line) {
$words = $this->break_into_words($line);
foreach ($words as $word) {
$word .= ' ';
$box->process_word($word, $pipeline);
- $whitespace =& WhitespaceBox::create($pipeline);
+ $whitespace =& (new WhitespaceBox())->create('', '', $pipeline);
$box->add_child($whitespace);
- };
+ }
- if ((!$parent || $parent->isBlockLevel()) && $i < $size - 1) {
- $this->add_line_break($box, $pipeline);
- };
- };
+ $this->add_line_break($box, $pipeline);
+ }
}
}
diff --git a/public_html/layout._interface.class.php b/public_html/layout._interface.class.php
deleted file mode 100644
index 0ebf30c..0000000
--- a/public_html/layout._interface.class.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
\ No newline at end of file
diff --git a/public_html/layout.default.class.php b/public_html/layout.default.class.php
index e394295..8809c8c 100644
--- a/public_html/layout.default.class.php
+++ b/public_html/layout.default.class.php
@@ -2,30 +2,30 @@
require_once(HTML2PS_DIR.'filter.post.positioned.class.php');
-class LayoutEngineDefault extends LayoutEngine {
+class LayoutEngineDefault {
function process(&$box, &$media, &$driver, &$context) {
// Calculate the size of text boxes
if (is_null($box->reflow_text($driver))) {
error_log("LayoutEngineDefault::process: reflow_text call failed");
return null;
- };
+ }
// Explicitly remove any height declarations from the BODY-generated box;
// BODY should always fill last page completely. Percentage height of the BODY is meaningless
// on the paged media.
$box->_height_constraint = new HCConstraint(null, null, null);
- $margin = $box->get_css_property(CSS_MARGIN);
+ $margin = $box->getCSSProperty(CSS_MARGIN);
$margin->calcPercentages(mm2pt($media->width() - $media->margins['left'] - $media->margins['right']));
$box->setCSSProperty(CSS_MARGIN, $margin);
- $box->width = mm2pt($media->width() - $media->margins['left'] - $media->margins['right']) -
+ $box->width = mm2pt($media->width() - $media->margins['left'] - $media->margins['right']) -
$box->_get_hor_extra();
$box->setCSSProperty(CSS_WIDTH, new WCConstant($box->width));
$box->height = mm2pt($media->real_height()) - $box->_get_vert_extra();
- $box->put_top(mm2pt($media->height() -
+ $box->put_top(mm2pt($media->height() -
$media->margins['top']) -
$box->get_extra_top());
@@ -64,24 +64,26 @@ function process(&$box, &$media, &$driver, &$context) {
$box->height = $pages * $page_real_height - $box->_get_vert_extra();
$driver->set_expected_pages($pages);
+ $driver->anchors = array();
+ $box->reflow_anchors($driver, $driver->anchors);
/**
* Flow absolute-positioned boxes;
* note that we should know the number of expected pages at this moment, unless
* we will not be able to calculate positions for elements using 'bottom: ...' CSS property
*/
- for ($i=0, $num_positioned = count($context->absolute_positioned); $i < $num_positioned; $i++) {
+ for ($i=0, $num_positioned = count((array) $context->absolute_positioned); $i < $num_positioned; $i++) {
$context->push();
$context->absolute_positioned[$i]->reflow_absolute($context);
$context->pop();
- };
+ }
// Flow fixed-positioned box
- for ($i=0, $num_positioned = count($context->fixed_positioned); $i < $num_positioned; $i++) {
+ for ($i=0, $num_positioned = count((array) $context->fixed_positioned); $i < $num_positioned; $i++) {
$context->push();
$context->fixed_positioned[$i]->reflow_fixed($context);
$context->pop();
- };
+ }
$box->reflow_inline();
diff --git a/public_html/layout.page.breaks.php b/public_html/layout.page.breaks.php
index 2db7fee..e5a48dc 100644
--- a/public_html/layout.page.breaks.php
+++ b/public_html/layout.page.breaks.php
@@ -3,30 +3,30 @@
require_once(HTML2PS_DIR.'utils_units.php');
function cmp_footnote_locations($a, $b) {
- if ($a->get_location() == $b->get_location()) { return 0; };
- return ($a->get_location() > $b->get_location()) ? -1 : 1;
+ if ($a->getLocation() == $b->getLocation()) { return 0; }
+ return ($a->getLocation() > $b->getLocation()) ? -1 : 1;
}
class FootnoteLocation {
var $_location;
var $_content_height;
- function FootnoteLocation($location, $content_height) {
+ function __construct($location, $content_height) {
$this->_location = $location;
$this->_content_height = $content_height;
}
- function get_location() {
+ function getLocation() {
return $this->_location;
}
- function get_content_height() {
+ function getContentHeight() {
return $this->_content_height;
}
}
function cmp_page_break_locations($a, $b) {
- if ($a->location == $b->location) { return 0; };
+ if ($a->location == $b->location) { return 0; }
return ($a->location > $b->location) ? -1 : 1;
}
@@ -34,27 +34,27 @@ class PageBreakLocation {
var $location;
var $penalty;
- function PageBreakLocation($location, $penalty) {
+ function __construct($location, $penalty) {
$this->location = round($location,2);
$this->penalty = $penalty;
}
- function get_footnotes_height($footnotes, $page_start, $location) {
+ function _getFootnotesHeight($footnotes, $page_start, $location) {
$i = 0;
- $size = count($footnotes);
+ $size = count((array) $footnotes);
$height = 0;
- while ($i < $size && $footnotes[$i]->get_location() > $page_start) {
+ while ($i < $size && $footnotes[$i]->getLocation() > $page_start) {
$i++;
- };
+ }
$footnotes_count = 0;
- while ($i < $size && $footnotes[$i]->get_location() > $location) {
- $height += $footnotes[$i]->get_content_height();
+ while ($i < $size && $footnotes[$i]->getLocation() > $location) {
+ $height += $footnotes[$i]->getContentHeight();
$footnotes_count ++;
$i++;
- };
+ }
if ($footnotes_count > 0) {
return
@@ -64,40 +64,38 @@ function get_footnotes_height($footnotes, $page_start, $location) {
FOOTNOTE_GAP * ($footnotes_count-1);
} else {
return 0;
- };
+ }
}
- function get_penalty($page_start, $max_page_height, $footnotes) {
- $height_penalty = $this->get_page_break_height_penalty($page_start,
- $max_page_height - $this->get_footnotes_height($footnotes,
- $page_start,
- $this->location));
+ function getPenalty($page_start, $max_page_height, $footnotes) {
+ $height_penalty = $this->_getPageBreakHeightPenalty($page_start,
+ $max_page_height - $this->_getFootnotesHeight($footnotes, $page_start, $this->location));
return $this->penalty + $height_penalty;
}
/**
* We should avoid page breaks resulting in too much white space at
- * the page bottom. This function calculates a 'penalty' for
+ * the page bottom. This function calculates a "penalty" for
* breaking page at its current height.
*/
- function get_page_break_height_penalty($page_start, $max_page_height) {
+ function _getPageBreakHeightPenalty($page_start, $max_page_height) {
$current_height = $page_start - $this->location;
if ($current_height > $max_page_height) {
return MAX_PAGE_BREAK_PENALTY;
- };
+ }
$free_space = $max_page_height - $current_height;
$free_space_fraction = $free_space / $max_page_height;
if ($free_space_fraction < MAX_UNPENALIZED_FREE_FRACTION) {
return 0;
- };
+ }
if ($free_space_fraction > MAX_FREE_FRACTION) {
return MAX_PAGE_BREAK_PENALTY;
- };
+ }
return
($free_space_fraction - MAX_UNPENALIZED_FREE_FRACTION) /
@@ -129,68 +127,66 @@ function get_page_break_height_penalty($page_start, $max_page_height) {
* 2. Between line boxes inside a block box.
*/
class PageBreakLocator {
- function get_break_locations(&$dom_tree) {
- $locations_ungrouped = PageBreakLocator::get_pages_traverse($dom_tree, 0);
+ function _getBreakLocations(&$dom_tree) {
+ $locations_ungrouped = (new PageBreakLocator())->_getPagesTraverse($dom_tree, 0);
/**
* If there's no page break locations (e.g. document is empty)
* generate one full-size page
*/
- if (count($locations_ungrouped) == 0) {
+ if (is_countable($locations_ungrouped) && count($locations_ungrouped) == 0) {
return array();
- };
+ }
- return PageBreakLocator::sort_locations($locations_ungrouped);
+ return (new PageBreakLocator())->sort_locations($locations_ungrouped);
}
- function get_footnotes_traverse(&$box) {
+ function _getFootnotesTraverse(&$box) {
$footnotes = array();
- if (is_a($box, 'BoxNoteCall')) {
+ if (is_a($box, "BoxNoteCall")) {
$footnotes[] = new FootnoteLocation($box->get_top_margin(), $box->_note_content->get_full_height());
- } elseif (is_a($box, 'GenericContainerBox')) {
+ } elseif (is_a($box, "GenericContainerBox")) {
foreach ($box->content as $child) {
- $footnotes = array_merge($footnotes, PageBreakLocator::get_footnotes_traverse($child));
- };
- };
+ $footnotes = array_merge($footnotes, (new PageBreakLocator())->_getFootnotesTraverse($child));
+ }
+ }
return $footnotes;
}
- function get_pages(&$dom_tree, $max_page_height, $first_page_top) {
+ function getPages(&$dom_tree, $max_page_height, $first_page_top) {
$current_page_top = $first_page_top;
$heights = array();
/**
* Get list of footnotes and heights of footnote content blocks
*/
- $footnotes = PageBreakLocator::get_footnotes_traverse($dom_tree);
+ $footnotes = (new PageBreakLocator())->_getFootnotesTraverse($dom_tree);
usort($footnotes, 'cmp_footnote_locations');
- $locations = PageBreakLocator::get_break_locations($dom_tree);
+ $locations = (new PageBreakLocator())->_getBreakLocations($dom_tree);
- if (count($locations) == 0) {
+ if (is_countable($locations) && count($locations) == 0) {
return array($max_page_height);
- };
+ }
$best_location = null;
foreach ($locations as $location) {
if ($location->location < $current_page_top) {
if (is_null($best_location)) {
$best_location = $location;
- };
+ }
$current_pos = round_units($current_page_top - $location->location);
- $available_page_height = round_units($max_page_height - $location->get_footnotes_height($footnotes, $current_page_top, $location->location));
+ $available_page_height = round_units($max_page_height - $location->_getFootnotesHeight($footnotes, $current_page_top, $location->location));
if ($current_pos > $available_page_height) {
/**
* No more locations found on current page
*/
- $best_location_penalty = $best_location->get_penalty($current_page_top, $max_page_height, $footnotes);
- if ($best_location_penalty >= MAX_PAGE_BREAK_PENALTY) {
- error_log('Could not find good page break location');
+ if ($best_location->getPenalty($current_page_top, $max_page_height, $footnotes) >= MAX_PAGE_BREAK_PENALTY) {
$heights[] = $max_page_height;
$current_page_top -= $max_page_height;
$best_location = null;
@@ -198,27 +194,27 @@ function get_pages(&$dom_tree, $max_page_height, $first_page_top) {
$heights[] = $current_page_top - $best_location->location;
$current_page_top = $best_location->location;
$best_location = null;
- };
+ }
} else {
- $location_penalty = $location->get_penalty($current_page_top, $max_page_height, $footnotes);
- $best_penalty = $best_location->get_penalty($current_page_top, $max_page_height, $footnotes);
+ $location_penalty = $location->getPenalty($current_page_top, $max_page_height, $footnotes);
+ $best_penalty = $best_location->getPenalty($current_page_top, $max_page_height, $footnotes);
if ($location_penalty <= $best_penalty) {
/**
* Better page break location found on current page
*/
$best_location = $location;
- };
- };
+ }
+ }
if ($location->penalty < 0) { // Forced page break
$heights[] = $current_page_top - $location->location;
$current_page_top = $location->location;
$best_location = null;
- };
- };
- };
+ }
+ }
+ }
// Last page always will have maximal height
$heights[] = $max_page_height;
@@ -226,393 +222,334 @@ function get_pages(&$dom_tree, $max_page_height, $first_page_top) {
return $heights;
}
- function is_forced_page_break($value) {
+ function _isForcedPageBreak($value) {
return
$value == PAGE_BREAK_ALWAYS ||
$value == PAGE_BREAK_LEFT ||
$value == PAGE_BREAK_RIGHT;
}
- function has_forced_page_break_before(&$box) {
- return PageBreakLocator::is_forced_page_break($box->get_css_property(CSS_PAGE_BREAK_BEFORE));
+ function _hasForcedPageBreakBefore(&$box) {
+ return (new PageBreakLocator())->_isForcedPageBreak($box->getCSSProperty(CSS_PAGE_BREAK_BEFORE));
}
- function has_forced_page_break_after(&$box) {
- return PageBreakLocator::is_forced_page_break($box->get_css_property(CSS_PAGE_BREAK_AFTER));
+ function _hasForcedPageBreakAfter(&$box) {
+ return (new PageBreakLocator())->_isForcedPageBreak($box->getCSSProperty(CSS_PAGE_BREAK_AFTER));
}
- function get_pages_traverse_block(&$box, &$next, &$previous, $penalty) {
+ function _getPagesTraverseBlock(&$box, &$next, &$previous, $penalty) {
$locations = array();
// Absolute/fixed positioned blocks do not cause page breaks
// (CSS 2.1. 13.2.3 Content outside the page box)
- $position = $box->get_css_property(CSS_POSITION);
+ $position = $box->getCSSProperty(CSS_POSITION);
if ($position == POSITION_FIXED || $position == POSITION_ABSOLUTE) {
return $locations;
- };
-
- // Fake cell boxes do not generate page break locations
- if (is_a($box, 'FakeTableCellBox')) {
- return $locations;
}
/**
* Check for breaks in block box vertical margin
*/
-
+
/**
* Check for pre-breaks
*/
- if (PageBreakLocator::has_forced_page_break_before($box)) {
- $location = new PageBreakLocation($box->get_top_margin(), FORCED_PAGE_BREAK_BONUS);
- } elseif (!is_null($previous) && $previous->get_css_property(CSS_PAGE_BREAK_AFTER) == PAGE_BREAK_AVOID) {
- $location = new PageBreakLocation($box->get_top_margin(), $penalty + PAGE_BREAK_AFTER_AVOID_PENALTY);
- } elseif ($box->get_css_property(CSS_PAGE_BREAK_BEFORE) == PAGE_BREAK_AVOID) {
- $location = new PageBreakLocation($box->get_top_margin(), $penalty + PAGE_BREAK_BEFORE_AVOID_PENALTY);
+ if (PageBreakLocator::_hasForcedPageBreakBefore($box)) {
+ $locations[] = new PageBreakLocation($box->get_top_margin(), FORCED_PAGE_BREAK_BONUS);
+ } elseif (!is_null($previous) && $previous->getCSSProperty(CSS_PAGE_BREAK_AFTER) == PAGE_BREAK_AVOID) {
+ $locations[] = new PageBreakLocation($box->get_top_margin(), $penalty + PAGE_BREAK_AFTER_AVOID_PENALTY);
+ } elseif ($box->getCSSProperty(CSS_PAGE_BREAK_BEFORE) == PAGE_BREAK_AVOID) {
+ $locations[] = new PageBreakLocation($box->get_top_margin(), $penalty + PAGE_BREAK_BEFORE_AVOID_PENALTY);
} else {
- $location = new PageBreakLocation($box->get_top_margin(), $penalty);
- };
- $locations[] = $location;
+ $locations[] = new PageBreakLocation($box->get_top_margin(), $penalty);
+ }
/**
* Check for post-breaks
*/
- if (PageBreakLocator::has_forced_page_break_after($box)) {
- $location = new PageBreakLocation($box->get_bottom_margin(), FORCED_PAGE_BREAK_BONUS);
- } elseif (!is_null($next) && $next->get_css_property(CSS_PAGE_BREAK_BEFORE) == PAGE_BREAK_AVOID) {
- $location = new PageBreakLocation($box->get_bottom_margin(), $penalty + PAGE_BREAK_AFTER_AVOID_PENALTY);
- } elseif ($box->get_css_property(CSS_PAGE_BREAK_AFTER) == PAGE_BREAK_AVOID) {
- $location = new PageBreakLocation($box->get_bottom_margin(), $penalty + PAGE_BREAK_AFTER_AVOID_PENALTY);
+ if (PageBreakLocator::_hasForcedPageBreakAfter($box)) {
+ $locations[] = new PageBreakLocation($box->get_bottom_margin(), FORCED_PAGE_BREAK_BONUS);
+ } elseif (!is_null($next) && $next->getCSSProperty(CSS_PAGE_BREAK_BEFORE) == PAGE_BREAK_AVOID) {
+ $locations[] = new PageBreakLocation($box->get_bottom_margin(), $penalty + PAGE_BREAK_AFTER_AVOID_PENALTY);
+ } elseif ($box->getCSSProperty(CSS_PAGE_BREAK_AFTER) == PAGE_BREAK_AVOID) {
+ $locations[] = new PageBreakLocation($box->get_bottom_margin(), $penalty + PAGE_BREAK_AFTER_AVOID_PENALTY);
} else {
- $location = new PageBreakLocation($box->get_bottom_margin(), $penalty);
+ $locations[] = new PageBreakLocation($box->get_bottom_margin(), $penalty);
}
- $locations[] = $location;
/**
* Check for breaks inside this box
* Note that this check should be done after page-break-before/after checks,
* as 'penalty' value may be modified here
*/
- if ($box->get_css_property(CSS_PAGE_BREAK_INSIDE) == PAGE_BREAK_AVOID) {
+ if ($box->getCSSProperty(CSS_PAGE_BREAK_INSIDE) == PAGE_BREAK_AVOID) {
$penalty += PAGE_BREAK_INSIDE_AVOID_PENALTY;
- };
+ }
/**
- * According to CSS 2.1, 13.3.5 'Best' page breaks,
+ * According to CSS 2.1, 13.3.5 "Best" page breaks,
* User agent shoud /Avoid breaking inside a block that has a border/
*
* From my point of view, top and bottom borders should not affect page
* breaks (as they're not broken by page break), while left and right ones - should.
*/
- $border_left =& $box->get_css_property(CSS_BORDER_LEFT);
- $border_right =& $box->get_css_property(CSS_BORDER_RIGHT);
+ $border_left =& $box->getCSSProperty(CSS_BORDER_LEFT);
+ $border_right =& $box->getCSSProperty(CSS_BORDER_RIGHT);
$has_left_border = $border_left->style != BS_NONE && $border_left->width->getPoints() > 0;
$has_right_border = $border_left->style != BS_NONE && $border_left->width->getPoints() > 0;
if ($has_left_border || $has_right_border) {
$penalty += PAGE_BREAK_BORDER_PENALTY;
- };
+ }
/**
* Process box content
*/
- $locations = array_merge($locations, PageBreakLocator::get_pages_traverse($box, $penalty));
+ $locations = array_merge($locations, (new PageBreakLocator())->_getPagesTraverse($box, $penalty));
return $locations;
}
- function get_more_before($base, $content, $size) {
+ function _getMoreBefore($base, $content, $size) {
$i = $base;
$more_before = 0;
while ($i > 0) {
$i--;
- if (is_a($content[$i], 'InlineBox')) {
- $more_before += $content[$i]->get_line_box_count();
- } elseif (is_a($content[$i], 'BRBox') ||
- is_a($content[$i], 'GenericInlineBox')) {
+ if (is_a($content[$i], "InlineBox")) {
+ $more_before += $content[$i]->getLineBoxCount();
+ } elseif (is_a($content[$i], "BRBox")) {
// Do nothing
} else {
return $more_before;
- };
- };
+ }
+ }
return $more_before;
}
- function get_more_after($base, $content, $size) {
+ function _getMoreAfter($base, $content, $size) {
$i = $base;
$more = 0;
while ($i < $size-1) {
$i++;
- if (is_a($content[$i], 'InlineBox')) {
+ if (is_a($content[$i], "InlineBox")) {
$more += $content[$i]->getLineBoxCount();
- } elseif (is_a($content[$i], 'BRBox') ||
- is_a($content[$i], 'GenericInlineBox')) {
+ } elseif (is_a($content[$i], "BRBox")) {
// Do nothing
} else {
return $more;
- };
- };
+ }
+ }
return $more;
}
- function get_pages_traverse_table_row(&$box, $penalty) {
+ function _getPagesTraverseTableRow(&$box, $penalty) {
$locations = array();
$cells = $box->getChildNodes();
-
- // Find first non-fake (not covered by a table row or cell span) cell
- $i = 0;
- $size = count($cells);
- while ($i < $size &&
- $cells[$i]->is_fake()) {
- $i++;
- };
- // Now $i contains the index of the first content cell or $size of there was no one
- if ($i < $size) {
- $locations[] = new PageBreakLocation($cells[$i]->get_top_margin(), $penalty);
- $locations[] = new PageBreakLocation($cells[$i]->get_bottom_margin(), $penalty);
- };
-
- $content_watermark = $cells[0]->get_top_margin() - $cells[0]->get_real_full_height();
+ if (is_countable($cells) && count($cells) > 0) {
+ $locations[] = new PageBreakLocation($cells[0]->get_top_margin(), $penalty);
+ $locations[] = new PageBreakLocation($cells[0]->get_bottom_margin(), $penalty);
+ }
/**
* Process row content
*/
$inside_penalty = $penalty;
- if ($box->get_css_property(CSS_PAGE_BREAK_INSIDE) == PAGE_BREAK_AVOID) {
+ if ($box->getCSSProperty(CSS_PAGE_BREAK_INSIDE) == PAGE_BREAK_AVOID) {
$inside_penalty += PAGE_BREAK_INSIDE_AVOID_PENALTY;
- };
+ }
$cells = $box->getChildNodes();
$null = null;
- $ungrouped_row_locations = PageBreakLocator::get_pages_traverse_block($cells[0],
- $null,
- $null,
- $inside_penalty);
- $row_locations = PageBreakLocator::sort_locations($ungrouped_row_locations);
-
- for ($i=1, $size = count($cells); $i < $size; $i++) {
- $ungrouped_child_locations = PageBreakLocator::get_pages_traverse_block($cells[$i],
- $null,
- $null,
- $inside_penalty);
- $child_locations = PageBreakLocator::sort_locations($ungrouped_child_locations);
-
- $current_cell_content_watermark = $cells[$i]->get_top_margin() - $cells[$i]->get_real_full_height();
+ $ungrouped_row_locations = (new PageBreakLocator())->_getPagesTraverseBlock($cells[0],
+ $null,
+ $null,
+ $inside_penalty);
+ $row_locations = (new PageBreakLocator())->sort_locations($ungrouped_row_locations);
+
+ for ($i=1, $size = count((array) $cells); $i < $size; $i++) {
+ $ungrouped_child_locations = (new PageBreakLocator())->_getPagesTraverseBlock($cells[$i],
+ $null,
+ $null,
+ $inside_penalty);
+ $child_locations = (new PageBreakLocator())->sort_locations($ungrouped_child_locations);
$new_row_locations = array();
- // Keep only locations available in all cells
-
$current_row_location_index = 0;
- while ($current_row_location_index < count($row_locations)) {
+ while ($current_row_location_index < count((array) $row_locations)) {
$current_row_location = $row_locations[$current_row_location_index];
-
- // Check if current row-wide location is below the current cell content;
- // in this case, accept it immediately
- if ($current_row_location->location < $current_cell_content_watermark) {
- $new_row_locations[] = $current_row_location;
- } else {
- // Match all row locations agains the current cell's
- for ($current_child_location_index = 0, $child_locations_total = count($child_locations);
- $current_child_location_index < $child_locations_total;
- $current_child_location_index++) {
- $current_child_location = $child_locations[$current_child_location_index];
- if ($current_child_location->location == $current_row_location->location) {
- $new_row_locations[] = new PageBreakLocation($current_child_location->location,
- max($current_child_location->penalty,
- $current_row_location->penalty));
- };
- };
- };
-
+ for ($current_child_location_index = 0, $child_locations_total = count((array) $child_locations);
+ $current_child_location_index < $child_locations_total;
+ $current_child_location_index++) {
+ $current_child_location = $child_locations[$current_child_location_index];
+ if ($current_child_location->location == $current_row_location->location) {
+ $new_row_locations[] = new PageBreakLocation($current_child_location->location,
+ max($current_child_location->penalty,
+ $current_row_location->penalty));
+ }
+ }
$current_row_location_index++;
- };
-
- // Add locations available below content in previous cells
-
- for ($current_child_location_index = 0, $child_locations_total = count($child_locations);
- $current_child_location_index < $child_locations_total;
- $current_child_location_index++) {
- $current_child_location = $child_locations[$current_child_location_index];
- if ($current_child_location->location < $content_watermark) {
- $new_row_locations[] = new PageBreakLocation($current_child_location->location,
- $current_child_location->penalty);
- };
- };
-
- $content_watermark = min($content_watermark, $cells[$i]->get_top_margin() - $cells[$i]->get_real_full_height());
-
+ }
$row_locations = $new_row_locations;
- };
+ }
$locations = array_merge($locations, $row_locations);
return $locations;
}
- function get_pages_traverse_inline(&$box, $penalty, $more_before, $more_after) {
+ function _getPagesTraverseInline(&$box, $penalty, $more_before, $more_after) {
$locations = array();
/**
* Check for breaks between line boxes
*/
- $size = $box->get_line_box_count();
-
- if ($size == 0) {
- return $locations;
- };
+ $size = $box->getLineBoxCount();
// If there was a BR box before current inline box (indicated by
// $more_before parameter > 0), we may break page on the top edge
// of the first line box
if ($more_before > 0) {
- if ($more_before < $box->parent->get_css_property(CSS_ORPHANS)) {
+ if ($more_before < $box->parent->getCSSProperty(CSS_ORPHANS)) {
$orphans_penalty = PAGE_BREAK_ORPHANS_PENALTY;
} else {
$orphans_penalty = 0;
- };
+ }
- if ($box->parent->get_css_property(CSS_WIDOWS) > $size + $more_after) {
+ if ($box->parent->getCSSProperty(CSS_WIDOWS) > $size + $more_after) {
$widows_penalty = PAGE_BREAK_WIDOWS_PENALTY;
} else {
$widows_penalty = 0;
- };
+ }
- $line_box = $box->get_line_box(0);
+ $line_box = $box->getLineBox(0);
$locations[] = new PageBreakLocation($line_box->top,
$penalty + PAGE_BREAK_LINE_PENALTY + $orphans_penalty + $widows_penalty);
- };
+ }
// If there was a BR box after current inline box (indicated by
// $more_after parameter > 0), we may break page on the top edge
// of the first line box
if ($more_after > 0) {
- if ($size + 1 + $more_before < $box->parent->get_css_property(CSS_ORPHANS)) {
+ if ($size + 1 + $more_before < $box->parent->getCSSProperty(CSS_ORPHANS)) {
$orphans_penalty = PAGE_BREAK_ORPHANS_PENALTY;
} else {
$orphans_penalty = 0;
- };
+ }
- if ($size + 1 + $box->parent->get_css_property(CSS_WIDOWS) > $size + $more_after) {
+ if ($size + 1 + $box->parent->getCSSProperty(CSS_WIDOWS) > $size + $more_after) {
$widows_penalty = PAGE_BREAK_WIDOWS_PENALTY;
} else {
$widows_penalty = 0;
- };
+ }
$line_box = $box->getLineBox($size-1);
$locations[] = new PageBreakLocation($line_box->bottom,
$penalty + PAGE_BREAK_LINE_PENALTY + $orphans_penalty + $widows_penalty);
- };
+ }
// Note that we're ignoring the last line box inside this inline
// box; it is required, as bottom of the last line box will be the
// same as the bottom of the container block box. Break penalty
// should be calculated using block-box level data
- for ($i = 0; $i < $size - 1; $i++) {
- $line_box = $box->get_line_box($i);
+ for ($i=0; $i<$size-1; $i++) {
+ $line_box = $box->getLineBox($i);
- if ($i + 1 + $more_before < $box->parent->get_css_property(CSS_ORPHANS)) {
+ if ($i + 1 + $more_before < $box->parent->getCSSProperty(CSS_ORPHANS)) {
$orphans_penalty = PAGE_BREAK_ORPHANS_PENALTY;
} else {
$orphans_penalty = 0;
- };
+ }
- if ($i + 1 + $box->parent->get_css_property(CSS_WIDOWS) > $size + $more_after) {
+ if ($i + 1 + $box->parent->getCSSProperty(CSS_WIDOWS) > $size + $more_after) {
$widows_penalty = PAGE_BREAK_WIDOWS_PENALTY;
} else {
$widows_penalty = 0;
- };
+ }
$locations[] = new PageBreakLocation($line_box->bottom,
$penalty + PAGE_BREAK_LINE_PENALTY + $orphans_penalty + $widows_penalty);
- };
+ }
return $locations;
}
- function &get_previous($index, $content, $size) {
+ function &_getPrevious($index, $content, $size) {
for ($i = $index - 1; $i>=0; $i--) {
$child = $content[$i];
if (!$child->is_null()) {
return $child;
- };
- };
+ }
+ }
$dummy = null;
return $dummy;
}
- function &get_next($index, &$content, $size) {
+ function &_getNext($index, &$content, $size) {
for ($i=$index + 1; $i<$size; $i++) {
$child =& $content[$i];
if (!$child->is_null()) {
return $child;
- };
- };
+ }
+ }
$dummy = null;
return $dummy;
}
- function get_pages_traverse(&$box, $penalty) {
- if (!is_a($box, 'GenericContainerBox')) {
- return array();
- };
+ function _getPagesTraverse(&$box, $penalty) {
+ if (!is_a($box, "GenericContainerBox")) { return array(); }
$locations = array();
- for ($i=0, $content_size = count($box->content); $i<$content_size; $i++) {
- $previous_child =& PageBreakLocator::get_previous($i, $box->content, $content_size);
- $next_child =& PageBreakLocator::get_next($i, $box->content, $content_size);
+ for ($i=0, $content_size = count((array) $box->content); $i<$content_size; $i++) {
+ $previous_child =& (new PageBreakLocator())->_getPrevious($i, $box->content, $content_size);
+ $next_child =& (new PageBreakLocator())->_getNext($i, $box->content, $content_size);
$child =& $box->content[$i];
/**
* Note that page-break-xxx properties apply to block-level elements only
*/
- if (is_a($child, 'BRBox')) {
+ if (is_a($child, "BRBox")) {
// Do nothing
} elseif ($child->isBlockLevel()) {
- $locations = array_merge($locations, PageBreakLocator::get_pages_traverse_block($child,
- $next_child,
- $previous_child,
- $penalty));
-
- } elseif (is_a($child, 'TableCellBox')) {
+ $locations = array_merge($locations, (new PageBreakLocator())->_getPagesTraverseBlock($child,
+ $next_child,
+ $previous_child,
+ $penalty));
+ } elseif (is_a($child, "TableCellBox")) {
$null = null;
- $child_locations = PageBreakLocator::get_pages_traverse_block($child, $null, $null, $penalty);
+ $child_locations = (new PageBreakLocator())->_getPagesTraverseBlock($child, $null, $null, $penalty);
$locations = array_merge($locations, $child_locations);
- } elseif (is_a($child, 'InlineBox')) {
+ } elseif (is_a($child, "InlineBox")) {
$more_before = 0;
$more_after = 0;
- if (is_a($previous_child, 'BRBox')) {
- $more_before = PageBreakLocator::get_more_before($i, $box->content, $content_size);
- };
+ if (is_a($previous_child, "BRBox")) {
+ $more_before = (new PageBreakLocator())->_getMoreBefore($i, $box->content, $content_size);
+ }
- if (is_a($next_child, 'BRBox')) {
- $more_after = PageBreakLocator::get_more_after($i, $box->content, $content_size);
- };
+ if (is_a($next_child, "BRBox")) {
+ $more_after = (new PageBreakLocator())->_getMoreAfter($i, $box->content, $content_size);
+ }
- $locations = array_merge($locations, PageBreakLocator::get_pages_traverse_inline($child, $penalty, $more_before, $more_after));
- } elseif (is_a($child, 'TableRowBox')) {
- $locations = array_merge($locations, PageBreakLocator::get_pages_traverse_table_row($child, $penalty));
- };
- };
+ $locations = array_merge($locations, (new PageBreakLocator())->_getPagesTraverseInline($child, $penalty, $more_before, $more_after));
+ } elseif (is_a($child, "TableRowBox")) {
+ $locations = array_merge($locations, (new PageBreakLocator())->_getPagesTraverseTableRow($child, $penalty));
+ }
+ }
return $locations;
}
function sort_locations($locations_ungrouped) {
- if (count($locations_ungrouped) == 0) {
- return array();
- };
-
usort($locations_ungrouped, 'cmp_page_break_locations');
$last_location = $locations_ungrouped[0];
@@ -626,9 +563,9 @@ function sort_locations($locations_ungrouped) {
$last_location->penalty = max($last_location->penalty, $location->penalty);
} else {
$last_location->penalty = min($last_location->penalty, $location->penalty);
- };
- };
- };
+ }
+ }
+ }
$locations[] = $last_location;
return $locations;
diff --git a/public_html/layout.ps.class.php b/public_html/layout.ps.class.php
new file mode 100644
index 0000000..958dc0e
--- /dev/null
+++ b/public_html/layout.ps.class.php
@@ -0,0 +1,37 @@
+reflow_text($driver);
+
+ // Explicitly remove any height declarations from the BODY-generated box;
+ // BODY should always fill last page completely. Percentage height of the BODY is meaningless
+ // on the paged media.
+ $box->_height_constraint = new HCConstraint(null, null, null);
+
+ // As BODY generated box have zero calculated width at the very moment,
+ // and we need some box to use as a parameter to _calc_percentage_margins,
+ // we'll create a fake box having with equal to the viewport width.
+ $media_box = new BlockBox();
+ $media_box->width = mm2pt($media->width() - $media->margins['left'] - $media->margins['right']);
+
+ // Calculate actual margin values
+ $box->_calc_percentage_margins($media_box);
+
+ $box->width = mm2pt($media->width() - $media->margins['left'] - $media->margins['right']) -
+ $box->_get_hor_extra();
+
+ $box->height = mm2pt($media->height() - $media->margins['top'] - $media->margins['bottom']) -
+ $box->_get_vert_extra();
+
+ $box->put_top(mm2pt($media->height() -
+ $media->margins['top']) -
+ $box->get_extra_top());
+
+ $box->put_left(mm2pt($media->margins['left']) +
+ $box->get_extra_left());
+
+ $box->to_ps($driver);
+ }
+}
+?>
\ No newline at end of file
diff --git a/public_html/layout.vertical.php b/public_html/layout.vertical.php
index 33b8467..46b0967 100644
--- a/public_html/layout.vertical.php
+++ b/public_html/layout.vertical.php
@@ -8,33 +8,33 @@ class LayoutVertical {
// @return updated value of Y coordinate
//
function apply_clear($box, $y, &$context) {
- $clear = $box->get_css_property(CSS_CLEAR);
+ $clear = $box->getCSSProperty(CSS_CLEAR);
// Check if we need to offset box vertically due the 'clear' property
if ($clear == CLEAR_BOTH || $clear == CLEAR_LEFT) {
$floats =& $context->current_floats();
for ($cf = 0; $cf < count($floats); $cf++) {
$current_float =& $floats[$cf];
- if ($current_float->get_css_property(CSS_FLOAT) == FLOAT_LEFT) {
+ if ($current_float->getCSSProperty(CSS_FLOAT) == FLOAT_LEFT) {
// Float vertical margins are never collapsed
//
- $margin = $box->get_css_property(CSS_MARGIN);
+ $margin = $box->getCSSProperty(CSS_MARGIN);
$y = min($y, $current_float->get_bottom_margin() - $margin->top->value);
- };
+ }
}
- };
+ }
if ($clear == CLEAR_BOTH || $clear == CLEAR_RIGHT) {
$floats =& $context->current_floats();
for ($cf = 0; $cf < count($floats); $cf++) {
$current_float =& $floats[$cf];
- if ($current_float->get_css_property(CSS_FLOAT) == FLOAT_RIGHT) {
+ if ($current_float->getCSSProperty(CSS_FLOAT) == FLOAT_RIGHT) {
// Float vertical margins are never collapsed
- $margin = $box->get_css_property(CSS_MARGIN);
+ $margin = $box->getCSSProperty(CSS_MARGIN);
$y = min($y, $current_float->get_bottom_margin() - $margin->top->value);
- };
+ }
}
- };
+ }
return $y;
}
diff --git a/public_html/list-style.image.php b/public_html/list-style.image.php
index c636b93..31521f9 100644
--- a/public_html/list-style.image.php
+++ b/public_html/list-style.image.php
@@ -4,13 +4,13 @@ class ListStyleImage {
var $_url;
var $_image;
- function ListStyleImage($url, $image) {
+ function __construct($url, $image) {
$this->_url = $url;
$this->_image = $image;
}
function ©() {
- $value =& new ListStyleImage($this->_url, $this->_image);
+ $value= new ListStyleImage($this->_url, $this->_image);
return $value;
}
diff --git a/public_html/localalign.inc.php b/public_html/localalign.inc.php
new file mode 100644
index 0000000..8558d5b
--- /dev/null
+++ b/public_html/localalign.inc.php
@@ -0,0 +1,34 @@
+
\ No newline at end of file
diff --git a/public_html/logger.php b/public_html/logger.php
index aecc3fc..fa68431 100644
--- a/public_html/logger.php
+++ b/public_html/logger.php
@@ -13,7 +13,7 @@ class Logger {
/* static */ function get_instance() {
if (is_null(Logger::$instance)) {
Logger::$instance = new Logger();
- };
+ }
return Logger::$instance;
}
diff --git a/public_html/manager.encoding.php b/public_html/manager.encoding.php
index cb58761..4045d7f 100644
--- a/public_html/manager.encoding.php
+++ b/public_html/manager.encoding.php
@@ -27,56 +27,31 @@
// TODO: this works for PS encoding names only
class ManagerEncoding {
- var $_encodings = array();
-
- /**
- * Number of the current custom encoding vector
- */
- var $_custom_vector_index = 0;
+ var $_encodings;
+ var $_custom_vector_name;
var $_utf8_mapping;
- function ManagerEncoding() {
- $this->new_custom_encoding_vector();
- }
-
- /**
- * Add new custom symbol not present in the existing encoding
- * vectors.
- *
- * Note: encoding vector this character was placed to should be
- * extracted via get_current_custom_encoding_name immediately after
- * add_custom_char call.
- *
- * @param char[2] $char UCS-2 character (represented as 2-octet
- * string)
- *
- * @return char index of this character in custom encoding vector
- */
- function add_custom_char($char) {
- // Check if current encoding vector is full; if it is, we should
- // add a new one.
- if ($this->is_custom_encoding_full()) {
- $this->new_custom_encoding_vector();
- };
-
- // Get name of the custom encoding where new character should be
- // placed
- $vector_name = $this->get_current_custom_encoding_name();
-
- // Get (zero-based) index of this character in the encoding vector
- $index = count($this->_encodings[$vector_name]);
-
- // Add new character to the custom encoding vector
- $this->_encodings[$vector_name][chr($index)] = $char;
+ function getMapping($char) {
+ if (!isset($this->_utf8_mapping)) {
+ $this->_loadMapping(CACHE_DIR . 'utf8.mappings.dat');
+ }
- // Add new character to the UTF8 mapping table
- $this->_utf8_mapping[code_to_utf8($char)][$vector_name] = chr($index);
+ if (!isset($this->_utf8_mapping[$char])) {
+ return null;
+ }
+ return $this->_utf8_mapping[$char];
+ }
- return chr($index);
+ function _loadMapping($mapping_file) {
+ if (!is_readable($mapping_file)) {
+ $this->_generateMapping($mapping_file);
+ } else {
+ $this->_utf8_mapping = unserialize(file_get_contents($mapping_file));
+ }
}
- function generate_mapping($mapping_file) {
+ function _generateMapping($mapping_file) {
global $g_utf8_converters;
$this->_utf8_mapping = array();
@@ -84,49 +59,62 @@ function generate_mapping($mapping_file) {
$flipped = array_flip($g_utf8_converters[$encoding][0]);
foreach ($flipped as $utf => $code) {
$this->_utf8_mapping[code_to_utf8($utf)][$encoding] = $code;
- };
- };
+ }
+ }
$file = fopen($mapping_file,'w');
fwrite($file, serialize($this->_utf8_mapping));
fclose($file);
}
- function &get() {
- global $g_manager_encodings;
- return $g_manager_encodings;
+ function __construct() {
+ $this->_encodings = array();
+
+ $this->registerCustomEncoding("custom", array(0,1,2,3,4,5,6,7,8,9,10,
+ 11,12,13,14,15,16,17,18,19,20,
+ 21,22,23,24,25,26,27,28,29,30,
+ 31,32));
}
- function get_canonized_encoding_name($encoding) {
+ function getCanonizedEncodingName($encoding) {
global $g_encoding_aliases;
if (isset($g_encoding_aliases[$encoding])) {
return $g_encoding_aliases[$encoding];
- };
+ }
return $encoding;
}
- function get_current_custom_encoding_name() {
- return $this->get_custom_encoding_name($this->get_custom_vector_index());
+ function registerCustomEncoding($name, $vector) {
+ $this->registerEncoding($name, $vector);
+ $this->_custom_vector_name = $name;
}
- function get_custom_encoding_name($index) {
- return sprintf('custom%d',
- $index);
+ function getCustomEncodingName() {
+ return $this->_custom_vector_name;
}
- function get_custom_vector_index() {
- return $this->_custom_vector_index;
+ function getCustomEncodingVector() {
+ return $this->_encodings[$this->getCustomEncodingName()];
}
- function get_encoding_glyphs($encoding) {
- $vector = $this->get_encoding_vector($encoding);
- if (is_null($vector)) {
- error_log(sprintf("Cannot get encoding vector for encoding '%s'", $encoding));
- return null;
- };
- return $this->vector_to_glyphs($vector);
+ function registerEncoding($name, $vector) {
+ $this->_encodings[$name] = $vector;
+ }
+
+ /**
+ * @TODO: handle more than 256 custom characters
+ */
+ function addCustomChar($char) {
+ $vector_name = $this->getCustomEncodingName();
+
+ $index = count((array) $this->_encodings[$vector_name]);
+ $this->_encodings[$vector_name][$index] = $char;
+
+ $this->_utf8_mapping[chr($index)]['custom'] = $char;
+
+ return chr($index);
}
/**
@@ -137,158 +125,120 @@ function get_encoding_glyphs($encoding) {
*
* @return Array encoding vector; null if this encoding is not known to the script
*/
- function get_encoding_vector($encoding) {
- $encoding = $this->get_canonized_encoding_name($encoding);
+ function getEncodingVector($encoding) {
+ $encoding = $this->getCanonizedEncodingName($encoding);
+
+ /**
+ * @TODO: HACK. Currently custom encoding and "standard" encodings
+ * are handled separately, so we must explicitly check if current
+ * encoding is custom
+ */
+ if ($encoding == $this->getCustomEncodingName()) {
+ $vector = array();
+ $custom_vector = $this->getCustomEncodingVector();
+
+ $size = is_countable($custom_vector) ? count($custom_vector) : 0;
+ for ($i=0; $i<$size; $i++) {
+ $vector[chr($i)] = $custom_vector[$i];
+ }
- global $g_utf8_converters;
- if (isset($g_utf8_converters[$encoding])) {
- $vector = $g_utf8_converters[$encoding][0];
- } elseif (isset($this->_encodings[$encoding])) {
- $vector = $this->_encodings[$encoding];
} else {
- return null;
- };
+ global $g_utf8_converters;
+
+ if (!isset($g_utf8_converters[$encoding])) {
+ return null;
+ }
- for ($i = 0; $i <= 255; $i++) {
+ $vector = $g_utf8_converters[$encoding][0];
+ }
+
+ for ($i=0; $i<=255; $i++) {
if (!isset($vector[chr($i)])) {
$vector[chr($i)] = 0xFFFF;
- };
- };
-
+ }
+ }
return $vector;
}
+ function &get() {
+ global $g_manager_encodings;
+ return $g_manager_encodings;
+ }
+
+ function get_encoding_glyphs($encoding) {
+ $vector = $this->getEncodingVector($encoding);
+ if (is_null($vector)) {
+ error_log(sprintf("Cannot get encoding vector for encoding '%s'", $encoding));
+ return null;
+ }
+ return $this->vector_to_glyphs($vector);
+ }
+
function get_glyph_to_code_mapping($encoding) {
- $vector = $this->get_encoding_vector($encoding);
+ $vector = $this->getEncodingVector($encoding);
$result = array();
foreach ($vector as $code => $uccode) {
if (isset($GLOBALS['g_unicode_glyphs'][$uccode])) {
$result[$GLOBALS['g_unicode_glyphs'][$uccode]][] = $code;
- };
- };
+ }
+ }
return $result;
}
- function get_mapping($char) {
- if (!isset($this->_utf8_mapping)) {
- $this->load_mapping(CACHE_DIR . 'utf8.mappings.dat');
- };
-
- if (!isset($this->_utf8_mapping[$char])) {
- return null;
- };
- return $this->_utf8_mapping[$char];
- }
+ function vector_to_glyphs($vector) {
+ $result = array();
- function get_next_utf8_char($raw_content, &$ptr) {
- if ((ord($raw_content[$ptr]) & 0xF0) == 0xF0) {
- $charlen = 4;
- } elseif ((ord($raw_content[$ptr]) & 0xE0) == 0xE0) {
- $charlen = 3;
- } elseif ((ord($raw_content[$ptr]) & 0xC0) == 0xC0) {
- $charlen = 2;
- } else {
- $charlen = 1;
- };
-
- $char = substr($raw_content,$ptr,$charlen);
- $ptr += $charlen;
+ foreach ($vector as $code => $ucs2) {
+ if (isset($GLOBALS['g_unicode_glyphs'][$ucs2])) {
+ $result[$code] = $GLOBALS['g_unicode_glyphs'][$ucs2];
+ } elseif ($ucs2 == 0xFFFF) {
+ $result[$code] = ".notdef";
+ } else {
+ // Use "Unicode and Glyph Names" mapping from Adobe
+ // http://partners.adobe.com/public/developer/opentype/index_glyph.html
+ $result[$code] = sprintf("u%04X", $ucs2);
+ }
+ }
- return $char;
+ return $result;
}
function get_ps_encoding_vector($encoding) {
- $vector = $this->get_encoding_vector($encoding);
+ $vector = $this->getEncodingVector($encoding);
$result = "/".$encoding." [ \n";
for ($i=0; $i<256; $i++) {
- if ($i % 10 == 0) { $result .= "\n"; };
+ if ($i % 10 == 0) { $result .= "\n"; }
// ! Note the order of array checking; optimizing interpreters may break this
if (isset($vector[chr($i)]) && isset($GLOBALS['g_unicode_glyphs'][$vector[chr($i)]])) {
$result .= " /".$GLOBALS['g_unicode_glyphs'][$vector[chr($i)]];
} else {
$result .= " /.notdef";
- };
- };
+ }
+ }
$result .= " ] readonly def";
return $result;
}
- function is_custom_encoding($encoding) {
- return preg_match('/^custom\d+$/', $encoding);
- }
-
- function is_custom_encoding_full() {
- return count($this->_encodings[$this->get_current_custom_encoding_name()]) >= 256;
- }
-
- function load_mapping($mapping_file) {
- if (!is_readable($mapping_file)) {
- $this->generate_mapping($mapping_file);
+ function getNextUTF8Char($raw_content, &$ptr) {
+ if ((ord($raw_content[$ptr]) & 0xF0) == 0xF0) {
+ $charlen = 4;
+ } elseif ((ord($raw_content[$ptr]) & 0xE0) == 0xE0) {
+ $charlen = 3;
+ } elseif ((ord($raw_content[$ptr]) & 0xC0) == 0xC0) {
+ $charlen = 2;
} else {
- $this->_utf8_mapping = unserialize(file_get_contents($mapping_file));
- };
- }
-
- /**
- * Create new custom 256-characters encoding vector. Reserve first
- * 32 symbols for system use.
- *
- * Custom encoding vectors have names 'customX' when X stand for the
- * encoding index.
- */
- function new_custom_encoding_vector() {
- $initial_vector = array();
- for ($i = 0; $i <= 32; $i++) {
- $initial_vector[chr($i)] = chr($i);
- };
- $this->register_encoding(sprintf('custom%d',
- $this->next_custom_vector_index()),
- $initial_vector);
- }
-
- /**
- * Returns index for the next custom encoding
- */
- function next_custom_vector_index() {
- return ++$this->_custom_vector_index;
- }
-
- function register_encoding($name, $vector) {
- $this->_encodings[$name] = $vector;
- }
-
- function to_utf8($word, $encoding) {
- $vector = $this->get_encoding_vector($encoding);
+ $charlen = 1;
+ }
- $converted = '';
- for ($i=0, $size=strlen($word); $i < $size; $i++) {
- $converted .= code_to_utf8($vector[$word{$i}]);
- };
-
- return $converted;
- }
-
- function vector_to_glyphs($vector) {
- $result = array();
-
- foreach ($vector as $code => $ucs2) {
- if (isset($GLOBALS['g_unicode_glyphs'][$ucs2])) {
- $result[$code] = $GLOBALS['g_unicode_glyphs'][$ucs2];
- } elseif ($ucs2 == 0xFFFF) {
- $result[$code] = ".notdef";
- } else {
- // Use "Unicode and Glyph Names" mapping from Adobe
- // http://partners.adobe.com/public/developer/opentype/index_glyph.html
- $result[$code] = sprintf("u%04X", $ucs2);
- };
- };
+ $char = substr($raw_content,$ptr,$charlen);
+ $ptr += $charlen;
- return $result;
+ return $char;
}
}
diff --git a/public_html/media.layout.inc.php b/public_html/media.layout.inc.php
index d2e0a8f..7776bfe 100644
--- a/public_html/media.layout.inc.php
+++ b/public_html/media.layout.inc.php
@@ -1,5 +1,5 @@
size = $size;
- $this->margins = $margins;
- $this->pixels = 800;
- }
-
- function ©() {
- $new_item =& new Media($this->size, $this->margins);
- $new_item->pixels = $this->pixels;
- return $new_item;
- }
-
- function doInherit() {
- }
-
- function get_width() {
- return $this->is_landscape ? $this->size['height'] : $this->size['width'] ;
- }
-
- function width() {
- return $this->get_width();
- }
-
- function get_height() {
- return $this->height();
- }
-
- function height() {
- return $this->is_landscape ? $this->size['width'] : $this->size['height'];
- }
+ function width() { return $this->is_landscape ? (float) $this->size['height'] : (float) $this->size['width'] ; }
+ function height() { return $this->is_landscape ? (float) $this->size['width'] : (float) $this->size['height']; }
function real_width() {
- return $this->width() - $this->margins['left'] - $this->margins['right'];
+ return $this->width() - (float) $this->margins['left'] - (float) $this->margins['right'];
}
- function real_height() {
- return $this->height() - $this->margins['bottom'] - $this->margins['top'];
- }
-
- function set_height($height) {
- $this->size['height'] = $height;
+ function real_height() {
+ return $this->height() - (float) $this->margins['bottom'] - (float) $this->margins['top'];
}
function set_landscape($state) {
@@ -75,23 +39,30 @@ function set_margins($margins) {
function set_pixels($pixels) {
$this->pixels = $pixels;
}
-
- function set_width($width) {
- $this->size['width'] = $width;
- }
// TODO: validity checking
- function &predefined($name) {
+ function predefined($name) {
global $g_predefined_media;
-
+ $g_predefined_media[$name] = [
+ "height" => '297,0',
+ "width" => '210,0'
+ ];
// Let's check if the chosen media defined
if (isset($g_predefined_media[$name])) {
- $media =& new Media($g_predefined_media[$name], array('top'=>0, 'bottom'=>0, 'left'=>0, 'right'=>0));
+ return new Media($g_predefined_media[$name], array('top'=>0, 'bottom'=>0, 'left'=>0, 'right'=>0));
} else {
- $media = null;
- };
+ return null;
+ }
+ }
- return $media;
+ /**
+ * @param Array $size associative array with 'height' and 'width' keys (mm)
+ * @param Array $margins associative array with 'top', 'bottom', 'left' and 'right' keys (mm)
+ */
+ function __construct($size = null, $margins = null) {
+ $this->size = $size;
+ $this->margins = $margins;
+ $this->pixels = 800;
}
/**
@@ -106,7 +77,7 @@ function to_bbox() {
}
function to_ps_landscape() {
- if (!$this->is_landscape) { return "/initpage {} def"; };
+ if (!$this->is_landscape) { return "/initpage {} def"; }
return "/initpage {90 rotate 0 pageheight neg translate} def";
}
diff --git a/public_html/ot.class.php b/public_html/ot.class.php
index 4cc28d9..b487a66 100644
--- a/public_html/ot.class.php
+++ b/public_html/ot.class.php
@@ -19,7 +19,7 @@ class OpenTypeFile {
var $_filehandle;
var $_sfnt;
- function OpenTypeFile() {
+ function __construct() {
$this->_filehandle = null;
$this->_sfnt = new OpenTypeFileSFNT();
}
@@ -72,11 +72,11 @@ function _delete() {
foreach ($this->_tables as $key => $value) {
$this->_tables[$key]->_delete();
unset($this->_tables[$key]);
- };
+ }
$this->_tables = array();
}
- function OpenTypeFileSFNT() {
+ function __construct() {
$this->_offsetTable = new OpenTypeFileOffsetTable();
$this->_tableDirectory = array();
}
@@ -88,12 +88,12 @@ function _read($filehandle) {
$tableDirectory = new OpenTypeFileTableDirectory();
$tableDirectory->_read($filehandle);
$this->_tableDirectory[] = $tableDirectory;
- };
+ }
}
function &_getCMAPSubtable($offset, $filehandle, $file) {
$dir = $this->_getDirectory('cmap');
- if (is_null($dir)) { $dummy = null; return $dummy; };
+ if (is_null($dir)) { $dummy = null; return $dummy; }
/**
* Store current file position, as _getCMAPSubtable could be
@@ -117,11 +117,11 @@ function &_getCMAPSubtable($offset, $filehandle, $file) {
function &_getTable($tag, $filehandle, $file) {
if (!isset($this->_tables[$tag])) {
$table = $this->_createTableByTag($tag);
- if (is_null($table)) { $dummy = null; return $dummy; };
+ if (is_null($table)) { $dummy = null; return $dummy; }
$table->setFontFile($file);
$dir = $this->_getDirectory($tag);
- if (is_null($dir)) { $dummy = null; return $dummy; };
+ if (is_null($dir)) { $dummy = null; return $dummy; }
/**
* Store current file position, as _getTable could be called
@@ -138,7 +138,7 @@ function &_getTable($tag, $filehandle, $file) {
fseek($filehandle, $old_pos, SEEK_SET);
$this->_tables[$tag] =& $table;
- };
+ }
return $this->_tables[$tag];
}
@@ -147,8 +147,8 @@ function _getDirectory($tag) {
foreach ($this->_tableDirectory as $directoryEntry) {
if ($directoryEntry->_tag == $tag) {
return $directoryEntry;
- };
- };
+ }
+ }
return null;
}
@@ -199,7 +199,7 @@ class OpenTypeFileOffsetTable {
var $_entrySelector;
var $_rangeShift;
- function OpenTypeFileOffsetTable() {
+ function __construct() {
$this->_numTables = 0;
$this->_searchRange = 0;
$this->_entrySelector = 0;
@@ -248,7 +248,7 @@ class OpenTypeFileTableDirectory {
var $_offset;
var $_length;
- function OpenTypeFileTableDirectory() {
+ function __construct() {
$this->_tag = null;
$this->_checkSum = 0;
$this->_offset = 0;
@@ -275,7 +275,7 @@ class OpenTypeFileTable {
function _delete() {
}
- function OpenTypeFileTable() {
+ function __construct() {
$this->_fontFile = null;
}
@@ -292,7 +292,7 @@ function _fixFWord($value) {
return $value - 65536;
} else {
return $value;
- };
+ }
}
function _fixShort($value) {
@@ -300,7 +300,7 @@ function _fixShort($value) {
return $value - 65536;
} else {
return $value;
- };
+ }
}
}
@@ -315,8 +315,8 @@ class OpenTypeFilePOST extends OpenTypeFileTable {
var $_minMemType1;
var $_maxMemType1;
- function OpenTypeFilePOST() {
- $this->OpenTypeFileTable();
+ function __construct() {
+ OpenTypeFileTable::__construct();
}
function _read($filehandle) {
@@ -340,8 +340,8 @@ class OpenTypeFileNAME extends OpenTypeFileTable {
var $_stringOffset;
var $_nameRecord;
- function OpenTypeFileNAME() {
- $this->OpenTypeFileTable();
+ function __construct() {
+ OpenTypeFileTable::__construct();
$this->_nameRecord = array();
}
@@ -356,12 +356,12 @@ function _read($filehandle) {
$baseOffset = ftell($filehandle) + OpenTypeFileNAMERecord::sizeof()*$this->_count;
for ($i=0; $i<$this->_count; $i++) {
- $record =& new OpenTypeFileNAMERecord();
+ $record= new OpenTypeFileNAMERecord();
$record->setBaseOffset($baseOffset);
$record->setFontFile($this->getFontFile());
$record->_read($filehandle);
$this->_nameRecord[] =& $record;
- };
+ }
}
/**
@@ -378,7 +378,7 @@ function lookup($platformId, $encodingId, $languageId, $nameId) {
for ($i=0; $i<$size; $i++) {
if ($this->_nameRecord[$i]->match($platformId, $encodingId, $languageId, $nameId)) {
return $this->_nameRecord[$i]->getName();
- };
+ }
}
return null;
@@ -396,12 +396,12 @@ class OpenTypeFileNAMERecord extends OpenTypeFileTable {
var $_content;
var $_baseOffset;
- function OpenTypeFileNAMERecord() {
- $this->OpenTypeFileTable();
+ function __construct() {
+ OpenTypeFileTable::__construct();
$this->_content = null;
}
- function sizeof() {
+ static function sizeof() {
return 6*2;
}
@@ -431,7 +431,7 @@ function getName() {
$this->_content = fread($filehandle, $this->_length);
fseek($filehandle, $old_offset, SEEK_SET);
- };
+ }
return $this->_content;
}
@@ -515,8 +515,8 @@ class OpenTypeFileHEAD extends OpenTypeFileTable {
var $_indexToLocFormat;
var $_glyphDataFormat;
- function OpenTypeFileHEAD() {
- $this->OpenTypeFileTable();
+ function __construct() {
+ OpenTypeFileTable::__construct();
}
function _read($filehandle) {
@@ -548,8 +548,8 @@ class OpenTypeFileCMAP extends OpenTypeFileTable {
var $_encodings;
var $_subtables;
- function OpenTypeFileCMAP() {
- $this->OpenTypeFileTable();
+ function __construct() {
+ OpenTypeFileTable::__construct();
$this->_header = new OpenTypeFileCMAPHeader();
$this->_encodings = array();
$this->_subtables = array();
@@ -562,7 +562,7 @@ function _read($filehandle) {
$encoding = new OpenTypeFileCMAPEncoding();
$encoding->_read($filehandle);
$this->_encodings[] =& $encoding;
- };
+ }
}
/**
@@ -586,8 +586,8 @@ function &findSubtable($platformId, $encodingId) {
if ($encoding->_platformId == $platformId &&
$encoding->_encodingId == $encodingId) {
return $this->getSubtable($index);
- };
- };
+ }
+ }
$dummy = null; return $dummy;
}
@@ -600,7 +600,7 @@ function &getSubtable($index) {
return $subtable;
} else {
return $this->_subtables[$index];
- };
+ }
}
}
@@ -611,7 +611,7 @@ class OpenTypeFileCMAPSubtable {
var $_format;
var $_content;
- function OpenTypeFileCMAPSubtable() {
+ function __construct() {
$this->_content = null;
}
@@ -650,7 +650,7 @@ class OpenTypeFileCMAPSubtable4 extends OpenTypeFileTable {
var $_idRangeOffset;
var $_glyphIdArray;
- function OpenTypeFileCMAPSubtable4() {
+ function __construct() {
$this->_endCount = array();
$this->_startCount = array();
$this->_idDelta = array();
@@ -660,7 +660,7 @@ function OpenTypeFileCMAPSubtable4() {
function lookup($unicode) {
$index = $this->_lookupSegment($unicode);
- if (is_null($index)) { return null; };
+ if (is_null($index)) { return null; }
if ($this->_idRangeOffset[$index] != 0) {
/**
@@ -691,8 +691,8 @@ function lookup($unicode) {
* to get the corresponding glyph index. Again, the idDelta
* arithmetic is modulo 65536.
*/
- return ($this->_idDelta[$index] + $unicode) % 65536;
- };
+ return $this->_idDelta[$index] + $unicode;
+ }
}
/**
@@ -714,9 +714,9 @@ function _lookupSegment($unicode) {
return $i;
} else {
return null;
- };
- };
- };
+ }
+ }
+ }
return null;
}
@@ -734,7 +734,7 @@ function _read($filehandle) {
$content = fread($filehandle, 2);
$unpacked = unpack("nendCount", $content);
$this->_endCount[] = $unpacked['endCount'];
- };
+ }
// Skip 'reservedPad' field
$content = fread($filehandle, 2);
@@ -743,25 +743,25 @@ function _read($filehandle) {
$content = fread($filehandle, 2);
$unpacked = unpack("nstartCount", $content);
$this->_startCount[] = $unpacked['startCount'];
- };
+ }
for ($i=0; $i<$this->_segCountX2/2; $i++) {
$content = fread($filehandle, 2);
$unpacked = unpack("nidDelta", $content);
$this->_idDelta[] = $this->_fixShort($unpacked['idDelta']);
- };
+ }
for ($i=0; $i<$this->_segCountX2/2; $i++) {
$content = fread($filehandle, 2);
$unpacked = unpack("nidRangeOffset", $content);
$this->_idRangeOffset[] = $unpacked['idRangeOffset'];
- };
+ }
for ($i=0; $i<$this->_length - 2*12; $i+=2) {
$content = fread($filehandle, 2);
$unpacked = unpack("nglyphId", $content);
$this->_glyphIdArray[] = $unpacked['glyphId'];
- };
+ }
}
}
@@ -797,8 +797,8 @@ function _read($filehandle) {
class OpenTypeFileMAXP extends OpenTypeFileTable {
var $_numGlyphs;
- function OpenTypeFileMAXP() {
- $this->OpenTypeFileTable();
+ function __construct() {
+ OpenTypeFileTable::__construct();
}
function _read($filehandle) {
@@ -825,8 +825,8 @@ class OpenTypeFileHHEA extends OpenTypeFileTable {
var $_metricDataFormat;
var $_numberOfHMetrics;
- function OpenTypeFileHHEA() {
- $this->OpenTypeFileTable();
+ function __construct() {
+ OpenTypeFileTable::__construct();
}
function _read($filehandle) {
@@ -861,8 +861,8 @@ function _delete() {
unset($this->_leftSideBearing);
}
- function OpenTypeFileHMTX() {
- $this->OpenTypeFileTable();
+ function __construct() {
+ OpenTypeFileTable::__construct();
$this->_hMetrics = array();
$this->_leftSideBearing = array();
@@ -878,13 +878,13 @@ function _read($filehandle) {
$unpacked = unpack("nadvanceWidth/nlsb", $content);
$this->_hMetrics[] = array('advanceWidth' => $unpacked['advanceWidth'],
'lsb' => $this->_fixShort($unpacked['lsb']));
- };
+ }
for ($i=0; $i<$maxp->_numGlyphs; $i++) {
$content = fread($filehandle, 2);
$unpacked = unpack("nitem", $content);
$this->_leftSideBearing[] = $unpacked['item'];
- };
+ }
}
}
diff --git a/public_html/output._generic.class.php b/public_html/output._generic.class.php
index ea3df00..0d4526b 100644
--- a/public_html/output._generic.class.php
+++ b/public_html/output._generic.class.php
@@ -1,5 +1,5 @@
set_debug_boxes(false);
- $this->set_filename($this->mk_filename());
- $this->set_show_page_border(false);
-
- $this->setFootnoteAreaHeight(0);
- $this->setFootnoteCount(0);
-
- $this->_postponed = array();
-
- $this->anchors = array();
- }
-
function postpone(&$box) {
$this->_postponed[] =& $box;
}
function show_postponed() {
- $size = count($this->_postponed);
+ $size = count((array) $this->_postponed);
for ($i=0; $i<$size; $i++) {
$box =& $this->_postponed[$i];
@@ -66,11 +50,11 @@ function show_postponed() {
$box->_setupClip($this);
$box->show_postponed($this, true);
$this->restore();
- };
+ }
}
function show_postponed_in_absolute() {
- $size = count($this->_postponed);
+ $size = count((array) $this->_postponed);
for ($i=0; $i<$size; $i++) {
$box =& $this->_postponed[$i];
@@ -80,12 +64,12 @@ function show_postponed_in_absolute() {
$box->_setupClip($this);
$box->show_postponed($this, true);
$this->restore();
- };
- };
+ }
+ }
}
function show_postponed_in_fixed() {
- $size = count($this->_postponed);
+ $size = count((array) $this->_postponed);
for ($i=0; $i<$size; $i++) {
$box =& $this->_postponed[$i];
@@ -94,8 +78,8 @@ function show_postponed_in_fixed() {
$box->_setupClip($this);
$box->show_postponed($this, true);
$this->restore();
- };
- };
+ }
+ }
}
function next_page($old_page_height) {
@@ -104,7 +88,6 @@ function next_page($old_page_height) {
$this->setPageHeight(mm2pt($this->media->real_height()));
$this->_postponed = array();
- $this->current_page ++;
}
function setPageHeight($value) {
@@ -178,8 +161,8 @@ function willContain(&$box, $footnote_height) {
* These two types of boxes are not visual and
* may have incorrect position
*/
- if (is_a($box, 'TableSectionBox')) { return true; };
- if (is_a($box, 'TableRowBox')) { return true; };
+ if (is_a($box, "TableSectionBox")) { return true; }
+ if (is_a($box, "TableRowBox")) { return true; }
$top = round($box->get_top(),2);
$bottom = round($box->get_bottom(),2);
@@ -187,7 +170,7 @@ function willContain(&$box, $footnote_height) {
$vp_top = $this->getPageTop();
$vp_bottom = max($this->getFootnoteTop() + $footnote_height,
$this->getPageTop() - $this->getPageHeight());
-
+
return ($top > $vp_bottom &&
$bottom <= $vp_top);
}
@@ -215,7 +198,7 @@ function mk_filename() {
// In general, we'll try to create these files in ./temp subdir of current
// directory, but it can be overridden by environment vars both on Windows and
// Linux
- $filename = tempnam(WRITER_TEMPDIR,WRITER_FILE_PREFIX);
+ $filename = tempnam(WRITER_TEMPDIR,WRITER_FILE_PREFIX);
$filehandle = @fopen($filename, "wb");
// Now, if we have had any troubles, $filehandle will be
@@ -226,17 +209,17 @@ function mk_filename() {
// Fallback to some stupid algorithm of filename generation
$tries = 0;
do {
- $filename = WRITER_TEMPDIR.DIRECTORY_SEPARATOR.WRITER_FILE_PREFIX.md5(uniqid(rand(), true));
+ $filename = WRITER_TEMPDIR.WRITER_FILE_PREFIX.md5(uniqid(rand(), true));
// Note: "x"-mode prevents us from re-using existing files
// But it require PHP 4.3.2 or later
$filehandle = @fopen($filename, "xb");
$tries++;
} while (!$filehandle && $tries < WRITER_RETRIES);
- };
+ }
if (!$filehandle) {
die(WRITER_CANNOT_CREATE_FILE);
- };
+ }
// Release this filehandle - we'll reopen it using some gzip wrappers
// (if they are available)
@@ -290,40 +273,43 @@ function set_show_page_border($show) {
}
function setup_clip() {
- if (!$GLOBALS['g_config']['debugnoclip']) {
- $this->moveto($this->left, $this->bottom + $this->height + $this->offset);
- $this->lineto($this->left + $this->width, $this->bottom + $this->height + $this->offset);
- $this->lineto($this->left + $this->width, $this->bottom + $this->height + $this->offset - $this->getPageHeight());
- $this->lineto($this->left, $this->bottom + $this->height + $this->offset - $this->getPageHeight());
- $this->clip();
- };
- }
-
- function prepare() {
+ $this->moveto($this->left, $this->bottom + $this->height + $this->offset);
+ $this->lineto($this->left + $this->width, $this->bottom + $this->height + $this->offset);
+ $this->lineto($this->left + $this->width, $this->bottom + $this->height + $this->offset - $this->getPageHeight());
+ $this->lineto($this->left, $this->bottom + $this->height + $this->offset - $this->getPageHeight());
+ $this->clip();
}
- function reset(&$media) {
- $this->update_media($media);
- $this->_postponed = array();
+ function __construct() {
+ // Properties setup
+ $this->set_debug_boxes(false);
+ $this->set_filename($this->mk_filename());
+ $this->set_show_page_border(false);
- $this->offset = 0;
- $this->offset_delta = 0;
- $this->expected_pages = 0;
- $this->current_page = 0;
- }
+ $this->setFootnoteAreaHeight(0);
+ $this->setFootnoteCount(0);
- function &get_media() {
- return $this->media;
+ $this->_postponed = array();
}
- function update_media(&$media) {
+ function reset(&$media) {
$this->media =& $media;
$this->width = mm2pt($media->width() - $media->margins['left'] - $media->margins['right']);
$this->height = mm2pt($media->height() - $media->margins['top'] - $media->margins['bottom']);
$this->left = mm2pt($media->margins['left']);
$this->bottom = mm2pt($media->margins['bottom']);
+ $this->offset = 0;
+ $this->offset_delta = 0;
+ $this->expected_pages = 0;
+ $this->current_page = 1;
$this->setPageHeight(mm2pt($media->real_height()));
+ $this->_postponed = array();
+ }
+
+ function set_watermark($watermark) {
+ $this->_watermark = $watermark;
}
+
}
?>
\ No newline at end of file
diff --git a/public_html/output._generic.pdf.class.php b/public_html/output._generic.pdf.class.php
index be969a3..ede51fe 100644
--- a/public_html/output._generic.pdf.class.php
+++ b/public_html/output._generic.pdf.class.php
@@ -4,18 +4,18 @@
class OutputDriverGenericPDF extends OutputDriverGeneric {
var $pdf_version;
- function OutputDriverGenericPDF() {
- $this->OutputDriverGeneric();
+ function __construct() {
+ OutputDriverGeneric::__construct();
$this->set_pdf_version("1.3");
}
- function content_type() { return ContentType::pdf(); }
+ function content_type() { return (new ContentType())->pdf(); }
function get_pdf_version() {
return $this->pdf_version;
}
- function reset($media) {
+ function reset(&$media) {
OutputDriverGeneric::reset($media);
}
diff --git a/public_html/output._generic.ps.class.php b/public_html/output._generic.ps.class.php
index 07b7a40..70e8dc4 100644
--- a/public_html/output._generic.ps.class.php
+++ b/public_html/output._generic.ps.class.php
@@ -1,13 +1,11 @@
ps(); }
function &get_image_encoder() {
return $this->image_encoder;
@@ -17,8 +15,8 @@ function get_language_level() {
return $this->language_level;
}
- function OutputDriverGenericPS($image_encoder) {
- $this->OutputDriverGeneric();
+ function __construct($image_encoder) {
+ OutputDriverGeneric::__construct();
$this->set_language_level(2);
$this->set_image_encoder($image_encoder);
diff --git a/public_html/output.fastps.class.php b/public_html/output.fastps.class.php
index d1e0745..a9ca12c 100644
--- a/public_html/output.fastps.class.php
+++ b/public_html/output.fastps.class.php
@@ -1,5 +1,5 @@
OutputDriverGenericPS($image_encoder);
- }
-
function add_link($x, $y, $w, $h, $target) {
$this->write(sprintf("[ /Rect [ %.2f %.2f %.2f %.2f ] /Action << /Subtype /URI /URI (%s) >> /Border [0 0 0] /Subtype /Link /ANN pdfmark\n",
$x, $y, $x+$w, $y-$h, $this->_string($target)));
@@ -39,7 +35,11 @@ function clip() {
}
function close() {
+ $this->_show_watermark();
+
+ if ($this->status != FASTPS_STATUS_OUTPUT_STARTED) { return; }
$this->_terminate_output();
+
fclose($this->data);
}
@@ -67,22 +67,22 @@ function _findfont($name, $encoding) {
$this->error_message .= $this->font_factory->error_message();
$dummy = null;
return $dummy;
- };
+ }
if (!isset($this->used_encodings[$encoding])) {
$this->used_encodings[$encoding] = true;
- $manager = ManagerEncoding::get();
+ $manager = (new ManagerEncoding())->get();
$this->_write_document_prolog($manager->get_ps_encoding_vector($encoding));
$this->_write_document_prolog("\n");
- };
+ }
$fontname = $font->name();
if (!isset($this->found_fonts[$fontname])) {
$this->found_fonts[$fontname] = true;
$this->_write_document_prolog("/$fontname /$name $encoding findfont-enc def\n");
- };
+ }
return $font;
}
@@ -91,7 +91,7 @@ function _findfont($name, $encoding) {
//
function font_ascender($name, $encoding) {
$font = $this->_findfont($name, $encoding);
- if (is_null($font)) { return null; };
+ if (is_null($font)) { return null; }
return $font->ascender()/1000;
}
@@ -100,7 +100,7 @@ function font_ascender($name, $encoding) {
//
function font_descender($name, $encoding) {
$font = $this->_findfont($name, $encoding);
- if (is_null($font)) { return null; };
+ if (is_null($font)) { return null; }
return -$font->descender()/1000;
}
@@ -199,10 +199,9 @@ function moveto($x, $y) {
}
function next_page($height) {
- if ($this->current_page > 0) {
- $this->write("showpage\n");
- };
+ $this->_show_watermark();
+ $this->current_page ++;
$this->offset -= $height - $this->offset_delta;
// Reset the "correction" offset to it normal value
@@ -210,7 +209,8 @@ function next_page($height) {
// in the middle of text boxes
$this->offset_delta = 0;
- $this->write(sprintf("%%%%Page: %d %d\n", $this->current_page + 1, $this->current_page + 1));
+ $this->write("showpage\n");
+ $this->write(sprintf("%%%%Page: %d %d\n", $this->current_page, $this->current_page));
$this->write("%%BeginPageSetup\n");
$this->write(sprintf("initpage\n"));
$this->write(sprintf("0 %.2f translate\n", -$this->offset));
@@ -220,7 +220,11 @@ function next_page($height) {
parent::next_page($height);
}
- function reset(&$media) {
+ function __construct(&$image_encoder) {
+ OutputDriverGenericPS::__construct($image_encoder);
+ }
+
+ function reset(&$media) {
OutputDriverGenericPS::reset($media);
$this->media =& $media;
@@ -236,12 +240,12 @@ function reset(&$media) {
$this->linethrough = false;
// A font class factory
- $this->font_factory =& new FontFactory;
+ $this->font_factory = new FontFactory;
- $this->_document_body = '';
- $this->_document_prolog = '';
+ $this->current_page = 1;
- $this->status = FASTPS_STATUS_DOCUMENT_INITIALIZED;
+ $this->_document_body = "";
+ $this->_document_prolog = "";
}
function restore() {
@@ -258,7 +262,7 @@ function setfont($name, $encoding, $size) {
$this->fontsize = $size;
$this->currentfont = $this->_findfont($name, $encoding);
- if (is_null($this->currentfont)) { return null; };
+ if (is_null($this->currentfont)) { return null; }
$this->write(sprintf("%s %.2f scalefont setfont\n", $this->currentfont->name(), $size));
@@ -276,15 +280,15 @@ function setrgbcolor($r, $g, $b) {
}
function show_xy($text, $x, $y) {
- if (trim($text) !== '') {
+ if (trim($text) !== "") {
$this->moveto($x, $y);
$this->write("(".$this->_string($text).") show\n");
- };
+ }
$width = Font::points($this->fontsize, $this->currentfont->stringwidth($text));
- if ($this->overline) { $this->_show_overline($x, $y, $width, $this->fontsize); };
- if ($this->underline) { $this->_show_underline($x, $y, $width, $this->fontsize); };
- if ($this->linethrough) { $this->_show_linethrough($x, $y, $width, $this->fontsize); };
+ if ($this->overline) { $this->_show_overline($x, $y, $width, $this->fontsize); }
+ if ($this->underline) { $this->_show_underline($x, $y, $width, $this->fontsize); }
+ if ($this->linethrough) { $this->_show_linethrough($x, $y, $width, $this->fontsize); }
}
function stringwidth($string, $name, $encoding, $size) {
@@ -294,7 +298,7 @@ function stringwidth($string, $name, $encoding, $size) {
$this->error_message .= $this->font_factory->error_message();
$dummy = null;
return $dummy;
- };
+ }
return Font::points($size, $font->stringwidth($string));
}
@@ -304,9 +308,7 @@ function stroke() {
}
function write($string) {
- if ($this->status == FASTPS_STATUS_DOCUMENT_INITIALIZED) {
- $this->_start_output();
- };
+ if ($this->status == FASTPS_STATUS_DOCUMENT_INITIALIZED) { $this->_start_output(); }
$this->_document_body .= $string;
}
@@ -352,7 +354,7 @@ function _terminate_output() {
* Prepare the PS file header
* Note that %PS-Adobe-3.0 refers to DSC version, NOT language level
*/
- $header = file_get_contents(HTML2PS_DIR.'postscript/fastps.header.ps');
+ $header = file_get_contents(HTML2PS_DIR.'/postscript/fastps.header.ps');
global $g_config;
$header = preg_replace("/##PS2PDF##/",
@@ -364,12 +366,12 @@ function _terminate_output() {
$header = preg_replace("/##MEDIA##/", $this->media->to_ps(), $header);
$header = preg_replace("/##PROLOG##/", $this->_document_prolog, $header);
-
+
fwrite($this->data, $header);
fwrite($this->data, "\n");
fwrite($this->data, $this->_document_body);
- $footer = file_get_contents(HTML2PS_DIR.'postscript/fastps.footer.ps');
+ $footer = file_get_contents(HTML2PS_DIR.'/postscript/fastps.footer.ps');
fwrite($this->data, $footer);
}
@@ -389,11 +391,11 @@ function _string($str) {
// Replace characters having 8-bit set with their octal representation
for ($i=0; $i 127) {
- $str = substr_replace($str, sprintf("\\%o", ord($str{$i})), $i, 1);
+ if (ord($str[$i]) > 127) {
+ $str = substr_replace($str, sprintf("\\%o", ord($str[$i])), $i, 1);
$i += 3;
- };
- };
+ }
+ }
return $str;
}
diff --git a/public_html/output.fastps.l2.class.php b/public_html/output.fastps.l2.class.php
index 696f972..dc87ed0 100644
--- a/public_html/output.fastps.l2.class.php
+++ b/public_html/output.fastps.l2.class.php
@@ -1,10 +1,6 @@
OutputDriverFastPS($image_encoder);
- }
-
function image($image, $x, $y, $scale) {
$this->image_scaled($image, $x, $y, $scale, $scale);
}
@@ -28,7 +24,7 @@ function image_scaled($image, $x, $y, $scale_x, $scale_y) {
$this->write(sprintf("grestore\n"));
$offset ++;
- };
+ }
}
function image_ry($image, $x, $y, $height, $bottom, $ox, $oy, $scale) {
@@ -37,14 +33,14 @@ function image_ry($image, $x, $y, $height, $bottom, $ox, $oy, $scale) {
while ($cy+$height > $bottom) {
$this->image($image, $x, $cy, $scale);
$cy -= $height;
- };
+ }
// Fill part to the top
$cy = $y;
while ($cy-$height < $y + $oy) {
$this->image($image, $x, $cy, $scale);
$cy += $height;
- };
+ }
}
function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
@@ -53,14 +49,14 @@ function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
while ($cx < $right) {
$this->image($image, $cx, $y, $scale);
$cx += $width;
- };
+ }
// Fill part to the left
$cx = $x;
while ($cx+$width >= $x - $ox) {
$this->image($image, $cx-$width, $y, $scale);
$cx -= $width;
- };
+ }
}
function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy, $scale) {
@@ -71,7 +67,7 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cx < $right) {
$this->image($image, $cx, $cy, $scale);
$cx += $width;
- };
+ }
$cy -= $height;
}
@@ -82,7 +78,7 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cx+$width > $x - $ox) {
$this->image($image, $cx, $cy, $scale);
$cx -= $width;
- };
+ }
$cy -= $height;
}
@@ -93,7 +89,7 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cx < $right) {
$this->image($image, $cx, $cy, $scale);
$cx += $width;
- };
+ }
$cy += $height;
}
@@ -104,7 +100,7 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cx+$width > $x - $ox) {
$this->image($image, $cx, $cy, $scale);
$cx -= $width;
- };
+ }
$cy += $height;
}
}
diff --git a/public_html/output.fpdf.class.php b/public_html/output.fpdf.class.php
index 9d1de06..6394661 100644
--- a/public_html/output.fpdf.class.php
+++ b/public_html/output.fpdf.class.php
@@ -1,5 +1,5 @@
OutputDriverGenericPDF();
- }
-
function add_link($x, $y, $w, $h, $target) {
$this->_coords2pdf_annotation($x, $y);
$this->pdf->add_link_external($x, $y, $w, $h, $target);
@@ -30,7 +28,7 @@ function add_local_link($left, $top, $width, $height, $anchor) {
$this->pdf->SetLink($this->locallinks[$anchor->name],
$y - 20,
$anchor->page);
- };
+ }
$x = $left;
$y = $top - $this->offset;
@@ -70,6 +68,7 @@ function clip() {
}
function close() {
+ $this->_show_watermark();
$this->pdf->Output($this->get_filename());
}
@@ -120,7 +119,7 @@ function field_pushbuttonsubmit($x, $y, $w, $h, $field_name, $value, $actionURL)
$this->pdf->add_field_pushbuttonsubmit($x, $y, $w, $h, $field_name, $value, $actionURL);
}
- function field_checkbox($x, $y, $w, $h, $name, $value, $checked) {
+ function field_checkbox($x, $y, $w, $h, $name, $value, $checked = false) {
$this->_coords2pdf_annotation($x, $y);
$this->pdf->add_field_checkbox($x, $y, $w, $h, $name, $value, $checked);
}
@@ -130,7 +129,7 @@ function field_radio($x, $y, $w, $h, $groupname, $value, $checked) {
if (is_null($groupname)) {
$generated_group_index ++;
$groupname = "__generated_group_".$generated_group_index;
- };
+ }
$this->_coords2pdf_annotation($x, $y);
$this->pdf->add_field_radio($x, $y, $w, $h, $groupname, $value, $checked);
@@ -164,10 +163,9 @@ function image($image, $x, $y, $scale) {
$this->_coords2pdf($x, $y);
$this->pdf->Image($tmpname,
$x,
- $y - $image->sy() * $scale,
- $image->sx() * $scale,
- $image->sy() * $scale);
-
+ $y - imagesy($image) * $scale,
+ imagesx($image) * $scale,
+ imagesy($image) * $scale);
unlink($tmpname);
}
@@ -178,21 +176,21 @@ function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
$cx = $x;
while ($cx < $right) {
$tx = $cx;
- $ty = $y + px2pt($image->sy());
+ $ty = $y + px2pt(imagesy($image));
$this->_coords2pdf($tx, $ty);
- $this->pdf->Image($tmpname, $tx, $ty, $image->sx() * $scale, $image->sy() * $scale, "png");
+ $this->pdf->Image($tmpname, $tx, $ty, imagesx($image) * $scale, imagesy($image) * $scale, "png");
$cx += $width;
- };
+ }
// Fill part to the left
$cx = $x;
while ($cx+$width >= $x - $ox) {
$tx = $cx-$width;
- $ty = $y + px2pt($image->sy());
+ $ty = $y + px2pt(imagesy($image));
$this->_coords2pdf($tx, $ty);
- $this->pdf->Image($tmpname, $tx, $ty, $image->sx() * $scale, $image->sy() * $scale, "png");
+ $this->pdf->Image($tmpname, $tx, $ty, imagesx($image) * $scale, imagesy($image) * $scale, "png");
$cx -= $width;
- };
+ }
unlink($tmpname);
}
@@ -209,9 +207,9 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
$ty = $cy+$height;
$this->_coords2pdf($tx, $ty);
- $this->pdf->Image($tmpname, $tx, $ty, $image->sx() * $scale, $image->sy() * $scale, "png");
+ $this->pdf->Image($tmpname, $tx, $ty, imagesx($image) * $scale, imagesy($image) * $scale, "png");
$cx += $width;
- };
+ }
$cy -= $height;
}
@@ -223,9 +221,9 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
$tx = $cx;
$ty = $cy;
$this->_coords2pdf($tx, $ty);
- $this->pdf->Image($tmpname, $tx, $ty, $image->sx() * $scale, $image->sy() * $scale, "png");
+ $this->pdf->Image($tmpname, $tx, $ty, imagesx($image) * $scale, imagesy($image) * $scale, "png");
$cx -= $width;
- };
+ }
$cy -= $height;
}
@@ -237,9 +235,9 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
$tx = $cx;
$ty = $cy;
$this->_coords2pdf($tx, $ty);
- $this->pdf->Image($tmpname, $tx, $ty, $image->sx() * $scale, $image->sy() * $scale, "png");
+ $this->pdf->Image($tmpname, $tx, $ty, imagesx($image) * $scale, imagesy($image) * $scale, "png");
$cx += $width;
- };
+ }
$cy += $height;
}
@@ -251,9 +249,9 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
$tx = $cx;
$ty = $cy;
$this->_coords2pdf($tx, $ty);
- $this->pdf->Image($tmpname, $tx, $ty, $image->sx() * $scale, $image->sy() * $scale, "png");
+ $this->pdf->Image($tmpname, $tx, $ty, imagesx($image) * $scale, imagesy($image) * $scale, "png");
$cx -= $width;
- };
+ }
$cy += $height;
}
@@ -268,21 +266,21 @@ function image_ry($image, $x, $y, $height, $bottom, $ox, $oy, $scale) {
$cy = $y;
while ($cy+$height > $bottom) {
$tx = $x;
- $ty = $cy + px2pt($image->sy());
+ $ty = $cy + px2pt(imagesy($image));
$this->_coords2pdf($tx, $ty);
- $this->pdf->Image($tmpname, $tx, $ty, $image->sx() * $scale, $image->sy() * $scale, "png");
+ $this->pdf->Image($tmpname, $tx, $ty, imagesx($image) * $scale, imagesy($image) * $scale, "png");
$cy -= $height;
- };
+ }
// Fill part to the top
$cy = $y;
while ($cy-$height < $y + $oy) {
$tx = $x;
- $ty = $cy + px2pt($image->sy());
+ $ty = $cy + px2pt(imagesy($image));
$this->_coords2pdf($tx, $ty);
- $this->pdf->Image($tmpname, $tx, $ty, $image->sx() * $scale, $image->sy() * $scale, "png");
+ $this->pdf->Image($tmpname, $tx, $ty, imagesx($image) * $scale, imagesy($image) * $scale, "png");
$cy += $height;
- };
+ }
unlink($tmpname);
}
@@ -291,7 +289,7 @@ function image_scaled($image, $x, $y, $scale_x, $scale_y) {
$tmpname = $this->_mktempimage($image);
$this->_coords2pdf($x, $y);
- $this->pdf->Image($tmpname, $x, $y - $image->sy() * $scale_y, $image->sx() * $scale_x, $image->sy() * $scale_y, "png");
+ $this->pdf->Image($tmpname, $x, $y - imagesy($image) * $scale_y, imagesx($image) * $scale_x, imagesy($image) * $scale_y, "png");
unlink($tmpname);
}
@@ -310,7 +308,11 @@ function new_form($name) {
}
function next_page($height) {
- $this->pdf->AddPage(mm2pt($this->media->width()), mm2pt($this->media->height()));
+ $this->_show_watermark();
+
+ $this->current_page ++;
+
+ $this->pdf->AddPage();
// Calculate coordinate of the next page bottom edge
$this->offset -= $height - $this->offset_delta;
@@ -325,16 +327,22 @@ function next_page($height) {
parent::next_page($height);
}
+ function __construct() {
+ OutputDriverGenericPDF::__construct();
+ }
+
function reset(&$media) {
parent::reset($media);
- $this->pdf =& new FPDF('P','pt',array(mm2pt($media->width()), mm2pt($media->height())));
+ $this->pdf = new FPDF("P","pt",array(mm2pt($media->width()), mm2pt($media->height())));
if (defined('DEBUG_MODE')) {
$this->pdf->SetCompression(false);
} else {
$this->pdf->SetCompression(true);
- };
+ }
+
+ $this->pdf->AddPage();
$this->cx = 0;
$this->cy = 0;
@@ -369,7 +377,6 @@ function setrgbcolor($r, $g, $b) {
function show_xy($text, $x, $y) {
$this->_coords2pdf($x, $y);
-
$this->pdf->Text($x, $y, $text);
}
@@ -379,11 +386,12 @@ function stroke() {
function stringwidth($string, $name, $encoding, $size) {
$this->setfont($name, $encoding, $size);
- $width = $this->pdf->GetStringWidth($string);
- return $width;
+ return $this->pdf->GetStringWidth($string);
}
- function _show_watermark($watermark) {
+ function _show_watermark() {
+ if (is_null($this->_watermark) || $this->_watermark == "") { return; }
+
$this->pdf->SetFont("Helvetica", "iso-8859-1", 100);
$x = $this->left + $this->width / 2;
@@ -395,7 +403,7 @@ function _show_watermark($watermark) {
$this->pdf->Translate($x, $y);
$this->pdf->Rotate(60);
- $tx = -$this->pdf->GetStringWidth($watermark)/2;
+ $tx = -$this->pdf->GetStringWidth($this->_watermark)/2;
$ty = -50;
$this->_coords2pdf($tx, $ty);
@@ -404,26 +412,12 @@ function _show_watermark($watermark) {
$this->pdf->Text($tx,
$ty,
- $watermark);
+ $this->_watermark);
}
function _mktempimage($image) {
- $tempnam = tempnam(WRITER_TEMPDIR, WRITER_FILE_PREFIX);
-
- switch ($image->get_type()) {
- case 'image/png':
- $filename = $tempnam . '.png';
- imagepng($image->get_handle(), $filename);
- break;
-
- case 'image/jpeg':
- default:
- $filename = $tempnam . '.jpg';
- imagejpeg($image->get_handle(), $filename);
- break;
- }
-
- unlink($tempnam);
+ $filename = tempnam(WRITER_TEMPDIR,WRITER_FILE_PREFIX);
+ imagepng($image, $filename);
return $filename;
}
}
diff --git a/public_html/output.pcl.class.php b/public_html/output.pcl.class.php
index 9df6ea1..ccc10c4 100644
--- a/public_html/output.pcl.class.php
+++ b/public_html/output.pcl.class.php
@@ -6,7 +6,7 @@
class StreamString {
var $_content;
- function StreamString() {
+ function __construct() {
$this->_content = "";
}
@@ -30,9 +30,9 @@ function output(&$stream) {
*
* X
*
- * where “X” is a character that defines the operation to be
- * performed. “X” may be any character from the ASCII table within the
- * range 48-126 decimal (“0” through “~” - see Appendix A).
+ * where �X� is a character that defines the operation to be
+ * performed. �X� may be any character from the ASCII table within the
+ * range 48-126 decimal (�0� through �~� - see Appendix A).
*/
class PCLEscapeGenericSimple {
function getSequenceString() {
@@ -55,10 +55,10 @@ function getSequenceString() {
$this->_getEscapedCharacter().
$this->_getGroupCharacter();
$groups = $this->_getGroups();
- $size = count($groups);
+ $size = is_countable($groups) ? count($groups) : 0;
for ($i=0; $i<$size-1; $i++) {
$result .= $groups[$i]->getString();
- };
+ }
$result .= $groups[$size-1]->getStringTerminate();
return $result;
}
@@ -68,7 +68,7 @@ class PCLEscapeGroup {
var $_value;
var $_character;
- function PCLEscapeGroup($char, $value) {
+ function __construct($char, $value) {
$this->_character = $char;
$this->_value = $value;
}
@@ -106,10 +106,10 @@ function _getEscapedCharacter() { return "E"; }
* Printer Job Language (PJL). Both PCL 5 and HP-GL/2 recognize this
* command.
*
- * % – 1 2 3 4 5 X
+ * % � 1 2 3 4 5 X
*
* Default = N/A
- * Range = –12345
+ * Range = �12345
* This command performs the following actions:
* .. Prints all data received before the Exit Language command.
* .. Performs a printer reset (same effect as ? E).
@@ -141,7 +141,7 @@ function _getGroups() {
class PCLEscapeNumberOfCopies extends PCLEscapeGenericParametric {
var $_number;
- function PCLEscapeNumberOfCopies($number) {
+ function __construct($number) {
$this->_number = $number;
}
@@ -176,7 +176,7 @@ function _getGroups() {
class PCLEscapeSimplexDuplex extends PCLEscapeGenericParametric {
var $_duplex;
- function PCLEscapeSimplexDuplex($duplex) {
+ function __construct($duplex) {
$this->_duplex = $duplex;
}
@@ -191,7 +191,7 @@ function _getGroups() {
* Print Job
*
* Structure of a Typical Job
- * %–12345X UEL Command (exit language)
+ * %�12345X UEL Command (exit language)
* E Printer Reset Command.
* Preamble Job Control Commands.
* Page 1 Page Control Commands.
@@ -202,7 +202,7 @@ function _getGroups() {
* Page n Page Control Commands.
* Data.
* E Printer Reset Command.
- * %–12345X UEL Command (exit language).
+ * %�12345X UEL Command (exit language).
*/
class PCLPrintJob {
function output(&$stream) {
@@ -214,7 +214,7 @@ function output(&$stream) {
$this->_preamble->output($stream);
foreach ($this->_pages as $page) {
$page->output($stream);
- };
+ }
$reset->output($stream);
$uel->output($stream);
}
diff --git a/public_html/output.pdflib.1.6.class.php b/public_html/output.pdflib.1.6.class.php
index c0104b0..aa302fd 100644
--- a/public_html/output.pdflib.1.6.class.php
+++ b/public_html/output.pdflib.1.6.class.php
@@ -6,7 +6,7 @@
class PDFLIBForm {
var $_name;
- function PDFLIBForm($name /*, $submit_action, $reset_action */) {
+ function __construct($name /*, $submit_action, $reset_action */) {
$this->_name = $name;
}
@@ -112,7 +112,7 @@ function field_pushbuttonsubmit($x, $y, $w, $h, $field_name, $value, $actionURL)
" "));
}
- function field_checkbox($x, $y, $w, $h, $name, $value, $checked) {
+ function field_checkbox($x, $y, $w, $h, $name, $value, $checked = false) {
pdf_create_field($this->pdf,
$x, $y, $x + $w, $y - $h,
$this->_fqn($name),
@@ -128,7 +128,7 @@ function field_radio($x, $y, $w, $h, $groupname, $value, $checked) {
if (!isset($this->_radiogroups[$fqgn])) {
$this->_radiogroups[$fqgn] = pdf_create_fieldgroup($this->pdf, $fqgn, "fieldtype=radiobutton");
- };
+ }
pdf_create_field($this->pdf,
$x, $y, $x + $w, $y - $h,
@@ -146,7 +146,7 @@ function field_select($x, $y, $w, $h, $name, $value, $options) {
foreach ($options as $option) {
$items_str .= sprintf("%s ",$option[0]);
$text_str .= sprintf("%s ",$option[1]);
- };
+ }
$font = $this->_control_font();
pdf_create_field($this->pdf,
@@ -187,13 +187,13 @@ function _lastform() {
error_log(sprintf("Anonymous form generated with name %s; check your HTML for validity",
$name));
- };
+ }
return $this->_forms[count($this->_forms)-1];
}
function _valid_name($name) {
- if (empty($name)) { return false; };
+ if (empty($name)) { return false; }
return true;
}
@@ -203,7 +203,7 @@ function _fqn($name, $allowexisting=false) {
$name = uniqid("AnonymousFormFieldObject_");
error_log(sprintf("Anonymous field generated with name %s; check your HTML for validity",
$name));
- };
+ }
$lastform = $this->_lastform();
$fqn = sprintf("%s.%s",
@@ -217,7 +217,7 @@ function _fqn($name, $allowexisting=false) {
$lastform->name(),
$name));
$fqn .= md5(rand().time());
- };
+ }
return $fqn;
}
diff --git a/public_html/output.pdflib.class.php b/public_html/output.pdflib.class.php
index 7813b4d..544b307 100644
--- a/public_html/output.pdflib.class.php
+++ b/public_html/output.pdflib.class.php
@@ -1,9 +1,5 @@
'winansi',
+ $translations = array(
+ 'iso-8859-1' => 'winansi',
'iso-8859-2' => 'iso8859-2',
'iso-8859-3' => 'iso8859-3',
'iso-8859-4' => 'iso8859-4',
@@ -45,9 +40,10 @@ function encoding($encoding) {
'windows-1250' => 'cp1250',
'windows-1251' => 'cp1251',
'windows-1252' => 'cp1252',
- 'symbol' => 'symbol');
+ 'symbol' => 'symbol'
+ );
- if (isset($translations[$encoding])) { return $translations[$encoding]; };
+ if (isset($translations[$encoding])) { return $translations[$encoding]; }
return $encoding;
}
@@ -74,6 +70,7 @@ function clip() {
}
function close() {
+ $this->_show_watermark();
pdf_end_page($this->pdf);
pdf_close($this->pdf);
pdf_delete($this->pdf);
@@ -102,9 +99,7 @@ function fill() {
function findfont($name, $encoding) {
// PDFLIB is limited by 'builtin' encoding for "Symbol" font
- if ($name == 'Symbol') {
- $encoding = 'builtin';
- };
+ if ($name == 'Symbol') { $encoding = 'builtin'; }
global $g_font_resolver_pdf;
$embed = $g_font_resolver_pdf->embed[$name];
@@ -125,7 +120,7 @@ function get_bottom() {
function image($image, $x, $y, $scale) {
$tmpname = tempnam(WRITER_TEMPDIR,WRITER_FILE_PREFIX);
- imagepng($image->get_handle(), $tmpname);
+ imagepng($image, $tmpname);
$pim = pdf_open_image_file($this->pdf, "png", $tmpname, "", 0);
pdf_place_image($this->pdf, $pim, $x, $y, $scale);
pdf_close_image($this->pdf, $pim);
@@ -134,7 +129,7 @@ function image($image, $x, $y, $scale) {
function image_scaled($image, $x, $y, $scale_x, $scale_y) {
$tmpname = tempnam(WRITER_TEMPDIR,WRITER_FILE_PREFIX);
- imagepng($image->get_handle(), $tmpname);
+ imagepng($image, $tmpname);
$pim = pdf_open_image_file($this->pdf, "png", $tmpname, "", 0);
@@ -150,7 +145,7 @@ function image_scaled($image, $x, $y, $scale_x, $scale_y) {
function image_ry($image, $x, $y, $height, $bottom, $ox, $oy, $scale) {
$tmpname = tempnam(WRITER_TEMPDIR,WRITER_FILE_PREFIX);
- imagepng($image->get_handle(), $tmpname);
+ imagepng($image, $tmpname);
$pim = pdf_open_image_file($this->pdf, "png", $tmpname, "", 0);
// Fill part to the bottom
@@ -158,14 +153,14 @@ function image_ry($image, $x, $y, $height, $bottom, $ox, $oy, $scale) {
while ($cy+$height > $bottom) {
pdf_place_image($this->pdf, $pim, $x, $cy, $scale);
$cy -= $height;
- };
+ }
// Fill part to the top
$cy = $y;
while ($cy-$height < $y + $oy) {
pdf_place_image($this->pdf, $pim, $x, $cy, $scale);
$cy += $height;
- };
+ }
pdf_close_image($this->pdf, $pim);
unlink($tmpname);
@@ -173,7 +168,7 @@ function image_ry($image, $x, $y, $height, $bottom, $ox, $oy, $scale) {
function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
$tmpname = tempnam(WRITER_TEMPDIR,WRITER_FILE_PREFIX);
- imagepng($image->get_handle(), $tmpname);
+ imagepng($image, $tmpname);
$pim = pdf_open_image_file($this->pdf, "png", $tmpname, "", 0);
// Fill part to the right
@@ -181,14 +176,14 @@ function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
while ($cx < $right) {
pdf_place_image($this->pdf, $pim, $cx, $y, $scale);
$cx += $width;
- };
+ }
// Fill part to the left
$cx = $x;
while ($cx+$width >= $x - $ox) {
pdf_place_image($this->pdf, $pim, $cx-$width, $y, $scale);
$cx -= $width;
- };
+ }
pdf_close_image($this->pdf, $pim);
unlink($tmpname);
@@ -196,7 +191,7 @@ function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy, $scale) {
$tmpname = tempnam(WRITER_TEMPDIR,WRITER_FILE_PREFIX);
- imagepng($image->get_handle(), $tmpname);
+ imagepng($image, $tmpname);
$pim = pdf_open_image_file($this->pdf, "png", $tmpname, "", 0);
// Fill bottom-right quadrant
@@ -206,7 +201,7 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cx < $right) {
pdf_place_image($this->pdf, $pim, $cx, $cy, $scale);
$cx += $width;
- };
+ }
$cy -= $height;
}
@@ -217,7 +212,7 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cx+$width > $x - $ox) {
pdf_place_image($this->pdf, $pim, $cx, $cy, $scale);
$cx -= $width;
- };
+ }
$cy -= $height;
}
@@ -228,7 +223,7 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cx < $right) {
pdf_place_image($this->pdf, $pim, $cx, $cy, $scale);
$cx += $width;
- };
+ }
$cy += $height;
}
@@ -239,7 +234,7 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cx+$width > $x - $ox) {
pdf_place_image($this->pdf, $pim, $cx, $cy, $scale);
$cx -= $width;
- };
+ }
$cy += $height;
}
@@ -257,9 +252,11 @@ function moveto($x, $y) {
// OutputDriver interface functions
function next_page($height) {
- if ($this->_status == PDFLIB_STATUS_PAGE_STARTED) {
- pdf_end_page($this->pdf);
- };
+ $this->_show_watermark();
+
+ $this->current_page ++;
+
+ pdf_end_page($this->pdf);
pdf_begin_page($this->pdf, mm2pt($this->media->width()), mm2pt($this->media->height()));
// Calculate coordinate of the next page bottom edge
@@ -273,36 +270,15 @@ function next_page($height) {
pdf_translate($this->pdf, 0, -$this->offset);
parent::next_page($height);
-
- $this->_status = PDFLIB_STATUS_PAGE_STARTED;
}
- function OutputDriverPdflib($version) {
- $this->OutputDriverGenericPDF();
+ function __construct($version) {
+ OutputDriverGenericPDF::__construct();
$this->set_pdf_version($version);
$this->_currentfont = null;
$this->_radiogroups = array();
$this->_field_names = array();
-
- $this->_status = PDFLIB_STATUS_INITIALIZED;
- }
-
- function prepare() {
- parent::prepare();
-
- // Generate custom encoding vector mappings
- $manager_encoding = ManagerEncoding::get();
- for ($i = 1, $size = $manager_encoding->get_custom_vector_index(); $i <= $size; $i++) {
- $encoding_name = $manager_encoding->get_custom_encoding_name($i);
- $filename = $this->generate_cpg($encoding_name,
- true);
- pdf_set_parameter($this->pdf,
- 'Encoding',
- sprintf('%s=%s',
- $encoding_name,
- $filename));
- };
}
function reset(&$media) {
@@ -312,10 +288,12 @@ function reset(&$media) {
if (!extension_loaded('pdf')) {
// Try to use "dl" to dynamically load PDFLIB
- $result = dl(PDFLIB_DL_PATH);
+ if (function_exists('dl')) {
+ $result = dl(PDFLIB_DL_PATH);
+ }
if (!$result) {
- readfile(HTML2PS_DIR.'templates/missing_pdflib.html');
+ readfile(HTML2PS_DIR.'/templates/missing_pdflib.html');
error_log("No PDFLIB extension found");
die("HTML2PS Error");
}
@@ -333,7 +311,7 @@ function reset(&$media) {
*/
if (defined("PDFLIB_LICENSE")) {
pdf_set_parameter($this->pdf, "license", PDFLIB_LICENSE);
- };
+ }
pdf_open_file($this->pdf, $this->get_filename());
@@ -343,7 +321,7 @@ function reset(&$media) {
// Set path to the PDFLIB UPR file containig information about fonts and encodings
if (defined("PDFLIB_UPR_PATH")) {
pdf_set_parameter($this->pdf, "resourcefile", PDFLIB_UPR_PATH);
- };
+ }
// Setup encodings not bundled with PDFLIB
$filename = $this->generate_cpg('koi8-r');
@@ -359,7 +337,7 @@ function reset(&$media) {
// No borders around links in the generated PDF
pdf_set_border_style($this->pdf, "solid", 0);
- $this->_status = PDFLIB_STATUS_DOCUMENT_STARTED;
+ pdf_begin_page($this->pdf, mm2pt($this->media->width()), mm2pt($this->media->height()));
}
function rect($x, $y, $w, $h) {
@@ -411,9 +389,15 @@ function stringwidth($string, $name, $encoding, $size) {
return pdf_stringwidth($this->pdf, $string, $this->findfont($name, $encoding), $size);
}
+ function set_watermark($watermark) {
+ $this->_watermark = trim($watermark);
+ }
+
/* private routines */
- function _show_watermark($watermark) {
+ function _show_watermark() {
+ if (is_null($this->_watermark) || $this->_watermark == "") { return; }
+
$font = $this->findfont('Helvetica', 'iso-8859-1');
pdf_setfont($this->pdf, $font, 100);
@@ -423,27 +407,21 @@ function _show_watermark($watermark) {
pdf_set_value($this->pdf, "textrendering", 1);
pdf_translate($this->pdf, $x, $y);
pdf_rotate($this->pdf, 60);
- pdf_show_xy($this->pdf, $watermark, -pdf_stringwidth($this->pdf, $watermark, $font, 100)/2, -50);
+ pdf_show_xy($this->pdf, $this->_watermark, -pdf_stringwidth($this->pdf, $this->_watermark, $font, 100)/2, -50);
}
- function generate_cpg($encoding, $force = false) {
- if (!$force) {
- $filename = CACHE_DIR.$encoding.'.cpg';
- } else {
- $filename = CACHE_DIR.uniqid('', false).'.cpg';
- };
-
+ function generate_cpg($encoding) {
+ $filename = CACHE_DIR.$encoding.'.cpg';
if (file_exists($filename)) {
return $filename;
- };
+ }
$output = fopen($filename, 'w');
- $manager_encoding =& ManagerEncoding::get();
- $vector = $manager_encoding->get_encoding_vector($encoding);
-
+ $manager_encoding =& (new ManagerEncoding())->get();
+ $vector = $manager_encoding->getEncodingVector($encoding);
foreach ($vector as $code => $utf) {
fwrite($output, sprintf("0x%04X 0x%02X\n", $utf, ord($code)));
- };
+ }
fclose($output);
return $filename;
diff --git a/public_html/output.pdflib.old.class.php b/public_html/output.pdflib.old.class.php
index c36dae7..895281a 100644
--- a/public_html/output.pdflib.old.class.php
+++ b/public_html/output.pdflib.old.class.php
@@ -25,7 +25,7 @@ function field_pushbuttonreset($x, $y, $w, $h) {
function field_pushbuttonsubmit($x, $y, $w, $h, $field_name, $value, $actionURL) {
}
- function field_checkbox($x, $y, $w, $h, $name, $value, $checked) {
+ function field_checkbox($x, $y, $w, $h, $name, $value, $checked = false) {
}
function field_radio($x, $y, $w, $h, $groupname, $value, $checked) {
diff --git a/public_html/output.png.class.php b/public_html/output.png.class.php
index 2a01d45..5cee046 100644
--- a/public_html/output.png.class.php
+++ b/public_html/output.png.class.php
@@ -1,5 +1,5 @@
_y_offset = $y_offset;
$this->_x_scale = $x_scale;
$this->_y_scale = $y_scale;
@@ -173,19 +173,15 @@ function _fixSizes(&$x, &$y) {
}
function _fixSizeX($x) {
- static $scale = null;
- if (is_null($scale)) { $scale = $this->_widthPixels / mm2pt($this->media->width()); };
- return ceil($x * $scale);
+ return ceil($x * $this->_widthPixels / mm2pt($this->_media->width()));
}
function _fixSizeY($y) {
- static $scale = null;
- if (is_null($scale)) { $scale = $this->_heightPixels / mm2pt($this->media->height()); };
- return ceil($y * $scale);
+ return ceil($y * $this->_heightPixels / mm2pt($this->_media->height()));
}
- function OutputDriverPNG() {
- $this->OutputDriverGeneric();
+ function __construct() {
+ OutputDriverGeneric::__construct();
$this->_color = array();
$this->_font = array();
@@ -198,11 +194,10 @@ function OutputDriverPNG() {
function reset(&$media) {
parent::reset($media);
- $this->update_media($media);
- }
-
- function update_media($media) {
- parent::update_media($media);
+ /**
+ * Store reference to media object for future use
+ */
+ $this->_media =& $media;
/**
* Here we use a small hack; media height and width (in millimetres) match
@@ -226,15 +221,14 @@ function update_media($media) {
/**
* Setup initial clipping region
*/
- $this->_clipping = array();
$this->_saveClip(new Rectangle(new Point(0,
0),
new Point($this->_widthPixels-1,
$this->_heightPixels-1)));
$this->_transform = new AffineTransform($this->_heightPixels,
- $this->_widthPixels / mm2pt($this->media->width()),
- $this->_heightPixels / mm2pt($this->media->height()));
+ $this->_widthPixels / mm2pt($this->_media->width()),
+ $this->_heightPixels / mm2pt($this->_media->height()));
}
function add_link($x, $y, $w, $h, $target) { /* N/A */ }
@@ -283,7 +277,7 @@ function close() {
*/
while (count($this->_clipping) > 0) {
$this->restore();
- };
+ }
imagepng($this->_image, $this->get_filename());
imagedestroy($this->_image);
@@ -294,7 +288,7 @@ function closepath() {
}
function content_type() {
- return ContentType::png();
+ return (new ContentType())->png();
}
function dash($x, $y) { }
@@ -346,8 +340,8 @@ function image($image, $x, $y, $scale) {
function image_scaled($image, $x, $y, $scale_x, $scale_y) {
$this->_fixCoords($x, $y);
- $sx = $image->sx();
- $sy = $image->sy();
+ $sx = imagesx($image);
+ $sy = imagesy($image);
/**
* Get image size in device coordinates
@@ -356,7 +350,7 @@ function image_scaled($image, $x, $y, $scale_x, $scale_y) {
$dy = $sy*$scale_y;
$this->_fixSizes($dx, $dy);
- imagecopyresampled($this->_image, $image->get_handle(),
+ imagecopyresampled($this->_image, $image,
$x, $y-$dy,
0, 0,
$dx, $dy,
@@ -369,21 +363,21 @@ function image_ry($image, $x, $y, $height, $bottom, $ox, $oy, $scale) {
$dest_height = floor($this->_fixSizeY($height));
$start_y = $y - $dest_height;
- $sx = $image->sx();
- $sy = $image->sy();
+ $sx = imagesx($image);
+ $sy = imagesy($image);
$dx = $this->_fixSizeX($sx * $scale);
$dy = $this->_fixSizeY($sy * $scale);
$cx = $x;
$cy = $start_y - ceil($this->_fixSizeY($oy) / $dest_height) * $dest_height;
while ($cy < $base_y) {
- imagecopyresampled($this->_image, $image->get_handle(),
+ imagecopyresampled($this->_image, $image,
$cx, $cy,
0, 0,
$dx, $dy,
$sx, $sy);
$cy += $dest_height;
- };
+ }
}
function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
@@ -392,8 +386,8 @@ function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
$dest_width = floor($this->_fixSizeX($width));
$start_x = $x - $dest_width;
- $sx = $image->sx();
- $sy = $image->sy();
+ $sx = imagesx($image);
+ $sy = imagesy($image);
$dx = $this->_fixSizeX($sx * $scale);
$dy = $this->_fixSizeY($sy * $scale);
@@ -402,13 +396,13 @@ function image_rx($image, $x, $y, $width, $right, $ox, $oy, $scale) {
$cy = $y - $dy;
while ($cx < $base_x) {
- imagecopyresampled($this->_image, $image->get_handle(),
+ imagecopyresampled($this->_image, $image,
$cx, $cy,
0, 0,
$dx, $dy,
$sx, $sy);
$cx += $dest_width;
- };
+ }
}
function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy, $scale) {
@@ -420,8 +414,8 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
$start_x = $x - $dest_width;
$start_y = $y - $dest_height;
- $sx = $image->sx();
- $sy = $image->sy();
+ $sx = imagesx($image);
+ $sy = imagesy($image);
$dx = $this->_fixSizeX($sx * $scale);
$dy = $this->_fixSizeY($sy * $scale);
@@ -430,17 +424,16 @@ function image_rx_ry($image, $x, $y, $width, $height, $right, $bottom, $ox, $oy,
while ($cy < $base_y) {
while ($cx < $base_x) {
- imagecopyresampled($this->_image,
- $image->get_handle(),
+ imagecopyresampled($this->_image, $image,
$cx, $cy,
0, 0,
$dx, $dy,
$sx, $sy);
$cx += $dest_width;
- };
+ }
$cx = $start_x - ceil($this->_fixSizeX($ox) / $dest_width) * $dest_width;
$cy += $dest_height;
- };
+ }
}
function lineto($x, $y) {
@@ -453,7 +446,7 @@ function moveto($x, $y) {
}
function new_form($name) { /* N/A */ }
- function next_page() { /* N/A */ }
+ function next_page($old_page_height) { /* N/A */ }
function release() { }
/**
@@ -499,18 +492,17 @@ function show_xy($text, $x, $y) {
$this->_fixCoords($x, $y);
$font = $this->_getFont();
- $converter = Converter::create();
+ $converter = (new Converter())->create();
global $g_font_resolver_pdf;
$fontFile = $g_font_resolver_pdf->ttf_mappings[$font['font']];
$fontSize = $font['size'];
-
$dummy = 0;
$this->_fixSizes($dummy, $fontSize);
$utf8_string = $converter->to_utf8($text, $font['encoding']);
-
+
imagefttext($this->_image,
$fontSize * $font['ascender'],
0,
diff --git a/public_html/output.ps.class.php b/public_html/output.ps.class.php
new file mode 100644
index 0000000..c338960
--- /dev/null
+++ b/public_html/output.ps.class.php
@@ -0,0 +1,159 @@
+stream, file_get_contents('postscript/footer.ps') );
+ fclose($this->stream);
+ }
+
+ function encoding($encoding) {
+ $encoding = trim(strtolower($encoding));
+
+ $translations = array(
+ 'iso-8859-1' => "ISOLatin1Encoding",
+ 'iso-8859-2' => "ISO-8859-2-Encoding",
+ 'iso-8859-3' => "ISO-8859-3-Encoding",
+ 'iso-8859-4' => "ISO-8859-4-Encoding",
+ 'iso-8859-5' => "ISO-8859-5-Encoding",
+ 'iso-8859-7' => "ISO-8859-7-Encoding",
+ 'iso-8859-9' => "ISO-8859-9-Encoding",
+ 'iso-8859-10' => "ISO-8859-10-Encoding",
+ 'iso-8859-11' => "ISO-8859-11-Encoding",
+ 'iso-8859-13' => "ISO-8859-13-Encoding",
+ 'iso-8859-14' => "ISO-8859-14-Encoding",
+ 'iso-8859-15' => "ISO-8859-15-Encoding",
+ 'dingbats' => "Dingbats-Encoding",
+ 'symbol' => "Symbol-Encoding",
+ 'koi8-r' => "KOI8-R-Encoding",
+ 'cp1250' => "Windows-1250-Encoding",
+ 'cp1251' => "Windows-1251-Encoding",
+ 'windows-1250' => "Windows-1250-Encoding",
+ 'windows-1251' => "Windows-1251-Encoding",
+ 'windows-1252' => "Windows-1252-Encoding"
+ );
+
+ if (isset($translations[$encoding])) { return $translations[$encoding]; }
+ return $encoding;
+ }
+
+ function font_ascender($name, $encoding) { return 0; }
+ function font_descender($name, $encoding) { return 0; }
+
+ function stringwidth($string, $font, $size) { return 0; }
+
+ function __construct($scalepoints, $transparency_workaround, $quality_workaround, $image_encoder) {
+ OutputDriverGenericPS::__construct($image_encoder);
+
+ $this->scalepoints = $scalepoints;
+ $this->transparency_workaround = $transparency_workaround;
+ $this->quality_workaround = $quality_workaround;
+ }
+
+ function reset($media) {
+ OutputDriverGenericPS::reset($media);
+
+ $this->stream = fopen($this->get_filename(), "wb");
+
+ $header = file_get_contents("./postscript/header.ps");
+ $header = preg_replace("/##PAGE##/",$media->to_ps(),$header);
+ if ($this->scalepoints) {
+ $header = preg_replace("/##PT##/","/pt {px 1.4 mul} def",$header);
+ } else {
+ $header = preg_replace("/##PT##/","/pt {} def",$header);
+ }
+ $header = preg_replace("/##PS2PDF##/",
+ $this->transparency_workaround ? "/ps2pdf-transparency-hack true def" : "/ps2pdf-transparency-hack false def",$header);
+ $header = preg_replace("/##TRANSPARENCY##/",
+ $this->transparency_workaround ? "/no-transparency-output true def" : "/no-transparency-output false def",$header);
+ if ($this->quality_workaround) {
+ $header = preg_replace("/##IMAGEQUALITY##/", "<< /ColorACSImageDict << /QFactor 0.2 /Blend 1 /HSamples [1 1 1 1] /VSamples [1 1 1 1] >> >> setdistillerparams", $header);
+ } else {
+ $header = preg_replace("/##IMAGEQUALITY##/", "", $header);
+ }
+
+ $header = preg_replace("/##PAGEBORDER##/",($this->is_show_page_border()) ? "true" : "false",$header);
+ $header = preg_replace("/##DEBUGBOX##/",($this->is_debug_boxes()) ? "true" : "false",$header);
+
+ fwrite($this->stream, $header ); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/array.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/background.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/background.image.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/border.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.block.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.block.inline.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.break.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.button.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.checkbutton.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.container.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.frame.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.generic.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.generic.inline.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.iframe.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.image.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.inline.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.input.check.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.input.radio.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.input.text.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.inline.whitespace.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.list-item.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.radiobutton.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.select.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.span.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.table.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.table.row.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.table.cell.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.table.cell.fake.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.text.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/box.whitespace.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/cellspan.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/class.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/color.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/containing_block.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/context.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/flow.block.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/flow.box.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/flow.float.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/flow.inline.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/flow.inline.block.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/flow.legend.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/flow.table.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/flow_viewport.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/font.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/geometry.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/height.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/image.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/position.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/predicates.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/table.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/table.row.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/text-align.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/vertical-align.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/viewport.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/width.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-2.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-3.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-4.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-5.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-7.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-9.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-10.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-11.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-13.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-14.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.iso-8859-15.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.windows-1250.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.windows-1251.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.windows-1252.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.koi8-r.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.dingbats.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/encoding.symbol.ps')); fwrite($this->stream, "\n");
+ fwrite($this->stream, file_get_contents('postscript/init.ps')); fwrite($this->stream, "\n");
+ }
+
+ function write($data) {
+ fwrite($this->stream, $data);
+ }
+}
+?>
\ No newline at end of file
diff --git a/public_html/parser._interface.class.php b/public_html/parser._interface.class.php
index a6386f1..fc4c098 100644
--- a/public_html/parser._interface.class.php
+++ b/public_html/parser._interface.class.php
@@ -1,6 +1,6 @@
build($html);
// Check if parser returned valid document
if (is_null($dom_tree)) {
- readfile(HTML2PS_DIR.'templates/cannot_parse.html');
+ readfile(HTML2PS_DIR.'/templates/cannot_parse.html');
error_log(sprintf("Cannot parse document: %s", $pipeline->get_base_url()));
die("HTML2PS Error");
}
@@ -36,17 +37,10 @@ function &process($html, &$pipeline, &$media) {
* This should be done here, as the document body may include STYLE node
* (this violates HTML standard, but is rather often appears in Web)
*/
- $css =& $pipeline->get_current_css();
+ $css =& $pipeline->getCurrentCSS();
$css->scan_styles($dom_tree, $pipeline);
- if (!is_null($media)) {
- // Setup media size and margins
- $pipeline->get_page_media(1, $media);
- $pipeline->output_driver->update_media($media);
- $pipeline->_setupScales($media);
- };
-
- $body =& traverse_dom_tree_pdf($dom_tree);
+ $body = traverse_dom_tree_pdf($dom_tree);
$box =& create_pdf_box($body, $pipeline);
return $box;
@@ -73,20 +67,20 @@ function _scan_base(&$root, &$pipeline) {
$pipeline->push_base_url($new_url);
return true;
- };
+ }
// We continue processing here!
case XML_DOCUMENT_NODE:
$child = $root->first_child();
while ($child) {
- if ($this->_scan_base($child, $pipeline)) { return; };
+ if ($this->_scan_base($child, $pipeline)) { return; }
$child = $child->next_sibling();
- };
+ }
return false;
- };
+ }
return false;
}
}
-?>
+?>
\ No newline at end of file
diff --git a/public_html/path.php b/public_html/path.php
index c018e1c..73eb4f7 100644
--- a/public_html/path.php
+++ b/public_html/path.php
@@ -6,7 +6,7 @@
class Path {
var $_points;
- function Path() {
+ function __construct() {
$this->clear();
}
@@ -29,7 +29,7 @@ function getBbox() {
$rect->ur->y = max($rect->ur->y, $point->y);
$rect->ll->x = min($rect->ll->x, $point->x);
$rect->ll->y = min($rect->ll->y, $point->y);
- };
+ }
return $rect;
}
@@ -55,7 +55,7 @@ function getPointArray() {
foreach ($this->_points as $point) {
$result[] = $point->x;
$result[] = $point->y;
- };
+ }
return $result;
}
@@ -64,7 +64,7 @@ function close() {
}
function get_point_count() {
- return count($this->_points);
+ return count($this->_points);
}
/**
@@ -84,9 +84,9 @@ function fill($transform, $image, $color) {
for ($i=0; $i<$size; $i++) {
$transform->apply($coords[$i*2], $coords[$i*2+1]);
- };
+ }
- imagefilledpolygon($image, $coords, $size, $color);
+ imagefilledpolygon($image, $coords, $color);
}
function stroke($transform, $image, $color) {
@@ -95,7 +95,7 @@ function stroke($transform, $image, $color) {
for ($i=0; $i<$size; $i++) {
$transform->apply($coords[$i*2], $coords[$i*2+1]);
- };
+ }
imagepolygon($image, $coords, $size, $color);
}
@@ -106,8 +106,8 @@ class PathCircle extends Path {
var $_y;
var $_r;
- function PathCircle() {
- $this->Path();
+ function __construct() {
+ Path::__construct();
$this->set_x(0);
$this->set_y(0);
@@ -173,4 +173,4 @@ function stroke($transform, $image, $color) {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/public_html/path.point.php b/public_html/path.point.php
index d08c962..711c22a 100644
--- a/public_html/path.point.php
+++ b/public_html/path.point.php
@@ -4,7 +4,7 @@ class Point {
var $x;
var $y;
- function Point($x, $y) {
+ function __construct($x, $y) {
$this->x = $x;
$this->y = $y;
}
diff --git a/public_html/path.rectangle.php b/public_html/path.rectangle.php
index c91dc42..d8852fa 100644
--- a/public_html/path.rectangle.php
+++ b/public_html/path.rectangle.php
@@ -4,7 +4,7 @@ class Rectangle {
var $ur;
var $ll;
- function Rectangle($ll, $ur) {
+ function __construct($ll, $ur) {
$this->ll = $ll;
$this->ur = $ur;
}
@@ -22,13 +22,13 @@ function normalize() {
$x = $this->ur->x;
$this->ur->x = $this->ll->x;
$this->ll->x = $x;
- };
+ }
if ($this->ur->y < $this->ll->y) {
$y = $this->ur->y;
$this->ur->y = $this->ll->y;
$this->ll->y = $y;
- };
+ }
}
}
diff --git a/public_html/pdf.fpdf.makefont.php b/public_html/pdf.fpdf.makefont.php
index cfa55dd..a86b37a 100644
--- a/public_html/pdf.fpdf.makefont.php
+++ b/public_html/pdf.fpdf.makefont.php
@@ -6,8 +6,6 @@
* @return Array font metrics hash or null of TTF file could not be parsed
*/
function ReadTTF($fontfile, $map) {
- if (!is_readable($fontfile)) { return null; };
-
/**
* Open font file and read metrics information
*/
@@ -33,7 +31,7 @@ function ReadTTF($fontfile, $map) {
if (!isset($map[$code])) {
$widths[] = 1000;
continue;
- };
+ }
$ucs2 = $map[$code];
/**
@@ -48,8 +46,8 @@ function ReadTTF($fontfile, $map) {
$widths[] = floor($hmtx->_hMetrics[$realIndex]['advanceWidth']*1000/$head->_unitsPerEm);
} else {
$widths[] = 1000;
- };
- };
+ }
+ }
$font_info = array();
@@ -70,8 +68,8 @@ function ReadTTF($fontfile, $map) {
OT_NAME_ID_POSTSCRIPT_NAME);
$ps_name_ascii = "";
for ($i=0; $iget();
$ref = $manager->get_encoding_glyphs('windows-1252');
$s='';
@@ -290,10 +288,10 @@ function MakeFontEncoding($map) {
if ($map[chr($i)]!=$ref[chr($i)]) {
if ($i!=$last+1) {
$s.=$i.' ';
- };
+ }
$last=$i;
$s.='/'.$map[chr($i)].' ';
- };
+ }
}
return rtrim($s);
@@ -301,13 +299,13 @@ function MakeFontEncoding($map) {
function MakeFontCMap($encoding) {
//Build differences from reference encoding
- $manager = ManagerEncoding::get();
- $ref = $manager->get_encoding_vector($encoding);
+ $manager = (new ManagerEncoding())->get();
+ $ref = $manager->getEncodingVector($encoding);
$s = "array(\n";
foreach ($ref as $char => $ucs) {
$s .= sprintf("0x%02X => 0x%04X,\n", ord($char), $ucs);
- };
+ }
$s .= ")";
return trim($s);
@@ -353,12 +351,12 @@ function CheckTTF($file)
break;
}
fseek($f,12,SEEK_CUR);
- };
+ }
if (!$found) {
fclose($f);
return;
- };
+ }
fseek($f,4,SEEK_CUR);
$offset=ReadLong($f);
@@ -373,22 +371,21 @@ function CheckTTF($file)
fclose($f);
if ($rl and !$pp and !$e) {
echo 'Warning: font license does not allow embedding';
- };
+ }
}
/*******************************************************************************
- * $fontfile : chemin du fichier TTF (ou chaîne vide si pas d'incorporation) *
+ * $fontfile : chemin du fichier TTF (ou cha�ne vide si pas d'incorporation) *
* $afmfile : chemin du fichier AFM *
- * $enc : encodage (ou chaîne vide si la police est symbolique) *
+ * $enc : encodage (ou cha�ne vide si la police est symbolique) *
* $patch : patch optionnel pour l'encodage *
* $type : type de la police si $fontfile est vide *
*******************************************************************************/
function MakeFont($fontfile, $afmfile, $destdir, $destfile, $enc) {
// Generate a font definition file
- set_magic_quotes_runtime(0);
ini_set('auto_detect_line_endings','1');
- $manager = ManagerEncoding::get();
+ $manager = (new ManagerEncoding())->get();
$map = $manager->get_encoding_glyphs($enc);
$fm = ReadAFM($afmfile, $map);
@@ -397,12 +394,12 @@ function MakeFont($fontfile, $afmfile, $destdir, $destfile, $enc) {
error_log(sprintf("Notice: Missing AFM file '%s'; attempting to parse font file '%s' directly",
$afmfile,
$fontfile));
-
- $fm = ReadTTF($fontfile, $manager->get_encoding_vector($enc));
+
+ $fm = ReadTTF($fontfile, $manager->getEncodingVector($enc));
if (is_null($fm)) {
die(sprintf("Cannot get font metrics for '%s'", $fontfile));
- };
+ }
}
$diff = MakeFontEncoding($map);
@@ -418,11 +415,11 @@ function MakeFont($fontfile, $afmfile, $destdir, $destfile, $enc) {
$type='Type1';
} else {
die('Error: unrecognized font file extension: '.$ext);
- };
+ }
} else {
if ($type!='TrueType' and $type!='Type1') {
die('Error: incorrect font type: '.$type);
- };
+ }
}
//Start generation
@@ -432,10 +429,10 @@ function MakeFont($fontfile, $afmfile, $destdir, $destfile, $enc) {
$s.='$desc='.$fd.";\n";
if (!isset($fm['UnderlinePosition'])) {
$fm['UnderlinePosition']=-100;
- };
+ }
if (!isset($fm['UnderlineThickness'])) {
$fm['UnderlineThickness']=50;
- };
+ }
$s.='$up='.$fm['UnderlinePosition'].";\n";
$s.='$ut='.$fm['UnderlineThickness'].";\n";
$w=MakeWidthArray($fm);
@@ -450,22 +447,22 @@ function MakeFont($fontfile, $afmfile, $destdir, $destfile, $enc) {
//Embedded font
if (!file_exists($fontfile)) {
die('Error: font file not found: '.$fontfile);
- };
+ }
if ($type=='TrueType') {
CheckTTF($fontfile);
- };
+ }
$f=fopen($fontfile,'rb');
if (!$f) {
die('Error: Can\'t open '.$fontfile);
- };
+ }
$file=fread($f,filesize($fontfile));
fclose($f);
if ($type=='Type1') {
//Find first two sections and discard third one
- $header=(ord($file{0})==128);
+ $header=(ord($file[0])==128);
if ($header) {
//Strip first binary header
$file=substr($file,6);
@@ -473,33 +470,28 @@ function MakeFont($fontfile, $afmfile, $destdir, $destfile, $enc) {
$pos=strpos($file,'eexec');
if(!$pos) {
die('Error: font file does not seem to be valid Type1');
- };
+ }
$size1=$pos+6;
- if($header and ord($file{$size1})==128) {
+ if($header and ord($file[$size1])==128) {
//Strip second binary header
$file=substr($file,0,$size1).substr($file,$size1+6);
}
$pos=strpos($file,'00000000');
if (!$pos) {
die('Error: font file does not seem to be valid Type1');
- };
+ }
$size2=$pos-$size1;
$file=substr($file,0,$size1+$size2);
}
- $gzcompress_exists = function_exists('gzcompress');
- if ($gzcompress_exists) {
- $cmp = $basename.'.z';
- SaveToFile($destdir.$cmp, gzcompress($file), 'b');
-
+ if(function_exists('gzcompress')) {
+ $cmp=$basename.'.z';
+ SaveToFile($destdir.$cmp,gzcompress($file),'b');
$s.='$file=\''.$cmp."';\n";
} else {
- $cmp = $basename.'.ttf';
- SaveToFile($destdir.$cmp, $file, 'b');
-
$s.='$file=\''.basename($fontfile)."';\n";
- error_log('Notice: font file could not be compressed (zlib extension not available)');
+ echo 'Notice: font file could not be compressed (zlib extension not available)PDFIndirectObject($handler,
+
+ function __construct(&$handler,
+ $object_id,
+ $generation_id) {
+ PDFIndirectObject::__construct($handler,
$object_id,
$generation_id);
-
- $this->set_width($width);
- $this->set_height($height);
}
function add_annotation(&$annotation) {
@@ -207,32 +196,16 @@ function add_annotation(&$annotation) {
function _annotations(&$handler) {
return $handler->_reference_array($this->annotations);
}
-
- function get_height() {
- return $this->_height;
- }
-
- function get_width() {
- return $this->_width;
- }
-
- function set_height($height) {
- $this->_height = $height;
- }
-
- function set_width($width) {
- $this->_width = $width;
- }
}
class PDFAppearanceStream extends PDFIndirectObject {
var $_content;
- function PDFAppearanceStream(&$handler,
- $object_id,
- $generation_id,
- $content) {
- $this->PDFIndirectObject($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $content) {
+ PDFIndirectObject::__construct($handler,
$object_id,
$generation_id);
@@ -259,10 +232,10 @@ function pdf(&$handler) {
}
class PDFAnnotation extends PDFIndirectObject {
- function PDFAnnotation(&$handler,
- $object_id,
- $generation_id) {
- $this->PDFIndirectObject($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id) {
+ PDFIndirectObject::__construct($handler,
$object_id,
$generation_id);
}
@@ -279,7 +252,7 @@ class PDFRect {
var $w;
var $h;
- function PDFRect($x,$y,$w,$h) {
+ function __construct($x, $y, $w, $h) {
$this->x = $x;
$this->y = $y;
$this->w = $w;
@@ -315,12 +288,12 @@ class PDFAnnotationExternalLink extends PDFAnnotation {
var $rect;
var $link;
- function PDFAnnotationExternalLink(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $link) {
- $this->PDFAnnotation($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $link) {
+ PDFAnnotation::__construct($handler,
$object_id,
$generation_id);
@@ -343,12 +316,12 @@ class PDFAnnotationInternalLink extends PDFAnnotation {
var $rect;
var $link;
- function PDFAnnotationInternalLink(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $link) {
- $this->PDFAnnotation($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $link) {
+ PDFAnnotation::__construct($handler,
$object_id,
$generation_id);
@@ -363,7 +336,7 @@ function pdf(&$handler) {
} else {
$wPt=$handler->fhPt;
$hPt=$handler->fwPt;
- };
+ }
$l = $handler->links[$this->link];
$h = $hPt;
@@ -396,11 +369,11 @@ function pdf(&$handler) {
class PDFAnnotationWidget extends PDFAnnotation {
var $_rect;
- function PDFAnnotationWidget(&$handler,
- $object_id,
- $generation_id,
- $rect) {
- $this->PDFAnnotation($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect) {
+ PDFAnnotation::__construct($handler,
$object_id,
$generation_id);
@@ -421,11 +394,11 @@ class PDFFieldGroup extends PDFIndirectObject {
var $_kids;
var $_group_name;
- function PDFFieldGroup(&$handler,
- $object_id,
- $generation_id,
- $group_name) {
- $this->PDFIndirectObject($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $group_name) {
+ PDFIndirectObject::__construct($handler,
$object_id,
$generation_id);
@@ -434,7 +407,7 @@ function PDFFieldGroup(&$handler,
*/
if (is_null($group_name) || $group_name == "") {
$group_name = sprintf("FieldGroup%d", $this->get_object_id());
- };
+ }
$this->_group_name = $group_name;
$this->_kids = array();
@@ -447,7 +420,7 @@ function _check_field_name($field) {
if (trim($field->get_field_name()) == "") {
error_log(sprintf("Found form field with empty name"));
return false;
- };
+ }
/**
* Check if field name is unique inside this form! If we will not do it,
@@ -460,7 +433,7 @@ function _check_field_name($field) {
$kid->get_field_name()));
return false;
}
- };
+ }
return true;
}
@@ -473,7 +446,7 @@ function add_field(&$field) {
$field->set_field_name(sprintf("%s_FieldObject%d",
$field->get_field_name(),
$field->get_object_id()));
- };
+ }
$this->_kids[] =& $field;
$field->set_parent($this);
@@ -512,12 +485,12 @@ class PDFField extends PDFAnnotationWidget {
*/
var $_parent;
- function PDFField(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name) {
- $this->PDFAnnotationWidget($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name) {
+ PDFAnnotationWidget::__construct($handler,
$object_id,
$generation_id,
$rect);
@@ -528,7 +501,7 @@ function PDFField(&$handler,
*/
if (is_null($field_name) || $field_name == "") {
$field_name = sprintf("FieldObject%d", $this->get_object_id());
- };
+ }
$this->_field_name = $field_name;
}
@@ -538,7 +511,7 @@ function get_field_name() {
return $this->_field_name;
} else {
return sprintf("FormObject%d", $this->get_object_id());
- };
+ }
}
function _dict(&$handler) {
@@ -574,14 +547,14 @@ class PDFFieldCheckBox extends PDFField {
var $_appearance_off;
var $_checked;
- function PDFFieldCheckBox(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name,
- $value,
- $checked) {
- $this->PDFField($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name,
+ $value,
+ $checked) {
+ PDFField::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -637,13 +610,13 @@ function _out_nested(&$handler) {
$this->_appearance->out($handler);
}
- function PDFFieldPushButton(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $fontindex,
- $fontsize) {
- $this->PDFField($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $fontindex,
+ $fontsize) {
+ PDFField::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -680,16 +653,16 @@ function _dict(&$handler) {
class PDFFieldPushButtonImage extends PDFFieldPushButton {
var $_link;
- function PDFFieldPushButtonImage(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $fontindex,
- $fontsize,
- $field_name,
- $value,
- $link) {
- $this->PDFFieldPushButton($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $fontindex,
+ $fontsize,
+ $field_name,
+ $value,
+ $link) {
+ PDFFieldPushButton::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -716,16 +689,16 @@ class PDFFieldPushButtonSubmit extends PDFFieldPushButton {
var $_link;
var $_caption;
- function PDFFieldPushButtonSubmit(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $fontindex,
- $fontsize,
- $field_name,
- $value,
- $link) {
- $this->PDFFieldPushButton($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $fontindex,
+ $fontsize,
+ $field_name,
+ $value,
+ $link) {
+ PDFFieldPushButton::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -750,13 +723,13 @@ function _action(&$handler) {
}
class PDFFieldPushButtonReset extends PDFFieldPushButton {
- function PDFFieldPushButtonReset(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $fontindex,
- $fontsize) {
- $this->PDFFieldPushButton($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $fontindex,
+ $fontsize) {
+ PDFFieldPushButton::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -792,12 +765,12 @@ class PDFFieldRadio extends PDFAnnotationWidget {
var $_appearance_on;
var $_appearance_off;
- function PDFFieldRadio(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $value) {
- $this->PDFAnnotationWidget($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $value) {
+ PDFAnnotationWidget::__construct($handler,
$object_id,
$generation_id,
$rect);
@@ -851,7 +824,7 @@ class PDFFieldRadioGroup extends PDFFieldGroup {
var $_parent;
var $_checked;
- function _dict($handler) {
+ function _dict(&$handler) {
return array_merge(parent::_dict($handler),
array(
'DV' => $this->_checked ? $handler->_name($this->_checked) : "/Off",
@@ -870,11 +843,11 @@ function _check_field_name($field) {
return true;
}
- function PDFFieldRadioGroup(&$handler,
- $object_id,
- $generation_id,
- $group_name) {
- $this->PDFFieldGroup($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $group_name) {
+ PDFFieldGroup::__construct($handler,
$object_id,
$generation_id,
$group_name);
@@ -908,7 +881,7 @@ function _dict(&$handler) {
$options[] = $handler->_array(sprintf("%s %s",
$handler->_textstring($arr[0]),
$handler->_textstring($arr[1])));
- };
+ }
$options_str = $handler->_array(implode(" ",$options));
@@ -921,14 +894,14 @@ function _dict(&$handler) {
'Opt' => $options_str));
}
- function PDFFieldSelect(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name,
- $value,
- $options) {
- $this->PDFField($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name,
+ $value,
+ $options) {
+ PDFField::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -973,15 +946,15 @@ function _out_nested(&$handler) {
// $this->_appearance->out($handler);
}
- function PDFFieldText(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name,
- $value,
- $fontindex,
- $fontsize) {
- $this->PDFField($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name,
+ $value,
+ $fontindex,
+ $fontsize) {
+ PDFField::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -1009,15 +982,15 @@ function _dict(&$handler) {
* "Password" text input field
*/
class PDFFieldPassword extends PDFFieldText {
- function PDFFieldPassword(&$handler,
- $object_id,
- $generation_id,
- $rect,
- $field_name,
- $value,
- $fontindex,
- $fontsize) {
- $this->PDFFieldText($handler,
+ function __construct(&$handler,
+ $object_id,
+ $generation_id,
+ $rect,
+ $field_name,
+ $value,
+ $fontindex,
+ $fontsize) {
+ PDFFieldText::__construct($handler,
$object_id,
$generation_id,
$rect,
@@ -1164,7 +1137,7 @@ function _dictionary($dict) {
$content = "";
foreach ($dict as $key => $value) {
$content .= "/$key $value\n";
- };
+ }
return "<<\n".$content."\n>>";
}
@@ -1180,9 +1153,10 @@ function _reference(&$object) {
function _reference_array($object_array) {
$array_str = "";
- for ($i=0; $i_reference($object_array[$i])." ";
- };
+ }
return $this->_array($array_str);
}
@@ -1200,7 +1174,7 @@ function add_form($name) {
}
function add_field_select($x, $y, $w, $h, $name, $value, $options) {
- $field =& new PDFFieldSelect($this,
+ $field= new PDFFieldSelect($this,
$this->_generate_new_object_number(), // Object identifier
0, // Generation
new PDFRect($x, $y, $w, $h), // Annotation rectangle
@@ -1227,7 +1201,7 @@ function add_field_select($x, $y, $w, $h, $name, $value, $options) {
* @TODO check if fully qualified field name will be unique in PDF file
*/
function add_field_checkbox($x, $y, $w, $h, $name, $value, $checked) {
- $field =& new PDFFieldCheckBox($this,
+ $field= new PDFFieldCheckBox($this,
$this->_generate_new_object_number(), // Object identifier
0, // Generation
new PDFRect($x, $y, $w, $h), // Annotation rectangle
@@ -1258,7 +1232,7 @@ function ¤t_form() {
0,
$name);
$this->_forms[] =& $form;
- };
+ }
return $this->_forms[count($this->_forms)-1];
}
@@ -1267,7 +1241,7 @@ function add_field_radio($x, $y, $w, $h, $group_name, $value, $checked) {
if (isset($this->_form_radios[$group_name])) {
$field =& $this->_form_radios[$group_name];
} else {
- $field =& new PDFFieldRadioGroup($this,
+ $field= new PDFFieldRadioGroup($this,
$this->_generate_new_object_number(),
0,
$group_name);
@@ -1276,15 +1250,15 @@ function add_field_radio($x, $y, $w, $h, $group_name, $value, $checked) {
$current_form->add_field($field);
$this->_form_radios[$group_name] =& $field;
- };
+ }
- $radio =& new PDFFieldRadio($this,
+ $radio= new PDFFieldRadio($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
$value);
$field->add_field($radio);
- if ($checked) { $field->set_checked($value); };
+ if ($checked) { $field->set_checked($value); }
$this->_pages[count($this->_pages)-1]->add_annotation($radio);
}
@@ -1302,7 +1276,7 @@ function add_field_radio($x, $y, $w, $h, $group_name, $value, $checked) {
* @return Field number
*/
function add_field_text($x, $y, $w, $h, $value, $field_name) {
- $field =& new PDFFieldText($this,
+ $field= new PDFFieldText($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1318,7 +1292,7 @@ function add_field_text($x, $y, $w, $h, $value, $field_name) {
}
function add_field_multiline_text($x, $y, $w, $h, $value, $field_name) {
- $field =& new PDFFieldMultilineText($this,
+ $field= new PDFFieldMultilineText($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1346,7 +1320,7 @@ function add_field_multiline_text($x, $y, $w, $h, $value, $field_name) {
* @return Field number
*/
function add_field_password($x, $y, $w, $h, $value, $field_name) {
- $field =& new PDFFieldPassword($this,
+ $field= new PDFFieldPassword($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1362,7 +1336,7 @@ function add_field_password($x, $y, $w, $h, $value, $field_name) {
}
function add_field_pushbuttonimage($x, $y, $w, $h, $field_name, $value, $actionURL) {
- $field =& new PDFFieldPushButtonImage($this,
+ $field= new PDFFieldPushButtonImage($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1379,7 +1353,7 @@ function add_field_pushbuttonimage($x, $y, $w, $h, $field_name, $value, $actionU
}
function add_field_pushbuttonsubmit($x, $y, $w, $h, $field_name, $value, $actionURL) {
- $field =& new PDFFieldPushButtonSubmit($this,
+ $field= new PDFFieldPushButtonSubmit($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1396,7 +1370,7 @@ function add_field_pushbuttonsubmit($x, $y, $w, $h, $field_name, $value, $action
}
function add_field_pushbuttonreset($x, $y, $w, $h) {
- $field =& new PDFFieldPushButtonReset($this,
+ $field= new PDFFieldPushButtonReset($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1411,7 +1385,7 @@ function add_field_pushbuttonreset($x, $y, $w, $h) {
}
function add_field_pushbutton($x, $y, $w, $h) {
- $field =& new PDFFieldPushButton($this,
+ $field= new PDFFieldPushButton($this,
$this->_generate_new_object_number(),
0,
new PDFRect($x, $y, $w, $h),
@@ -1485,9 +1459,9 @@ function SetDecoration($underline, $overline, $strikeout) {
}
function ClipPath($path) {
- if (count($path) < 3) {
+ if (is_countable($path) && count($path) < 3) {
die("Attempt to clip on the path containing less than three points");
- };
+ }
$this->MakePath($path);
$this->Clip();
@@ -1509,18 +1483,17 @@ function _LoadFont($fontkey, $family, $encoding) {
$file = substr($file, 0, strlen($file) - 4);
// Generate (if required) PHP font description files
- if (!file_exists($this->_getfontpath().$fontkey.'.php') ||
- ManagerEncoding::is_custom_encoding($encoding)) {
+ if (!file_exists($this->_getfontpath().$fontkey.'.php') || $encoding == 'custom') {
// As MakeFont squeaks a lot, we'll need to capture and discard its output
MakeFont(TTF_FONTS_REPOSITORY.$file.'.ttf',
TTF_FONTS_REPOSITORY.$file.'.afm',
$this->_getfontpath(),
$fontkey.'.php',
$encoding);
- };
+ }
$this->AddFont($fontkey, $family, $encoding, $fontkey.'.php', $embed);
- };
+ }
}
function _MakeFontKey($family, $encoding) {
@@ -1540,13 +1513,8 @@ function GetFontDescender($name, $encoding) {
}
// Note that FPDF do some caching, which can conflict with "save/restore" pairs
- function Save() {
- $this->_out("q");
- }
-
- function Restore() {
- $this->_out("Q");
- }
+ function Save() { $this->_out("q"); }
+ function Restore() { $this->_out("Q"); }
function Translate($dx, $dy) {
$this->_out(sprintf("1 0 0 1 %.2f %.2f cm", $dx, $dy));
@@ -1570,13 +1538,13 @@ function MakePath($path) {
for ($i=1; $i_out(sprintf("%.2f %.2f l", $path[$i]['x'], $path[$i]['y']));
- };
+ }
}
function FillPath($path) {
- if (count($path) < 3) {
+ if (is_countable($path) && count($path) < 3) {
die("Attempt to fill path containing less than three points");
- };
+ }
$this->_out($this->FillColor);
$this->MakePath($path);
@@ -1619,7 +1587,7 @@ function Circle($x, $y, $r) {
* Public methods *
* *
*******************************************************************************/
- function FPDF($orientation='P', $unit='mm', $format='A4') {
+ function __construct($orientation='P', $unit='mm', $format='A4') {
$this->_forms = array();
$this->_form_radios = array();
$this->_pages = array();
@@ -1666,10 +1634,52 @@ function FPDF($orientation='P', $unit='mm', $format='A4') {
$this->k = 72;
default:
$this->Error('Incorrect unit: '.$unit);
- };
+ }
- $this->setup_format($format[0], $format[1]);
+ //Page format
+ if (is_string($format)) {
+ $format=strtolower($format);
+
+ switch ($format) {
+ case 'a3':
+ $format=array(841.89,1190.55); break;
+ case 'a4':
+ $format=array(595.28,841.89); break;
+ case 'a5':
+ $format=array(420.94,595.28); break;
+ case 'letter':
+ $format=array(612,792); break;
+ case 'legal':
+ $format=array(612,1008); break;
+ default:
+ $this->Error('Unknown page format: '.$format);
+ }
+ $this->fwPt=$format[0];
+ $this->fhPt=$format[1];
+ } else {
+ $this->fwPt=$format[0]*$this->k;
+ $this->fhPt=$format[1]*$this->k;
+ }
+ $this->fw=$this->fwPt/$this->k;
+ $this->fh=$this->fhPt/$this->k;
+
+ //Page orientation
+ $orientation=strtolower($orientation);
+ if ($orientation=='p' || $orientation=='portrait') {
+ $this->DefOrientation='P';
+ $this->wPt=$this->fwPt;
+ $this->hPt=$this->fhPt;
+ } elseif($orientation=='l' || $orientation=='landscape') {
+ $this->DefOrientation='L';
+ $this->wPt=$this->fhPt;
+ $this->hPt=$this->fwPt;
+ } else {
+ $this->Error('Incorrect orientation: '.$orientation);
+ }
+
+ $this->w=$this->wPt/$this->k;
+ $this->h=$this->hPt/$this->k;
//Line width (0.2 mm)
$this->LineWidth=.567/$this->k;
@@ -1683,20 +1693,6 @@ function FPDF($orientation='P', $unit='mm', $format='A4') {
$this->PDFVersion='1.3';
}
- function setup_format($width, $height) {
- $this->fwPt = $width * $this->k;
- $this->fhPt = $height * $this->k;
- $this->wPt = $this->fwPt;
- $this->hPt = $this->fhPt;
-
- $this->fw = $width;
- $this->fh = $height;
- $this->w = $this->fw;
- $this->h = $this->fh;
-
- $this->DefOrientation='P';
- }
-
function SetDisplayMode($zoom,$layout='continuous') {
//Set display mode in viewer
if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
@@ -1717,7 +1713,7 @@ function SetCompression($compress) {
$this->compress=$compress;
} else {
$this->compress=false;
- };
+ }
}
function SetTitle($title) {
@@ -1759,11 +1755,11 @@ function Close() {
//Terminate document
if ($this->state == FPDF_STATE_COMPLETED) {
return;
- };
+ }
if ($this->page==0) {
$this->AddPage();
- };
+ }
//Close page
$this->_endpage();
@@ -1771,25 +1767,16 @@ function Close() {
$this->_enddoc();
}
- function AddPage($width = null, $height = null) {
- if (!$width) {
- $width = $this->fwPt;
- };
-
- if (!$height) {
- $height = $this->fhPt;
- };
-
- $this->setup_format($width, $height);
-
- $this->_pages[] =& new PDFPage($this, $width, $height, $this->_generate_new_object_number(), 0);
+ function AddPage() {
+ $this->_pages[]= new PDFPage($this, $this->_generate_new_object_number(), 0);
//Start a new page
if ($this->state == FPDF_STATE_UNINITIALIZED) {
$this->Open();
- };
+ }
$family=$this->FontFamily;
+
$size=$this->FontSizePt;
$lw=$this->LineWidth;
$dc=$this->DrawColor;
@@ -1813,12 +1800,12 @@ function AddPage($width = null, $height = null) {
$this->DrawColor=$dc;
if ($dc!='0 G') {
$this->_out($dc);
- };
+ }
$this->FillColor=$fc;
if ($fc!='0 g') {
$this->_out($fc);
- };
+ }
$this->TextColor=$tc;
$this->ColorFlag=$cf;
@@ -1843,7 +1830,7 @@ function AddPage($width = null, $height = null) {
if (!is_null($this->CurrentFont)) {
$this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
- };
+ }
}
function SetDrawColor($r,$g=-1,$b=-1) {
@@ -1852,12 +1839,12 @@ function SetDrawColor($r,$g=-1,$b=-1) {
$new_color = sprintf('%.3f G',$r/255);
} else {
$new_color = sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255);
- };
+ }
if ($this->page > 0 /*&& $this->DrawColor != $new_color*/) {
$this->DrawColor = $new_color;
$this->_out($this->DrawColor);
- };
+ }
}
function SetFillColor($r,$g=-1,$b=-1) {
@@ -1866,13 +1853,13 @@ function SetFillColor($r,$g=-1,$b=-1) {
$new_color = sprintf('%.3f g',$r/255);
} else {
$new_color = sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
- };
+ }
if ($this->page>0 /*&& $this->FillColor != $new_color*/) {
$this->FillColor = $new_color;
$this->ColorFlag = ($this->FillColor!=$this->TextColor);
$this->_out($this->FillColor);
- };
+ }
}
function SetTextColor($r,$g=-1,$b=-1) {
@@ -1881,7 +1868,7 @@ function SetTextColor($r,$g=-1,$b=-1) {
$this->TextColor=sprintf('%.3f g',$r/255);
} else {
$this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
- };
+ }
$this->ColorFlag=($this->FillColor!=$this->TextColor);
}
@@ -1894,8 +1881,8 @@ function GetStringWidth($s) {
$l=strlen($s);
for ($i=0; $i<$l; $i++) {
- $w+=$cw[$s{$i}];
- };
+ $w+=$cw[$s[$i]];
+ }
return $w*$this->FontSize/1000;
}
@@ -1907,7 +1894,7 @@ function SetLineWidth($width) {
$this->LineWidth = $width;
if ($this->page > 0) {
$this->_out(sprintf('%.2f w',$width*$this->k));
- };
+ }
}
/**
@@ -1923,7 +1910,7 @@ function Line($x1,$y1,$x2,$y2) {
function AddFont($fontkey, $family, $encoding, $file, $bEmbed) {
if(isset($this->fonts[$fontkey])) {
$this->Error('Font already added: '.$family);
- };
+ }
$filepath = $this->_getfontpath().$file;
include($filepath);
@@ -1931,11 +1918,11 @@ function AddFont($fontkey, $family, $encoding, $file, $bEmbed) {
// After we've executed 'include' the $file variable
// have been overwritten by $file declared in font definition file; if we do not want
// to embed the font in the PDF file, we should set to empty string
- if (!$bEmbed) { $file = ''; };
+ if (!$bEmbed) { $file = ''; }
if(!isset($name)) {
$this->Error("Could not include font definition file: $filepath");
- };
+ }
$i=count($this->fonts)+1;
$this->fonts[$fontkey]=array('i' =>$i,
@@ -1979,7 +1966,7 @@ function AddFont($fontkey, $family, $encoding, $file, $bEmbed) {
$this->FontFiles[$file]=array('length1'=>$originalsize);
} else {
$this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2);
- };
+ }
}
}
@@ -1992,14 +1979,15 @@ function SetFont($family, $encoding, $size) {
$fontkey = $this->_MakeFontKey($family, $encoding);
$this->_LoadFont($fontkey, $family, $encoding);
- $this->FontFamily = $family;
- $this->FontSizePt = $size;
- $this->FontSize = $size/$this->k;
- $this->CurrentFont = &$this->fonts[$fontkey];
-
if ($this->page > 0) {
+ //Select it
+ $this->FontFamily = $family;
+ $this->FontSizePt = $size;
+ $this->FontSize = $size/$this->k;
+
+ $this->CurrentFont = &$this->fonts[$fontkey];
$this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
- };
+ }
}
/**
@@ -2056,9 +2044,9 @@ function add_link_internal($x, $y, $w, $h, $link) {
$this->_pages[count($this->_pages)-1]->add_annotation($link);
}
- function Text($x, $y, $txt) {
+ function Text($x,$y,$txt) {
//Output a string
- $s = sprintf('BT %.2f %.2f Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
+ $s=sprintf('BT %.2f %.2f Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
if ($this->underline && $txt!='') {
$s.=' '.$this->_dounderline($x,$y,$txt);
@@ -2074,7 +2062,7 @@ function Text($x, $y, $txt) {
if ($this->ColorFlag) {
$s='q '.$this->TextColor.' '.$s.' Q';
- };
+ }
$this->_out($s);
}
@@ -2082,24 +2070,16 @@ function Text($x, $y, $txt) {
* Accepts PNG images only
*/
function Image($file, $x, $y, $w, $h) {
- // Image used first time, parse input file
+ // Put an image on the page
if (!isset($this->images[$file])) {
- $ext = pathinfo($file, PATHINFO_EXTENSION);
- switch ($ext) {
- case 'jpg':
- case 'jpeg':
- $info = $this->_parsejpg($file);
- break;
- case 'png':
- $info = $this->_parsepng($file);
- break;
- };
+ $info=$this->_parsepng($file);
- $info['i'] = count($this->images) + 1;
- $this->images[$file] = $info;
- };
+ $info['i']=count($this->images)+1;
+ $this->images[$file]=$info;
+ } else {
+ $info=$this->images[$file];
+ }
- $info = $this->images[$file];
$this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q',
$w*$this->k,
$h*$this->k,
@@ -2115,12 +2095,12 @@ function Output($name) {
//Finish document if necessary
if ($this->state != FPDF_STATE_COMPLETED) {
$this->Close();
- };
+ }
$f=fopen($name,'wb');
if (!$f) {
$this->Error('Unable to create output file: '.$name);
- };
+ }
fwrite($f,$this->buffer,strlen($this->buffer));
fclose($f);
}
@@ -2134,12 +2114,12 @@ function _dochecks() {
// Check for locale-related bug
if (1.1==1) {
$this->Error('Don\'t alter the locale before including class file');
- };
+ }
// Check for decimal separator
if (sprintf('%.1f',1.0)!='1.0') {
setlocale(LC_NUMERIC,'C');
- };
+ }
}
function _getfontpath() {
@@ -2155,7 +2135,7 @@ function _putpages() {
} else {
$wPt=$this->fhPt;
$hPt=$this->fwPt;
- };
+ }
$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
@@ -2170,9 +2150,6 @@ function _putpages() {
$this->_out('<_out('/Parent 1 0 R');
- $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',
- $page->get_width(),
- $page->get_height()));
$this->_out("/Annots ".$this->_pages[$n-1]->_annotations($this));
$this->_out('/Resources 2 0 R');
@@ -2187,11 +2164,11 @@ function _putpages() {
// Output annotation object for this page
$annotations = $this->_pages[$n-1]->annotations;
- $size = count($annotations);
+ $size = is_countable($annotations) ? count($annotations) : 0;
for ($j=0; $j<$size; $j++) {
$annotations[$j]->out($this);
- };
+ }
}
//Pages root
@@ -2226,7 +2203,7 @@ function _putfonts() {
$cmap->out($this);
}
-
+
foreach ($this->FontFiles as $file=>$info) {
//Font file embedding
$this->_newobj();
@@ -2235,19 +2212,19 @@ function _putfonts() {
$f=fopen($this->_getfontpath().$file,'rb',1);
if (!$f) {
$this->Error('Font file not found');
- };
+ }
- while (!feof($f)) { $font.=fread($f,8192); };
+ while (!feof($f)) { $font.=fread($f,8192); }
fclose($f);
$compressed=(substr($file,-2)=='.z');
if (!$compressed && isset($info['length2'])) {
- $header=(ord($font{0})==128);
+ $header=(ord($font[0])==128);
if($header) {
//Strip first binary header
$font=substr($font,6);
}
- if($header && ord($font{$info['length1']})==128) {
+ if($header && ord($font[$info['length1']])==128) {
//Strip second binary header
$font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
}
@@ -2256,12 +2233,12 @@ function _putfonts() {
if ($compressed) {
$this->_out('/Filter /FlateDecode');
- };
+ }
$this->_out('/Length1 '.$info['length1']);
if(isset($info['length2'])) {
$this->_out('/Length2 '.$info['length2'].' /Length3 0');
- };
+ }
$this->_out('>>');
$this->_putstream($font);
$this->_out('endobj');
@@ -2288,7 +2265,7 @@ function _putfonts() {
$this->_out('/ToUnicode '.($this->_reference($this->cmaps[$font['diff']])));
} else {
$this->_out('/Encoding /WinAnsiEncoding');
- };
+ }
}
$this->_out('>>');
$this->_out('endobj');
@@ -2299,7 +2276,7 @@ function _putfonts() {
$s='[';
for ($i=32;$i<=255;$i++) {
$s.=$cw[chr($i)].' ';
- };
+ }
$this->_out($s.']');
$this->_out('endobj');
@@ -2320,7 +2297,7 @@ function _putfonts() {
if ($font['file'] != "") {
$fontDescriptor['FontFile'.($type=='Type1' ? '' : '2')] =
$this->FontFiles[$font['file']]['n'].' 0 R';
- };
+ }
$this->_out($this->_dictionary($fontDescriptor));
$this->_out('endobj');
@@ -2337,7 +2314,7 @@ function _putfonts() {
function _putimages() {
$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
reset($this->images);
- while (list($file,$info) = each($this->images)) {
+ foreach ($this->images as $file => $info) {
$this->_newobj();
$this->images[$file]['n']=$this->n;
$this->_out('<_out('/ColorSpace /'.$info['cs']);
if($info['cs']=='DeviceCMYK') {
$this->_out('/Decode [1 0 1 0 1 0 1 0]');
- };
+ }
}
$this->_out('/BitsPerComponent '.$info['bpc']);
if (isset($info['f'])) {
$this->_out('/Filter /'.$info['f']);
- };
+ }
if(isset($info['parms'])) {
$this->_out($info['parms']);
- };
+ }
if(isset($info['trns']) && is_array($info['trns'])) {
$trns='';
for ($i=0;$i_out('/Mask ['.$trns.']');
- };
+ }
$this->_out('/Length '.strlen($info['data']).'>>');
$this->_putstream($info['data']);
@@ -2381,14 +2358,14 @@ function _putimages() {
$this->_out('<<'.$filter.'/Length '.strlen($pal).'>>');
$this->_putstream($pal);
$this->_out('endobj');
- };
+ }
}
}
function _putxobjectdict() {
foreach ($this->images as $image) {
$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
- };
+ }
}
function _putresourcedict() {
@@ -2396,7 +2373,7 @@ function _putresourcedict() {
$this->_out('/Font <<');
foreach ($this->fonts as $font) {
$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
- };
+ }
$this->_out('>>');
$this->_out('/XObject <<');
$this->_putxobjectdict();
@@ -2421,23 +2398,23 @@ function _putinfo() {
if (!empty($this->title)) {
$this->_out('/Title '.$this->_textstring($this->title));
- };
+ }
if (!empty($this->subject)) {
$this->_out('/Subject '.$this->_textstring($this->subject));
- };
+ }
if (!empty($this->author)) {
$this->_out('/Author '.$this->_textstring($this->author));
- };
+ }
if (!empty($this->keywords)) {
$this->_out('/Keywords '.$this->_textstring($this->keywords));
- };
+ }
if (!empty($this->creator)) {
$this->_out('/Creator '.$this->_textstring($this->creator));
- };
+ }
$this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis')));
}
@@ -2455,7 +2432,7 @@ function _putcatalog($pages_start_obj_number) {
$this->_out("/OpenAction [$pages_start_obj_number 0 R /XYZ null null 1]");
} elseif (!is_string($this->ZoomMode)) {
$this->_out("/OpenAction [$pages_start_obj_number 0 R /XYZ null null ".($this->ZoomMode/100).']');
- };
+ }
if ($this->LayoutMode=='single') {
$this->_out('/PageLayout /SinglePage');
@@ -2463,7 +2440,7 @@ function _putcatalog($pages_start_obj_number) {
$this->_out('/PageLayout /OneColumn');
} elseif ($this->LayoutMode=='two') {
$this->_out('/PageLayout /TwoColumnLeft');
- };
+ }
if (count($this->_forms) > 0) {
$this->_out('/AcroForm <<');
@@ -2471,7 +2448,7 @@ function _putcatalog($pages_start_obj_number) {
$this->_out('/DR 2 0 R');
$this->_out('/NeedAppearances true');
$this->_out('>>');
- };
+ }
}
function _putheader() {
@@ -2502,7 +2479,7 @@ function _enddoc() {
$form =& $this->_forms[$i];
$form->out($this);
- };
+ }
//Catalog
$this->_newobj();
@@ -2519,7 +2496,7 @@ function _enddoc() {
for ($i=1; $i<=$this->n; $i++) {
$this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
- };
+ }
//Trailer
$this->_out('trailer');
@@ -2555,68 +2532,31 @@ function _newobj() {
$this->_out($num.' 0 obj');
}
- // Extract info from a JPEG file
- function _parsejpg($file) {
- $size_info = GetImageSize($file);
- if (!$size_info) {
- $this->Error('Missing or incorrect image file: '.$file);
- };
-
- if ($size_info[2]!=2) {
- $this->Error('Not a JPEG file: '.$file);
- };
-
- if (!isset($size_info['channels']) || $size_info['channels']==3) {
- $colspace='DeviceRGB';
- } elseif($size_info['channels']==4) {
- $colspace='DeviceCMYK';
- } else {
- $colspace='DeviceGray';
- };
-
- $bpc = isset($size_info['bits']) ? $size_info['bits'] : 8;
-
- //Read whole file
- $f=fopen($file,'rb');
- $data='';
- while (!feof($f)) {
- $data .= fread($f, 4096);
- };
- fclose($f);
-
- return array('w' => $size_info[0],
- 'h' => $size_info[1],
- 'cs' => $colspace,
- 'bpc' => $bpc,
- 'f' => 'DCTDecode',
- 'data' => $data);
- }
-
- // Extract info from a PNG file
function _parsepng($file) {
- $f = fopen($file,'rb');
+ //Extract info from a PNG file
+ $f=fopen($file,'rb');
if (!$f) {
$this->Error('Can\'t open image file: '.$file);
- };
+ }
//Check signature
if (fread($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
$this->Error('Not a PNG file: '.$file);
- };
+ }
//Read header chunk
fread($f,4);
if (fread($f,4)!='IHDR') {
$this->Error('Incorrect PNG file: '.$file);
- };
+ }
- $w = $this->_freadint($f);
- $h = $this->_freadint($f);
- $bpc = ord(fread($f,1));
+ $w=$this->_freadint($f);
+ $h=$this->_freadint($f);
+ $bpc=ord(fread($f,1));
if ($bpc>8) {
$this->Error('16-bit depth not supported: '.$file);
- };
+ }
$ct=ord(fread($f,1));
if ($ct==0) {
@@ -2627,19 +2567,19 @@ function _parsepng($file) {
$colspace='Indexed';
} else {
$this->Error('Alpha channel not supported: '.$file);
- };
+ }
if (ord(fread($f,1))!=0) {
$this->Error('Unknown compression method: '.$file);
- };
+ }
if (ord(fread($f,1))!=0) {
$this->Error('Unknown filter method: '.$file);
- };
+ }
if (ord(fread($f,1))!=0) {
$this->Error('Interlacing not supported: '.$file);
- };
+ }
fread($f,4);
$parms='/DecodeParms <>';
@@ -2677,12 +2617,12 @@ function _parsepng($file) {
break;
} else {
fread($f,$n+4);
- };
+ }
} while($n);
if ($colspace=='Indexed' && empty($pal)) {
$this->Error('Missing palette in '.$file);
- };
+ }
fclose($f);
return array('w' => $w,
'h' => $h,
diff --git a/public_html/phpinfo.php b/public_html/phpinfo.php
new file mode 100644
index 0000000..dfcc4d9
--- /dev/null
+++ b/public_html/phpinfo.php
@@ -0,0 +1,3 @@
+
diff --git a/public_html/pipeline.class.php b/public_html/pipeline.class.php
index 8c9c6ed..84f3dc2 100644
--- a/public_html/pipeline.class.php
+++ b/public_html/pipeline.class.php
@@ -43,7 +43,6 @@
require_once(HTML2PS_DIR.'box.br.php');
require_once(HTML2PS_DIR.'box.block.php');
-require_once(HTML2PS_DIR.'box.page.php');
require_once(HTML2PS_DIR.'box.page.margin.class.php');
require_once(HTML2PS_DIR.'box.body.php');
require_once(HTML2PS_DIR.'box.block.inline.php');
@@ -126,9 +125,6 @@
require_once(HTML2PS_DIR.'height.php');
require_once(HTML2PS_DIR.'width.php');
-require_once(HTML2PS_DIR.'css.counter.php');
-require_once(HTML2PS_DIR.'css.counter.collection.php');
-
require_once(HTML2PS_DIR.'css.colors.inc.php');
require_once(HTML2PS_DIR.'css.constants.inc.php');
@@ -143,7 +139,6 @@
require_once(HTML2PS_DIR.'css.parse.inc.php');
require_once(HTML2PS_DIR.'css.parse.media.inc.php');
-require_once(HTML2PS_DIR.'css.background.attachment.inc.php');
require_once(HTML2PS_DIR.'css.background.color.inc.php');
require_once(HTML2PS_DIR.'css.background.image.inc.php');
require_once(HTML2PS_DIR.'css.background.repeat.inc.php');
@@ -159,7 +154,6 @@
require_once(HTML2PS_DIR.'css.direction.inc.php');
require_once(HTML2PS_DIR.'css.html2ps.html.content.inc.php');
require_once(HTML2PS_DIR.'css.html2ps.pseudoelements.inc.php');
-require_once(HTML2PS_DIR.'css.html2ps.pixels.php');
require_once(HTML2PS_DIR.'css.content.inc.php');
require_once(HTML2PS_DIR.'css.display.inc.php');
require_once(HTML2PS_DIR.'css.float.inc.php');
@@ -185,7 +179,6 @@
require_once(HTML2PS_DIR.'css.page-break-before.inc.php');
require_once(HTML2PS_DIR.'css.page-break-inside.inc.php');
require_once(HTML2PS_DIR.'css.orphans.inc.php');
-require_once(HTML2PS_DIR.'css.size.inc.php');
require_once(HTML2PS_DIR.'css.widows.inc.php');
require_once(HTML2PS_DIR.'css.position.inc.php');
@@ -248,7 +241,6 @@
require_once(HTML2PS_DIR.'filter.pre.footnotes.class.php');
require_once(HTML2PS_DIR.'filter.pre.height-constraint.class.php');
-require_once(HTML2PS_DIR.'layout._interface.class.php');
require_once(HTML2PS_DIR.'layout.default.class.php');
require_once(HTML2PS_DIR.'layout.page.breaks.php');
@@ -272,16 +264,11 @@
require_once(HTML2PS_DIR.'dispatcher.class.php');
require_once(HTML2PS_DIR.'observer.class.php');
-require_once(HTML2PS_DIR.'strategy.page.break.simple.php');
-require_once(HTML2PS_DIR.'strategy.page.break.smart.php');
-
-require_once(HTML2PS_DIR.'strategy.link.rendering.normal.php');
require_once(HTML2PS_DIR.'strategy.position.absolute.php');
require_once(HTML2PS_DIR.'strategy.width.absolute.positioned.php');
require_once(HTML2PS_DIR.'autofix.url.php');
require_once(HTML2PS_DIR.'fetcher._interface.class.php');
-require_once(HTML2PS_DIR.'features/_factory.php');
class Pipeline {
var $fetchers;
@@ -309,58 +296,35 @@ class Pipeline {
var $_current_page_name;
- var $_page_break_strategy;
-
- function Pipeline() {
- $this->_css = array();
-
+ function __construct() {
$this->_counters = array();
$this->_footnotes = array();
- $this->_base_url = array('');
+ $this->_base_url = array("");
$this->_reset_page_at_rules();
$this->pre_tree_filters = array();
- $this->_dispatcher =& new Dispatcher();
-
- $this->_dispatcher->add_event('before-page-heights');
- $this->_dispatcher->add_event('before-page');
- $this->_dispatcher->add_event('after-page');
- $this->_dispatcher->add_event('before-batch-item');
- $this->_dispatcher->add_event('after-batch-item');
- $this->_dispatcher->add_event('after-parse');
- $this->_dispatcher->add_event('before-document');
- $this->_dispatcher->add_event('after-document');
- $this->_dispatcher->add_event('before-batch');
- $this->_dispatcher->add_event('after-batch');
+ $this->_dispatcher= new Dispatcher();
- $this->_page_break_strategy = new StrategyPageBreakSimple();
- }
-
- function add_feature($feature_name, $params = array()) {
- $feature_object =& FeatureFactory::get($feature_name);
- if (is_null($feature_object)) {
- die(sprintf('No feature "%s" found', $feature_name));
- };
-
- $feature_object->install($this, $params);
+ $this->_dispatcher->addEvent("before-page");
+ $this->_dispatcher->addEvent("after-page");
+ $this->_dispatcher->addEvent("before-document");
+ $this->_dispatcher->addEvent("after-document");
+ $this->_dispatcher->addEvent("before-batch");
+ $this->_dispatcher->addEvent("after-batch");
}
function add_fetcher(&$fetcher) {
array_unshift($this->fetchers, $fetcher);
}
- function calculate_page_heights(&$media, &$box) {
- return $this->_page_break_strategy->run($this, $media, $box);
- }
-
function clear_box_id_map() {
$GLOBALS['__html_box_id_map'] = array();
}
function close() {
- $this->_dispatcher->fire('after-batch', array('pipeline' => &$this));
+ $this->_dispatcher->fire("after-batch", array($this));
$this->output_driver->close();
$this->_output();
@@ -368,105 +332,64 @@ function close() {
// Non HTML-specific cleanup
//
- ImageFactory::clear_cache();
+ (new Image())->clear_cache();
}
function configure($options) {
- $defaults = array('compress' => false,
- 'cssmedia' => 'screen',
- 'debugbox' => false,
- 'debugnoclip' => false,
+ $defaults = array(
+ 'debugbox' => 0,
'draw_page_border' => false,
- 'encoding' => '',
- 'html2xhtml' => true,
- 'imagequality_workaround' => false,
- 'landscape' => false,
- 'margins' => array('left' => 30,
- 'right' => 15,
- 'top' => 15,
- 'bottom' => 15),
- 'media' => 'A4',
- 'method' => 'fpdf',
- 'mode' => 'html',
- 'output' => 0,
- 'pagewidth' => 800,
- 'pdfversion' => "1.2",
- 'ps2pdf' => false,
- 'pslevel' => 3,
+ 'cssmedia' => 'screen',
+ 'scalepoints' => false,
+ 'renderimages' => true,
'renderfields' => false,
'renderforms' => false,
- 'renderimages' => true,
'renderlinks' => false,
- 'scalepoints' => true,
- 'smartpagebreak' => true,
- 'transparency_workaround' => false
+ 'pagewidth' => 800,
+ 'landscape' => false,
+ 'mode' => 'html'
);
- // As a reminder: If the input arrays have the same string keys, then the later value for that key will overwrite the previous one.
- $GLOBALS['g_config'] = array_merge($defaults, $options);
-
- // Note that CSS media names should be case-insensitive
- $GLOBALS['g_config']['cssmedia'] = strtolower($GLOBALS['g_config']['cssmedia']);
-
- if ($GLOBALS['g_config']['smartpagebreak']) {
- $this->_page_break_strategy = new StrategyPageBreakSmart();
- } else {
- $this->_page_break_strategy = new StrategyPageBreakSimple();
- };
+ // As a reminder: array_merge will not overwrite existing array keys
+ $GLOBALS['g_config'] = array_merge($options, $defaults);
}
function _addFootnote(&$note_call) {
$this->_footnotes[] =& $note_call;
}
-// function _fillContent($content) {
-// $filled = "";
+ function _fillContent($content) {
+ $filled = "";
-// while (preg_match("/^.*?('.*?'|\".*?\"|counter\(.*?\))(.*)$/", $content, $matches)) {
-// $data = $matches[1];
-// $content = $matches[2];
+ while (preg_match("/^.*?('.*?'|\".*?\"|counter\(.*?\))(.*)$/", $content, $matches)) {
+ $data = $matches[1];
+ $content = $matches[2];
-// if ($data{0} != '\'' && $data{0} != '"') {
-// $filled .= $this->_fillContentCounter($data);
-// } else {
-// $filled .= $this->_fillContentString($data);
-// };
-// };
-
-// return $filled;
-// }
-
-// function _fillContentString($content) {
-// $unescaped_content = css_process_escapes($content);
-// $unquoted_content = css_remove_value_quotes($unescaped_content);
-// return $unquoted_content;
-// }
-
-// function _fillContentCounter($content) {
-// preg_match("/counter\((.*?)\)/", $content, $matches);
-// return $this->_getCounter($matches[1]);
-// }
-
- function &get_counters() {
- $counter_collection =& new CSSCounterCollection();
-
- foreach ($this->_counters as $counter_name => $counter_value) {
- $counter =& new CSSCounter($counter_name);
- $counter->set($counter_value);
- $counter_collection->add($counter);
- };
-
- return $counter_collection;
+ if ($data[0] != '\'' && $data[0] != '"') {
+ $filled .= $this->_fillContentCounter($data);
+ } else {
+ $filled .= $this->_fillContentString($data);
+ }
+ }
+
+ return $filled;
}
- function &get_dispatcher() {
- return $this->_dispatcher;
+ function _fillContentString($content) {
+ $unescaped_content = css_process_escapes($content);
+ $unquoted_content = css_remove_value_quotes($unescaped_content);
+ return $unquoted_content;
}
- function get_counter($counter) {
+ function _fillContentCounter($content) {
+ preg_match("/counter\((.*?)\)/", $content, $matches);
+ return $this->_getCounter($matches[1]);
+ }
+
+ function _getCounter($counter) {
if (isset($this->_counters[$counter])) {
return $this->_counters[$counter];
- };
+ }
/**
* CSS 2.1: Counters that are not in the scope of any
@@ -476,15 +399,15 @@ function get_counter($counter) {
return 0;
}
- function reset_counter($counter, $value) {
+ function _resetCounter($counter, $value) {
$this->_counters[$counter] = $value;
}
- function increment_counter($counter, $value) {
+ function _incrementCounter($counter, $value) {
$this->_counters[$counter] += $value;
}
- function add_at_rule_page($at_rule) {
+ function addAtRulePage($at_rule) {
$selector =& $at_rule->getSelector();
$type = $selector->get_type();
$this->_page_at_rules[$type][] = $at_rule;
@@ -498,23 +421,23 @@ function _reset_page_at_rules() {
CSS_PAGE_SELECTOR_NAMED => array());
}
- function &get_default_css() {
+ function &getDefaultCSS() {
return $this->_defaultCSS;
}
- function &get_current_css() {
+ function &getCurrentCSS() {
return $this->_css[0];
}
- function &get_current_css_state() {
+ function &getCurrentCSSState() {
return $this->_cssState[0];
}
- function push_css() {
+ function pushCSS() {
array_unshift($this->_css, new CSSRuleset());
}
- function pop_css() {
+ function popCSS() {
array_shift($this->_css);
}
@@ -528,127 +451,41 @@ function pop_css() {
* @param $page_no Integer current page index (1-based)
* @param $media
*/
- function render_margin_boxes($page_no, &$media) {
- $boxes =& $this->reflow_margin_boxes($page_no, $media);
+ function _renderMarginBoxes($page_no, &$media) {
+ $boxes =& $this->_reflowMarginBoxes($page_no, $media);
foreach ($boxes as $selector => $box) {
$boxes[$selector]->show($this->output_driver);
- };
+ }
// Memleak fix
- for ($i=0, $size = count($boxes); $i < $size; $i++) {
+ for ($i=0, $size = count((array) $boxes); $i < $size; $i++) {
$boxes[$i]->destroy();
- };
+ }
unset($boxes);
}
- function get_page_media($page_no, &$media) {
- $page_rules =& $this->get_page_rules($page_no);
- $size_landscape = $page_rules->get_property_value(CSS_SIZE);
- if (!is_null($size_landscape)) {
- $media->set_width($size_landscape['size']['width']);
- $media->set_height($size_landscape['size']['height']);
- $media->set_landscape($size_landscape['landscape']);
- };
-
- $margins = $page_rules->get_property_value(CSS_MARGIN);
- if (!is_null($margins)) {
- $media->margins['left'] = $margins->left->calc(mm2pt($media->get_width())) / mm2pt(1) / pt2pt(1);
- $media->margins['right'] = $margins->right->calc(mm2pt($media->get_width())) / mm2pt(1) / pt2pt(1);
- $media->margins['top'] = $margins->top->calc(mm2pt($media->get_height())) / mm2pt(1) / pt2pt(1);
- $media->margins['bottom'] = $margins->bottom->calc(mm2pt($media->get_height())) / mm2pt(1) / pt2pt(1);
- };
-
- $left_margin = $page_rules->get_property_value(CSS_MARGIN_LEFT);
- if (!is_null($left_margin)) {
- $media->margins['left'] = $left_margin->calc(mm2pt($media->get_width())) / mm2pt(1) / pt2pt(1);
- };
-
- $right_margin = $page_rules->get_property_value(CSS_MARGIN_RIGHT);
- if (!is_null($right_margin)) {
- $media->margins['right'] = $right_margin->calc(mm2pt($media->get_width())) / mm2pt(1) / pt2pt(1);
- };
-
- $top_margin = $page_rules->get_property_value(CSS_MARGIN_TOP);
- if (!is_null($top_margin)) {
- $media->margins['top'] = $top_margin->calc(mm2pt($media->get_height())) / mm2pt(1) / pt2pt(1);
- };
-
- $bottom_margin = $page_rules->get_property_value(CSS_MARGIN_BOTTOM);
- if (!is_null($bottom_margin)) {
- $media->margins['bottom'] = $bottom_margin->calc(mm2pt($media->get_height())) / mm2pt(1) / pt2pt(1);
- };
-
- $pixels = $page_rules->get_property_value(CSS_HTML2PS_PIXELS);
- if (!is_null($pixels)) {
- $media->set_pixels($pixels);
- };
- }
-
- function &get_page_rules($page_no) {
- $collection =& new CSSPropertyCollection();
-
- foreach ($this->_page_at_rules[CSS_PAGE_SELECTOR_ALL] as $rule) {
- $collection->merge($rule->css);
- };
-
- /**
- * Check which one of :right/:left selector is applicable (assuming that first page matches :right)
- */
- if ($page_no % 2 == 0) {
- foreach ($this->_page_at_rules[CSS_PAGE_SELECTOR_LEFT] as $rule) {
- $collection->merge($rule->css);
- };
- } else {
- foreach ($this->_page_at_rules[CSS_PAGE_SELECTOR_RIGHT] as $rule) {
- $collection->merge($rule->css);
- };
- };
-
- if ($page_no == 1) {
- foreach ($this->_page_at_rules[CSS_PAGE_SELECTOR_FIRST] as $rule) {
- $collection->merge($rule->css);
- };
- };
-
- return $collection;
- }
-
- function &reflow_page_box($page_no, &$media) {
- $rules =& $this->get_page_rules($page_no);
- $box =& BoxPage::create($this, $rules);
- $box->reflow($media);
- return $box;
- }
-
- function render_page_box($page_no, &$media) {
- $box =& $this->reflow_page_box($page_no, $media);
- $box->show($this->output_driver);
- $box->destroy();
- unset($box);
- }
-
- function &reflow_margin_boxes($page_no, &$media) {
+ function &_reflowMarginBoxes($page_no, &$media) {
$at_rules = $this->_getMarginBoxes($page_no, $media);
-
+
$boxes = array();
foreach ($at_rules as $at_rule) {
- $selector = $at_rule->getSelector();
- $boxes[$selector] =& BoxPageMargin::create($this, $at_rule);
- };
+ $selector =& $at_rule->getSelector();
+ $boxes[$selector] =& (new BoxPageMargin($this, $at_rule))->create($this, $at_rule);
+ }
foreach ($boxes as $selector => $box) {
$linebox_started = false;
$previous_whitespace = false;
$boxes[$selector]->reflow_whitespace($linebox_started, $previous_whitespace);
$boxes[$selector]->reflow_text($this->output_driver);
- };
+ }
foreach ($boxes as $selector => $box) {
$boxes[$selector]->reflow($this->output_driver,
$media,
$boxes);
- };
+ }
return $boxes;
}
@@ -666,9 +503,9 @@ function _getMarginBoxes($page_no, $media) {
*/
if ($page_no == 1) {
foreach ($this->_page_at_rules[CSS_PAGE_SELECTOR_FIRST] as $rule) {
- $applicable_margin_boxes = $applicable_margin_boxes + $rule->getAtRuleMarginBoxes();
- };
- };
+ $applicable_margin_boxes = $applicable_margin_boxes + $rule->getAtRuleMarginBoxes();
+ }
+ }
/**
* Check which one of :right/:left selector is applicable (assuming that first page matches :right)
@@ -676,176 +513,132 @@ function _getMarginBoxes($page_no, $media) {
if ($page_no % 2 == 0) {
foreach ($this->_page_at_rules[CSS_PAGE_SELECTOR_LEFT] as $rule) {
$applicable_margin_boxes = $applicable_margin_boxes + $rule->getAtRuleMarginBoxes();
- };
+ }
} else {
foreach ($this->_page_at_rules[CSS_PAGE_SELECTOR_RIGHT] as $rule) {
$applicable_margin_boxes = $applicable_margin_boxes + $rule->getAtRuleMarginBoxes();
- };
- };
+ }
+ }
/**
* Extract margin boxes from plain @page rules
*/
foreach ($this->_page_at_rules[CSS_PAGE_SELECTOR_ALL] as $rule) {
$applicable_margin_boxes = $applicable_margin_boxes + $rule->getAtRuleMarginBoxes();
- };
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP] =&
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP] =
new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP,$this);
- };
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_LEFT_CORNER])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_LEFT_CORNER] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_LEFT_CORNER,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_LEFT_CORNER]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_LEFT_CORNER,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_LEFT])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_LEFT] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_LEFT,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_LEFT]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_LEFT,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_CENTER])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_CENTER] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_CENTER,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_CENTER]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_CENTER,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT_CORNER])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT_CORNER] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT_CORNER,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT_CORNER]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT_CORNER,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT_CORNER])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT_CORNER] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT_CORNER,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT_CORNER]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT_CORNER,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_CENTER])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_CENTER] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_CENTER,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_CENTER]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_CENTER,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT_CORNER])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT_CORNER] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT_CORNER,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT_CORNER]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT_CORNER,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_TOP])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_TOP] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_LEFT_TOP,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_TOP]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_LEFT_TOP,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_MIDDLE])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_MIDDLE] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_LEFT_MIDDLE,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_MIDDLE]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_LEFT_MIDDLE,$this);
+ }
if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_BOTTOM])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_BOTTOM] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_LEFT_BOTTOM,$this);
- };
+ $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_LEFT_BOTTOM]= new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_LEFT_BOTTOM,$this);
+ }
- if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_TOP])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_TOP] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_RIGHT_TOP,$this);
- };
-
- if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_MIDDLE])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_MIDDLE] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_RIGHT_MIDDLE,$this);
- };
-
- if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_BOTTOM])) {
- $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_BOTTOM] =&
- new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_RIGHT_BOTTOM,$this);
- };
+ if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_TOP])) { $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_TOP] = new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_RIGHT_TOP,$this); }
+ if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_MIDDLE])) { $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_MIDDLE] = new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_RIGHT_MIDDLE,$this); }
+ if (!isset($applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_BOTTOM])) { $applicable_margin_boxes[CSS_MARGIN_BOX_SELECTOR_RIGHT_BOTTOM] = new CSSAtRuleMarginBox(CSS_MARGIN_BOX_SELECTOR_RIGHT_BOTTOM,$this); }
return $applicable_margin_boxes;
}
- function _process_item($data_id, &$media, $offset=0) {
- $this->_dispatcher->fire('before-batch-item', array('pipeline' => &$this));
-
+ function _process_item($data_id, &$media, $offset=0) {
$box =& $this->_layout_item($data_id, $media, $offset, $context, $postponed_filter);
if (is_null($box)) {
error_log(sprintf(_('Could not fetch: %s'), (string)$data_id));
return true;
- };
+ }
$this->_show_item($box, $offset, $context, $media, $postponed_filter);
// Clear CSS for this item
- $this->pop_css();
+ $this->popCSS();
$this->_defaultCSS = null;
// Memory leak fix: caused by circular references?
$box->destroy();
- $this->_dispatcher->fire('after-batch-item', array('pipeline' => &$this));
return true;
}
function _show_item(&$box, $offset, &$context, &$media, &$postponed_filter) {
$context->sort_absolute_positioned_by_z_index();
- $this->_dispatcher->fire('before-page-heights', array('pipeline' => &$this,
- 'document' => &$box,
- 'media' => &$media));
-
// Make batch-processing offset
- $page_heights = $this->calculate_page_heights($media, $box);
$box->offset(0, $offset);
- $box->reflow_anchors($this->output_driver, $this->output_driver->anchors, $page_heights);
-
- $this->_dispatcher->fire('before-document', array('pipeline' => &$this,
- 'document' => &$box,
- 'page-heights' => &$page_heights,
- 'media' => &$media));
+ /**
+ * Calculate page heights
+ */
+ $page_heights = (new PageBreakLocator())->getPages($box,
+ mm2pt($media->real_height()),
+ mm2pt($media->height() - $media->margins['top']));
- $expected_pages = count($page_heights);
+ $expected_pages = count((array) $page_heights);
$this->output_driver->set_expected_pages($expected_pages);
- $this->reset_counter('pages', $expected_pages);
- $this->reset_counter('page', 0);
-
- // Output PDF pages using chosen PDF driver
- for ($i = 0; $i < $expected_pages; $i++) {
- $this->get_page_media(1, $media);
-
- $this->output_driver->update_media($media);
- $this->_setupScales($media);
-
- $current_page_offset = $i == 0 ? 0 : $page_heights[$i-1];
- $current_page_height = $page_heights[$i];
-
- $this->output_driver->next_page($current_page_offset);
+ $this->_resetCounter('pages', $expected_pages);
+ $this->_resetCounter('page', 0);
- // Preparen list of postponed (floating and relative-positioned) boxes for the current page
- $postponed_filter->process($box, null, $this);
+ $this->_dispatcher->fire("before-document", array($this, $box));
- $this->reset_counter('footnote', 0);
- $this->increment_counter('page', 1);
+ // Output PDF pages using chosen PDF driver
+ for ($i=0; $i<$expected_pages; $i++) {
+ $this->_resetCounter('footnote', 0);
+ $this->_incrementCounter('page', 1);
$this->output_driver->save();
@@ -853,20 +646,17 @@ function _show_item(&$box, $offset, &$context, &$media, &$postponed_filter) {
* Note that margin boxes should be rendered before 'setup_clip', as it will trim all
* content rendered outside the 'main' page area
*/
- $this->render_margin_boxes($i+1, $media);
- $this->render_page_box($i+1, $media);
+ $this->_renderMarginBoxes($i+1, $media);
- $this->output_driver->setPageHeight($current_page_height);
+ $this->output_driver->setPageHeight($page_heights[$i]);
$this->output_driver->setup_clip();
- $this->_dispatcher->fire('before-page', array('pipeline' => &$this,
- 'document' => &$box,
- 'pageno' => $i));
+ $this->_dispatcher->fire("before-page", array($this, $box, $i));
if (is_null($box->show($this->output_driver))) {
- error_log('Pipeline::_process_item: output routine failed');
+ error_log("Pipeline::_process_item: output routine failed");
return null;
- };
+ }
/**
* Show postponed boxes - relative and floating boxes, as they should be
@@ -882,15 +672,20 @@ function _show_item(&$box, $offset, &$context, &$media, &$postponed_filter) {
global $g_config;
if ($g_config['draw_page_border']) {
$this->output_driver->draw_page_border();
- };
+ }
+
+ $this->_dispatcher->fire("after-page", array($this, $box, $i));
- $this->_dispatcher->fire('after-page', array('pipeline' => &$this,
- 'document' => &$box,
- 'pageno' => $i));
- };
+ // Add page if currently rendered page is not last
+ if ($i < $expected_pages-1) {
+ $this->output_driver->next_page($page_heights[$i]);
+ }
- $this->_dispatcher->fire('after-document', array('pipeline' => &$this,
- 'document' => &$box));
+ // Restore postponed list for the next page
+ $postponed_filter->process($box, null, $this);
+ }
+
+ $this->_dispatcher->fire("after-document", array($this, $box));
}
function _output() {
@@ -898,7 +693,7 @@ function _output() {
for ($i=0; $ioutput_filters); $i++) {
$temporary_output_filename = $this->output_filters[$i]->process($temporary_output_filename);
- };
+ }
// Determine the content type of the result
$content_type = null;
@@ -906,11 +701,11 @@ function _output() {
while (($i >= 0) && (is_null($content_type))) {
$content_type = $this->output_filters[$i]->content_type();
$i--;
- };
+ }
if (is_null($content_type)) {
$content_type = $this->output_driver->content_type();
- };
+ }
$this->destination->process($temporary_output_filename, $content_type);
unlink($temporary_output_filename);
@@ -920,20 +715,15 @@ function set_destination(&$destination) {
$this->destination =& $destination;
}
- function set_output_driver(&$output_driver) {
- $this->output_driver =& $output_driver;
- }
-
function &fetch($data_id) {
- if (count($this->fetchers) == 0) {
+ if (count($this->fetchers) == 0) {
ob_start();
- include(HTML2PS_DIR.'templates/error._no_fetchers.tpl');
+ include(HTML2PS_DIR.'/templates/error._no_fetchers.tpl');
$this->error_message = ob_get_contents();
ob_end_clean();
- $null = null;
- return $null;
- };
+ return null;
+ }
// Fetch data
for ($i=0; $ifetchers); $i++) {
@@ -942,12 +732,12 @@ function &fetch($data_id) {
if ($data != null) {
$this->push_base_url($this->fetchers[$i]->get_base_url());
return $data;
- };
- };
+ }
+ }
if (defined('DEBUG_MODE')) {
error_log(sprintf('Could not fetch %s', $data_id));
- };
+ }
$null = null;
return $null;
@@ -968,7 +758,7 @@ function _setupScales(&$media) {
$g_pt_scale = $g_px_scale * 1.33; // This is a magic number, just don't touch it, or everything will explode!
} else {
$g_pt_scale = 1.0;
- };
+ }
}
/**
@@ -983,43 +773,39 @@ function _setupScales(&$media) {
function process_batch($data_id_array, &$media) {
$this->clear_box_id_map();
- // Save and disable magic_quotes_runtime
- $mq_runtime = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
-
$this->_prepare($media);
- $this->_dispatcher->fire('before-batch', array('pipeline' => &$this));
+ $this->_dispatcher->fire("before-batch", array($this));
$i = 0;
$offset = 0;
foreach ($data_id_array as $data_id) {
$this->_process_item($data_id, $media, $offset);
-
+
$i++;
- $offset = $this->output_driver->offset;
- };
+ if ($ioutput_driver->next_page();
+ $offset = $this->output_driver->offset;
+ }
+ }
$this->close();
- // Restore magic_quotes_runtime setting
- set_magic_quotes_runtime($mq_runtime);
-
return true;
}
function error_message() {
- $message = file_get_contents(HTML2PS_DIR.'templates/error._header.tpl');
+ $message = file_get_contents(HTML2PS_DIR.'/templates/error._header.tpl');
$message .= $this->error_message;
for ($i=0; $ifetchers); $i++) {
$message .= $this->fetchers[$i]->error_message();
- };
+ }
$message .= $this->output_driver->error_message();
- $message .= file_get_contents(HTML2PS_DIR.'templates/error._footer.tpl');
+ $message .= file_get_contents(HTML2PS_DIR.'/templates/error._footer.tpl');
return $message;
}
@@ -1035,10 +821,6 @@ function get_base_url() {
return $this->_base_url[0];
}
- function &get_output_driver() {
- return $this->output_driver;
- }
-
function guess_url($src) {
return guess_url($src, $this->get_base_url());
}
@@ -1061,8 +843,8 @@ function renderFootnotes() {
$footnote_x,
$footnote_y);
$footnote_y -= FOOTNOTE_GAP;
- };
- };
+ }
+ }
/**
* Draw thin line separating footnotes from page content
@@ -1074,36 +856,36 @@ function renderFootnotes() {
$this->output_driver->lineto($this->output_driver->getPageLeft() + $this->output_driver->getPageWidth()*FOOTNOTE_LINE_PERCENT/100,
$this->output_driver->getFootnoteTop() - FOOTNOTE_LINE_TOP_GAP);
$this->output_driver->stroke();
- };
+ }
}
function renderAbsolutePositioned(&$context) {
for ($j=0, $size = count($context->absolute_positioned); $j<$size; $j++) {
$current_box =& $context->absolute_positioned[$j];
- if ($current_box->get_css_property(CSS_VISIBILITY) === VISIBILITY_VISIBLE) {
+ if ($current_box->getCSSProperty(CSS_VISIBILITY) === VISIBILITY_VISIBLE) {
$this->output_driver->save();
$current_box->_setupClip($this->output_driver);
if (is_null($current_box->show($this->output_driver))) {
return null;
- };
+ }
$this->output_driver->restore();
- };
- };
+ }
+ }
$this->output_driver->show_postponed_in_absolute();
}
function renderFixedPositioned(&$context) {
for ($j=0, $size = count($context->fixed_positioned); $j<$size; $j++) {
$current_box =& $context->fixed_positioned[$j];
- if ($current_box->get_css_property(CSS_VISIBILITY) === VISIBILITY_VISIBLE) {
+ if ($current_box->getCSSProperty(CSS_VISIBILITY) === VISIBILITY_VISIBLE) {
$this->output_driver->save();
$current_box->_setupClip($this->output_driver);
if (is_null($current_box->show_fixed($this->output_driver))) {
return null;
- };
+ }
$this->output_driver->restore();
- };
- };
+ }
+ }
$this->output_driver->show_postponed_in_fixed();
}
@@ -1113,43 +895,34 @@ function _prepare(&$media) {
$this->output_driver->reset($media);
}
- function reset_css() {
- $css_cache = CSSCache::get();
- $this->_defaultCSS = $css_cache->compile('resource://default.css',
- file_get_contents(HTML2PS_DIR.'default.css'),
- $this);
- $this->_css = array();
- $this->push_css();
-
- $this->_cssState = array(new CSSState(CSS::get()));
- }
-
function &_layout_item($data_id, &$media, $offset, &$context, &$postponed_filter) {
$this->_reset_page_at_rules();
- $this->reset_css();
+ $css_cache = (new CSSCache())->get();
+ $this->_defaultCSS = $css_cache->compile("resource://default.css",
+ file_get_contents(HTML2PS_DIR.'/default.css'));
+ $this->_css = array();
+ $this->pushCSS();
+
+ $this->_cssState = array(new CSSState((new CSS())->get()));
- $font = $this->_cssState[0]->get_property(CSS_FONT);
+ $font = $this->_cssState[0]->getProperty(CSS_FONT);
$font->units2pt(0);
- $this->_cssState[0]->set_property(CSS_FONT, $font);
+ $this->_cssState[0]->setProperty(CSS_FONT, $font);
$data = $this->fetch($data_id);
if (is_null($data)) {
$dummy = null;
return $dummy;
- };
+ }
// Run raw data filters
- for ($i = 0; $i < count($this->data_filters); $i++) {
+ for ($i=0; $idata_filters); $i++) {
$data = $this->data_filters[$i]->process($data);
- };
+ }
// Parse the raw data
- $box =& $this->parser->process($data->get_content(), $this, $media);
-
- $this->_dispatcher->fire('after-parse', array('pipeline' => &$this,
- 'document' => &$box,
- 'media' => $media));
+ $box =& $this->parser->process($data->get_content(), $this);
/**
* Run obligatory tree filters
@@ -1168,9 +941,34 @@ function &_layout_item($data_id, &$media, $offset, &$context, &$postponed_filter
$filter->process($box, $data, $this);
// Run pre-layout tree filters
- for ($i=0, $size = count($this->pre_tree_filters); $i < $size; $i++) {
+ for ($i=0, $size = count((array) $this->pre_tree_filters); $i < $size; $i++) {
$this->pre_tree_filters[$i]->process($box, $data, $this);
- };
+ }
+
+ /**
+ * Auto-detect top/bottom margin size (only if both top and bottom margins have zero value)
+ */
+ if ($media->margins['top'] == 0 &&
+ $media->margins['bottom'] == 0) {
+ $boxes = $this->_reflowMarginBoxes(0, $media);
+
+ $media->margins['top'] = max($boxes[CSS_MARGIN_BOX_SELECTOR_TOP]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_TOP_LEFT_CORNER]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_TOP_LEFT]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_TOP_CENTER]->get_real_full_height(),
+
+ $boxes[CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_TOP_RIGHT_CORNER]->get_real_full_height()) / mm2pt(1);
+
+ $media->margins['bottom'] = max($boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT_CORNER]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_LEFT]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_CENTER]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT]->get_real_full_height(),
+ $boxes[CSS_MARGIN_BOX_SELECTOR_BOTTOM_RIGHT_CORNER]->get_real_full_height()) / mm2pt(1);
+
+ $this->output_driver->reset($media);
+ }
$context = new FlowContext;
@@ -1183,31 +981,17 @@ function &_layout_item($data_id, &$media, $offset, &$context, &$postponed_filter
$postponed_filter = new PostTreeFilterPostponed($this->output_driver);
$postponed_filter->process($box, null, $this);
- $this->output_driver->prepare();
-
- // Force generation of custom characters for margin boxes
- for ($i = 0; $i <= 1; $i++) {
- $this->get_page_media(1, $media);
- $at_rules = $this->_getMarginBoxes($i, $media);
-
- $boxes = array();
- foreach ($at_rules as $at_rule) {
- $selector = $at_rule->getSelector();
- $boxes[$selector] =& BoxPageMargin::create($this, $at_rule);
- };
- };
-
$status = $this->layout_engine->process($box, $media, $this->output_driver, $context);
if (is_null($status)) {
- error_log('Pipeline::_process_item: layout routine failed');
+ error_log("Pipeline::_process_item: layout routine failed");
$dummy = null;
return $dummy;
- };
+ }
// Run post-layout tree filters
for ($i=0; $ipost_tree_filters); $i++) {
$this->post_tree_filters[$i]->process($box);
- };
+ }
return $box;
}
@@ -1225,4 +1009,4 @@ function set_current_page_name($name) {
}
}
-?>
+?>
\ No newline at end of file
diff --git a/public_html/pipeline.factory.class.php b/public_html/pipeline.factory.class.php
index 747d235..a64766e 100644
--- a/public_html/pipeline.factory.class.php
+++ b/public_html/pipeline.factory.class.php
@@ -3,22 +3,16 @@
require_once(HTML2PS_DIR.'pipeline.class.php');
class PipelineFactory {
- function &create_default_pipeline($encoding, $filename) {
- $pipeline =& new Pipeline();
+ function create_default_pipeline($encoding, $filename) {
+ $pipeline = new Pipeline();
- if (isset($GLOBALS['g_config'])) {
- $pipeline->configure($GLOBALS['g_config']);
- } else {
- $pipeline->configure(array());
- };
-
-// if (extension_loaded('curl')) {
-// require_once(HTML2PS_DIR.'fetcher.url.curl.class.php');
-// $pipeline->fetchers[] = new FetcherUrlCurl();
-// } else {
+ if (extension_loaded('curl')) {
+ require_once(HTML2PS_DIR.'fetcher.url.curl.class.php');
+ $pipeline->fetchers[] = new FetcherURLCurl();
+ } else {
require_once(HTML2PS_DIR.'fetcher.url.class.php');
$pipeline->fetchers[] = new FetcherURL();
-// };
+ }
$pipeline->data_filters[] = new DataFilterDoctype();
$pipeline->data_filters[] = new DataFilterUTF8($encoding);
@@ -29,10 +23,10 @@ function &create_default_pipeline($encoding, $filename) {
$pipeline->post_tree_filters = array();
$pipeline->output_driver = new OutputDriverFPDF();
$pipeline->output_filters = array();
- $pipeline->destination = new DestinationDownload($filename, ContentType::pdf());
+ $pipeline->destination = new DestinationDownload($filename, (new ContentType())->pdf());
return $pipeline;
}
}
-?>
+?>
\ No newline at end of file
diff --git a/public_html/postscript/array.ps b/public_html/postscript/array.ps
index 680bf78..ad1421a 100644
Binary files a/public_html/postscript/array.ps and b/public_html/postscript/array.ps differ
diff --git a/public_html/postscript/box.block.inline.ps b/public_html/postscript/box.block.inline.ps
index 70d0c9c..6d5a293 100644
Binary files a/public_html/postscript/box.block.inline.ps and b/public_html/postscript/box.block.inline.ps differ
diff --git a/public_html/postscript/box.block.ps b/public_html/postscript/box.block.ps
index 9bfc0f1..bc7e78e 100644
Binary files a/public_html/postscript/box.block.ps and b/public_html/postscript/box.block.ps differ
diff --git a/public_html/postscript/box.break.ps b/public_html/postscript/box.break.ps
index f513519..a06b4bb 100644
Binary files a/public_html/postscript/box.break.ps and b/public_html/postscript/box.break.ps differ
diff --git a/public_html/postscript/box.container.ps b/public_html/postscript/box.container.ps
index 1ae955e..25d5002 100644
Binary files a/public_html/postscript/box.container.ps and b/public_html/postscript/box.container.ps differ
diff --git a/public_html/postscript/box.inline.whitespace.ps b/public_html/postscript/box.inline.whitespace.ps
index 99b4c19..e5517cc 100644
Binary files a/public_html/postscript/box.inline.whitespace.ps and b/public_html/postscript/box.inline.whitespace.ps differ
diff --git a/public_html/postscript/box.input.check.ps b/public_html/postscript/box.input.check.ps
index 9bbc629..8b3739c 100644
Binary files a/public_html/postscript/box.input.check.ps and b/public_html/postscript/box.input.check.ps differ
diff --git a/public_html/postscript/box.input.radio.ps b/public_html/postscript/box.input.radio.ps
index 0ec54db..ca1b847 100644
Binary files a/public_html/postscript/box.input.radio.ps and b/public_html/postscript/box.input.radio.ps differ
diff --git a/public_html/postscript/box.list-item.ps b/public_html/postscript/box.list-item.ps
index bc8090d..255fbdd 100644
Binary files a/public_html/postscript/box.list-item.ps and b/public_html/postscript/box.list-item.ps differ
diff --git a/public_html/postscript/box.ps b/public_html/postscript/box.ps
index d406a23..4a66949 100644
Binary files a/public_html/postscript/box.ps and b/public_html/postscript/box.ps differ
diff --git a/public_html/postscript/box.select.ps b/public_html/postscript/box.select.ps
index 1a218f5..1cb1304 100644
Binary files a/public_html/postscript/box.select.ps and b/public_html/postscript/box.select.ps differ
diff --git a/public_html/postscript/box.span.ps b/public_html/postscript/box.span.ps
index 3738b79..08727d5 100644
Binary files a/public_html/postscript/box.span.ps and b/public_html/postscript/box.span.ps differ
diff --git a/public_html/postscript/box.table.cell.ps b/public_html/postscript/box.table.cell.ps
index 14e107f..841794d 100644
Binary files a/public_html/postscript/box.table.cell.ps and b/public_html/postscript/box.table.cell.ps differ
diff --git a/public_html/postscript/box.text.ps b/public_html/postscript/box.text.ps
index 7f54b66..8535426 100644
Binary files a/public_html/postscript/box.text.ps and b/public_html/postscript/box.text.ps differ
diff --git a/public_html/postscript/box.whitespace.ps b/public_html/postscript/box.whitespace.ps
index b9aca48..1132cea 100644
Binary files a/public_html/postscript/box.whitespace.ps and b/public_html/postscript/box.whitespace.ps differ
diff --git a/public_html/postscript/context.ps b/public_html/postscript/context.ps
index f9c2d2e..6f44e44 100644
Binary files a/public_html/postscript/context.ps and b/public_html/postscript/context.ps differ
diff --git a/public_html/postscript/encoding.dingbats.ps b/public_html/postscript/encoding.dingbats.ps
index 2fd2bdf..ff4867f 100644
Binary files a/public_html/postscript/encoding.dingbats.ps and b/public_html/postscript/encoding.dingbats.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-10.ps b/public_html/postscript/encoding.iso-8859-10.ps
index 71e441f..20fead7 100644
Binary files a/public_html/postscript/encoding.iso-8859-10.ps and b/public_html/postscript/encoding.iso-8859-10.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-11.ps b/public_html/postscript/encoding.iso-8859-11.ps
index 88d27a8..788c0c5 100644
Binary files a/public_html/postscript/encoding.iso-8859-11.ps and b/public_html/postscript/encoding.iso-8859-11.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-13.ps b/public_html/postscript/encoding.iso-8859-13.ps
index 02670d5..ab2c470 100644
Binary files a/public_html/postscript/encoding.iso-8859-13.ps and b/public_html/postscript/encoding.iso-8859-13.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-14.ps b/public_html/postscript/encoding.iso-8859-14.ps
index 64240ca..f848f3f 100644
Binary files a/public_html/postscript/encoding.iso-8859-14.ps and b/public_html/postscript/encoding.iso-8859-14.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-15.ps b/public_html/postscript/encoding.iso-8859-15.ps
index 6469fc1..31a3c16 100644
Binary files a/public_html/postscript/encoding.iso-8859-15.ps and b/public_html/postscript/encoding.iso-8859-15.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-2.ps b/public_html/postscript/encoding.iso-8859-2.ps
index dbc0f12..d72e184 100644
Binary files a/public_html/postscript/encoding.iso-8859-2.ps and b/public_html/postscript/encoding.iso-8859-2.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-3.ps b/public_html/postscript/encoding.iso-8859-3.ps
index e65becf..59af8d0 100644
Binary files a/public_html/postscript/encoding.iso-8859-3.ps and b/public_html/postscript/encoding.iso-8859-3.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-4.ps b/public_html/postscript/encoding.iso-8859-4.ps
index d309604..7932fec 100644
Binary files a/public_html/postscript/encoding.iso-8859-4.ps and b/public_html/postscript/encoding.iso-8859-4.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-5.ps b/public_html/postscript/encoding.iso-8859-5.ps
index 837dfc8..64d4a12 100644
Binary files a/public_html/postscript/encoding.iso-8859-5.ps and b/public_html/postscript/encoding.iso-8859-5.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-7.ps b/public_html/postscript/encoding.iso-8859-7.ps
index 2e1eb82..83e990b 100644
Binary files a/public_html/postscript/encoding.iso-8859-7.ps and b/public_html/postscript/encoding.iso-8859-7.ps differ
diff --git a/public_html/postscript/encoding.iso-8859-9.ps b/public_html/postscript/encoding.iso-8859-9.ps
index 5ae27ec..5c29364 100644
Binary files a/public_html/postscript/encoding.iso-8859-9.ps and b/public_html/postscript/encoding.iso-8859-9.ps differ
diff --git a/public_html/postscript/encoding.koi8-r.ps b/public_html/postscript/encoding.koi8-r.ps
index 41a4364..7d516e5 100644
Binary files a/public_html/postscript/encoding.koi8-r.ps and b/public_html/postscript/encoding.koi8-r.ps differ
diff --git a/public_html/postscript/encoding.symbol.ps b/public_html/postscript/encoding.symbol.ps
index dc4b4aa..70b06ee 100644
Binary files a/public_html/postscript/encoding.symbol.ps and b/public_html/postscript/encoding.symbol.ps differ
diff --git a/public_html/postscript/encoding.windows-1250.ps b/public_html/postscript/encoding.windows-1250.ps
index 099dc0c..108d727 100644
Binary files a/public_html/postscript/encoding.windows-1250.ps and b/public_html/postscript/encoding.windows-1250.ps differ
diff --git a/public_html/postscript/encoding.windows-1251.ps b/public_html/postscript/encoding.windows-1251.ps
index 1baa187..b45ae60 100644
Binary files a/public_html/postscript/encoding.windows-1251.ps and b/public_html/postscript/encoding.windows-1251.ps differ
diff --git a/public_html/postscript/encoding.windows-1252.ps b/public_html/postscript/encoding.windows-1252.ps
index 8ba1c96..356fb1b 100644
Binary files a/public_html/postscript/encoding.windows-1252.ps and b/public_html/postscript/encoding.windows-1252.ps differ
diff --git a/public_html/postscript/fastps.header.ps b/public_html/postscript/fastps.header.ps
index 73d13ee..3865e29 100644
Binary files a/public_html/postscript/fastps.header.ps and b/public_html/postscript/fastps.header.ps differ
diff --git a/public_html/postscript/flow.block.ps b/public_html/postscript/flow.block.ps
index 727c3a2..97ca35c 100644
Binary files a/public_html/postscript/flow.block.ps and b/public_html/postscript/flow.block.ps differ
diff --git a/public_html/postscript/flow.box.ps b/public_html/postscript/flow.box.ps
index b5aff9a..f3f65c6 100644
Binary files a/public_html/postscript/flow.box.ps and b/public_html/postscript/flow.box.ps differ
diff --git a/public_html/postscript/flow.float.ps b/public_html/postscript/flow.float.ps
index e75ed16..58483d4 100644
Binary files a/public_html/postscript/flow.float.ps and b/public_html/postscript/flow.float.ps differ
diff --git a/public_html/postscript/flow.inline.block.ps b/public_html/postscript/flow.inline.block.ps
index 4bee604..e86f3e6 100644
Binary files a/public_html/postscript/flow.inline.block.ps and b/public_html/postscript/flow.inline.block.ps differ
diff --git a/public_html/postscript/flow.inline.ps b/public_html/postscript/flow.inline.ps
index aba80fb..43c9b6a 100644
Binary files a/public_html/postscript/flow.inline.ps and b/public_html/postscript/flow.inline.ps differ
diff --git a/public_html/postscript/flow.legend.ps b/public_html/postscript/flow.legend.ps
index 2dd17de..3910d23 100644
Binary files a/public_html/postscript/flow.legend.ps and b/public_html/postscript/flow.legend.ps differ
diff --git a/public_html/postscript/font.ps b/public_html/postscript/font.ps
index c5f7e09..bcf5e42 100644
Binary files a/public_html/postscript/font.ps and b/public_html/postscript/font.ps differ
diff --git a/public_html/postscript/footer.ps b/public_html/postscript/footer.ps
index d54f07b..be51b4a 100644
Binary files a/public_html/postscript/footer.ps and b/public_html/postscript/footer.ps differ
diff --git a/public_html/postscript/geometry.ps b/public_html/postscript/geometry.ps
index c129baa..96bfb58 100644
Binary files a/public_html/postscript/geometry.ps and b/public_html/postscript/geometry.ps differ
diff --git a/public_html/postscript/header.ps b/public_html/postscript/header.ps
index fa2f65f..295e42c 100644
Binary files a/public_html/postscript/header.ps and b/public_html/postscript/header.ps differ
diff --git a/public_html/postscript/height.ps b/public_html/postscript/height.ps
index b63aa92..d29b451 100644
Binary files a/public_html/postscript/height.ps and b/public_html/postscript/height.ps differ
diff --git a/public_html/postscript/image.ps b/public_html/postscript/image.ps
index b8fb62f..78fe74d 100644
Binary files a/public_html/postscript/image.ps and b/public_html/postscript/image.ps differ
diff --git a/public_html/postscript/init.ps b/public_html/postscript/init.ps
index 29997f7..5353946 100644
Binary files a/public_html/postscript/init.ps and b/public_html/postscript/init.ps differ
diff --git a/public_html/postscript/position.ps b/public_html/postscript/position.ps
index e5a36f1..25e7e96 100644
Binary files a/public_html/postscript/position.ps and b/public_html/postscript/position.ps differ
diff --git a/public_html/postscript/predicates.ps b/public_html/postscript/predicates.ps
index 6941b12..217cb9e 100644
Binary files a/public_html/postscript/predicates.ps and b/public_html/postscript/predicates.ps differ
diff --git a/public_html/postscript/table.ps b/public_html/postscript/table.ps
index e3528c1..cfc92d7 100644
Binary files a/public_html/postscript/table.ps and b/public_html/postscript/table.ps differ
diff --git a/public_html/postscript/table.row.ps b/public_html/postscript/table.row.ps
index 37d4494..fa1af85 100644
Binary files a/public_html/postscript/table.row.ps and b/public_html/postscript/table.row.ps differ
diff --git a/public_html/postscript/text-align.ps b/public_html/postscript/text-align.ps
index 2493c69..52fa651 100644
Binary files a/public_html/postscript/text-align.ps and b/public_html/postscript/text-align.ps differ
diff --git a/public_html/postscript/vertical-align.ps b/public_html/postscript/vertical-align.ps
index 4c17b32..6f0280a 100644
Binary files a/public_html/postscript/vertical-align.ps and b/public_html/postscript/vertical-align.ps differ
diff --git a/public_html/postscript/width.ps b/public_html/postscript/width.ps
index 2fc265a..d33fc4b 100644
Binary files a/public_html/postscript/width.ps and b/public_html/postscript/width.ps differ
diff --git a/public_html/ps.image.encoder.imagemagick.inc.php b/public_html/ps.image.encoder.imagemagick.inc.php
new file mode 100644
index 0000000..7a971de
--- /dev/null
+++ b/public_html/ps.image.encoder.imagemagick.inc.php
@@ -0,0 +1,305 @@
+last_image_id = 0;
+ }
+
+ // Generates new unique image identifier
+ //
+ // @return generated identifier
+ //
+ function generate_id() {
+ $this->last_image_id ++;
+ return $this->last_image_id;
+ }
+
+ // Encodes image, automatically detecting if this image is transparent or not
+ // and calling the appropriate function
+ //
+ // @param $psdata (in) PS date file wrapper
+ // @param $src_img (in) PHP image resource to be processed
+ // @param $size_x (out) actual horizontal size of image (pixels)
+ // @param $size_y (out) actual vertical size of image (pixels)
+ // @param $tcolor (out)
+ // @param $timage (out) name of postscript image data source
+ // @param $tmask (out) name of postscipt image mask data source
+ function auto($psdata, $src_img, &$size_x, &$size_y, &$tcolor, &$image, &$mask) {
+ if (imagecolortransparent($src_img) == -1) {
+ $id = $this->solid($psdata, $src_img, $size_x, $size_y, $image, $mask);
+ $tcolor = 0;
+ return $id;
+ } else {
+ $id = $this->transparent($psdata, $src_img, $size_x, $size_y, $image, $mask);
+ $tcolor = 1;
+ return $id;
+ }
+ }
+
+ // Encodes "solid" image without any transparent parts
+ //
+ // @param $psdata (in) Postscript file "writer" object
+ // @param $src_img (in) PHP image resource
+ // @param $size_x (out) size of image in pixels
+ // @param $size_y (out) size of image in pixels
+ // @returns identifier if encoded image to use in postscript file
+ //
+ function solid(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
+ // Generate an unique image id
+ $id = $this->generate_id();
+
+ // Generate the unique temporary file name for this image;
+ // we'll use it for imagemagick temporary files
+ $tempfile = $psdata->mk_filename();
+
+ // Save image as PNG for further processing
+ imagepng($src_img, $tempfile.'.png');
+
+ // Call image magick - convert to raw RGB samples (binary)
+ safe_exec('"'.IMAGE_MAGICK_CONVERT_EXECUTABLE.'"'." ${tempfile}.png ${tempfile}.rgb", $output);
+
+ // read raw rgb samples
+ $samples = file_get_contents($tempfile.'.rgb');
+
+ // Determine image size
+ $size_x = imagesx($src_img);
+ $size_y = imagesy($src_img);
+
+ // write stread header to the postscript file
+ $psdata->write("/image-{$id}-init { image-{$id}-data 0 setfileposition } def\n");
+ $psdata->write("/image-{$id}-data currentfile << /Filter /ASCIIHexDecode >> /ReusableStreamDecode filter\n");
+
+ // initialize line length counter
+ $ctr = 0;
+
+ for ($i = 0; $i < strlen($samples); $i += 3) {
+ // Save image pixel to the stream data
+ $r = ord($samples[$i]);
+ $g = ord($samples[$i+1]);
+ $b = ord($samples[$i+2]);
+ $psdata->write(sprintf("%02X%02X%02X\n",$r,$g,$b));
+
+ // Increate the line length counter; check if stream line needs to be terminated
+ $ctr += 6;
+ if ($ctr > MAX_LINE_LENGTH) {
+ $psdata->write("\n");
+ $ctr = 0;
+ }
+ }
+
+ // terminate the stream data
+ $psdata->write(">\ndef\n");
+
+ // return image and mask data references
+ $image = "image-{$id}-data";
+ $mask = "";
+
+ // Delete temporary files
+ unlink($tempfile.'.png');
+ unlink($tempfile.'.rgb');
+
+ return $id;
+ }
+
+ // Encodes image containing 100% transparent color (1-bit alpha channel)
+ //
+ // @param $psdata (in) Postscript file "writer" object
+ // @param $src_img (in) PHP image resource
+ // @param $size_x (out) size of image in pixels
+ // @param $size_y (out) size of image in pixels
+ // @returns identifier if encoded image to use in postscript file
+ //
+ function transparent($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
+ // Generate an unique image id
+ $id = $this->generate_id();
+
+ // Generate the unique temporary file name for this image;
+ // we'll use it for imagemagick temporary files
+ $tempfile = $psdata->mk_filename();
+
+ // Save image as PNG for further processing
+ imagepng($src_img, $tempfile.'.png');
+
+ // Call image magick - convert to raw RGBA samples (binary)
+ safe_exec('"'.IMAGE_MAGICK_CONVERT_EXECUTABLE.'"'." ${tempfile}.png ${tempfile}.rgba", $output);
+
+ // read raw RGBA samples
+ $samples = file_get_contents($tempfile.'.rgba');
+
+ // Determine image size and create a truecolor copy of this image
+ // (as we don't want to work with palette-based images manually)
+ $size_x = imagesx($src_img);
+ $size_y = imagesy($src_img);
+
+ // write stream header to the postscript file
+ $psdata->write("/image-{$id}-init { image-{$id}-data 0 setfileposition mask-{$id}-data 0 setfileposition } def\n");
+
+ // Create IMAGE data stream
+ $psdata->write("/image-{$id}-data currentfile << /Filter /ASCIIHexDecode >> /ReusableStreamDecode filter\n");
+
+ // initialize line length counter
+ $ctr = 0;
+
+ for ($i = 0; $i < strlen($samples); $i += 4) {
+ // Save image pixel to the stream data
+ $r = ord($samples[$i]);
+ $g = ord($samples[$i+1]);
+ $b = ord($samples[$i+2]);
+ $psdata->write(sprintf("%02X%02X%02X",$r,$g,$b));
+
+ // Increate the line length counter; check if stream line needs to be terminated
+ $ctr += 6;
+ if ($ctr > MAX_LINE_LENGTH) {
+ $psdata->write("\n");
+ $ctr = 0;
+ }
+ }
+
+ // terminate the stream data
+ $psdata->write(">\ndef\n");
+
+ // Create MASK data stream
+ $psdata->write("/mask-{$id}-data currentfile << /Filter /ASCIIHexDecode >> /ReusableStreamDecode filter\n");
+
+ // initialize line length counter
+ $ctr = 0;
+
+ // initialize mask bit counter
+ $bit_ctr = 0;
+ $mask_data = 0xff;
+
+ for ($y = 0; $y < $size_y; $y++) {
+ for ($x = 0; $x < $size_x; $x++) {
+ // Check if this pixel should be transparent
+ $a = ord($samples[($y*$size_x + $x)*4+3]);
+
+ if ($a < 255) {
+ $mask_data = ($mask_data << 1) | 0x1;
+ } else {
+ $mask_data = ($mask_data << 1);
+ }
+ $bit_ctr ++;
+
+ // If we've filled the whole byte, write it into the mask data stream
+ if ($bit_ctr >= 8 || $x + 1 == $size_x) {
+ // Pad mask data, in case we have completed the image row
+ while ($bit_ctr < 8) {
+ $mask_data = ($mask_data << 1) | 0x01;
+ $bit_ctr ++;
+ }
+
+ $psdata->write(sprintf("%02X", $mask_data & 0xff));
+
+ // Clear mask data after writing
+ $mask_data = 0xff;
+ $bit_ctr = 0;
+
+ // Increate the line length counter; check if stream line needs to be terminated
+ $ctr += 1;
+ if ($ctr > MAX_LINE_LENGTH) {
+ $psdata->write("\n");
+ $ctr = 0;
+ }
+ }
+ }
+ }
+
+ // terminate the stream data
+ // Write any incomplete mask byte to the mask data stream
+ if ($bit_ctr != 0) {
+ while ($bit_ctr < 8) {
+ $mask_data <<= 1;
+ $mask_data |= 1;
+ $bit_ctr ++;
+ }
+ $psdata->write(sprintf("%02X", $mask_data));
+ }
+ $psdata->write(">\ndef\n");
+
+ // return image and mask data references
+ $image = "image-{$id}-data";
+ $mask = "mask-{$id}-data";
+
+ // Delete temporary files
+ unlink($tempfile.'.png');
+ unlink($tempfile.'.rgba');
+
+ return $id;
+ }
+
+ function alpha($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
+ // Generate an unique image id
+ $id = $this->generate_id();
+
+ // Generate the unique temporary file name for this image;
+ // we'll use it for imagemagick temporary files
+ $tempfile = $psdata->mk_filename();
+
+ // Save image as PNG for further processing
+ imagepng($src_img, $tempfile.'.png');
+
+ // Call image magick - convert to raw RGB samples (binary)
+ safe_exec('"'.IMAGE_MAGICK_CONVERT_EXECUTABLE.'"'." ${tempfile}.png ${tempfile}.rgba", $output);
+
+ // read raw rgba samples
+ $samples = file_get_contents($tempfile.'.rgba');
+
+ // Determine image size
+ $size_x = imagesx($src_img);
+ $size_y = imagesy($src_img);
+
+ // write stread header to the postscript file
+ $psdata->write("/image-{$id}-init { image-{$id}-data 0 setfileposition } def\n");
+ $psdata->write("/image-{$id}-data currentfile << /Filter /ASCIIHexDecode >> /ReusableStreamDecode filter\n");
+
+ // initialize line length counter
+ $ctr = 0;
+
+ // Save visible background color
+ $handler =& get_css_handler('background-color');
+ $bg = $handler->get_visible_background_color();
+
+ for ($i = 0; $i < strlen($samples); $i += 4) {
+ // Save image pixel to the stream data
+ $r = ord($samples[$i]);
+ $g = ord($samples[$i+1]);
+ $b = ord($samples[$i+2]);
+ $a = 255-ord($samples[$i+3]);
+
+ // Calculate approximate color
+ $r = (int)($r + ($bg[0] - $r)*$a/255);
+ $g = (int)($g + ($bg[1] - $g)*$a/255);
+ $b = (int)($b + ($bg[2] - $b)*$a/255);
+
+ // Save image pixel to the stream data
+ $psdata->write(sprintf("%02X%02X%02X",
+ min(max($r,0),255),
+ min(max($g,0),255),
+ min(max($b,0),255)));
+
+ // Increate the line length counter; check if stream line needs to be terminated
+ $ctr += 6;
+ if ($ctr > MAX_LINE_LENGTH) {
+ $psdata->write("\n");
+ $ctr = 0;
+ }
+ }
+
+ // terminate the stream data
+ $psdata->write(">\ndef\n");
+
+ // return image and mask data references
+ $image = "image-{$id}-data";
+ $mask = "";
+
+ // Delete temporary files
+ unlink($tempfile.'.png');
+ unlink($tempfile.'.rgba');
+
+ return $id;
+ }
+
+}
+?>
\ No newline at end of file
diff --git a/public_html/ps.image.encoder.simple.inc.php b/public_html/ps.image.encoder.simple.inc.php
index 3b3d8b4..9ab7028 100644
--- a/public_html/ps.image.encoder.simple.inc.php
+++ b/public_html/ps.image.encoder.simple.inc.php
@@ -7,32 +7,22 @@
* another encoder.
* @author Konstantin Bournayev
* @version 1.0
- * @updated 24-ÿíâ-2006 21:18:30
+ * @updated 24-���-2006 21:18:30
*/
class PSImageEncoderSimple extends PSImageEncoderStream {
- function PSImageEncoderSimple() {
+ function __construct() {
}
function auto($psdata, $src_img, &$size_x, &$size_y, &$tcolor, &$image, &$mask) {
if (imagecolortransparent($src_img) == -1) {
- $id = $this->solid($psdata,
- $src_img->get_handle(),
- $size_x,
- $size_y,
- $image->get_handle(),
- $mask);
+ $id = $this->solid($psdata, $src_img, $size_x, $size_y, $image, $mask);
$tcolor = 0;
return $id;
} else {
- $id = $this->transparent($psdata,
- $src_img->get_handle(),
- $size_x,
- $size_y,
- $image->get_handle(),
- $mask);
+ $id = $this->transparent($psdata, $src_img, $size_x, $size_y, $image, $mask);
$tcolor = 1;
return $id;
- };
+ }
}
function solid($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
@@ -64,13 +54,13 @@ function solid($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$ps_image_data = "";
$ctr = 1; $row += 1;
- };
- };
- };
+ }
+ }
+ }
if ($ps_image_data) {
$psdata->write("/row-{$id}-{$row} { /image-{$id}-data { row-{$id}-1 } def ({$ps_image_data}) } def\n");
- };
+ }
$psdata->write("/image-{$id}-data { row-{$id}-1 } def\n");
$psdata->write("/image-{$id}-init { } def\n");
@@ -96,7 +86,7 @@ function transparent($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$ps_mask_data = 0xff;
$ctr = 1; $row = 1;
- $handler =& CSS::get_handler(CSS_BACKGROUND_COLOR);
+ $handler =& (new CSS())->get_handler(CSS_BACKGROUND_COLOR);
$background_color = $handler->get_visible_background_color();
for ($y = 0; $y < $size_y; $y++) {
@@ -117,7 +107,7 @@ function transparent($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$b = $background_color[2];
} else {
$ps_mask_data = ($ps_mask_data << 1) | 0;
- };
+ }
$ps_image_data .= sprintf("\\%03o\\%03o\\%03o",$r,$g,$b);
@@ -128,7 +118,7 @@ function transparent($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$ps_mask_data <<= 1;
$ps_mask_data |= 1;
$ctr ++;
- };
+ }
$ps_mask_data_str = sprintf("\\%03o",$ps_mask_data & 0xff);
@@ -140,21 +130,21 @@ function transparent($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$ps_image_data = "";
$ps_mask_data = 0xff;
$ctr = 1; $row += 1;
- };
- };
- };
+ }
+ }
+ }
if ($ps_image_data) {
while ($ctr <= 8) {
$ps_mask_data <<= 1;
$ps_mask_data |= 1;
$ctr ++;
- };
+ }
$ps_mask_data_str = sprintf("\\%03o",$ps_mask_data & 0xFF);
$psdata->write("/row-{$id}-{$row} { /image-{$id}-data { row-{$id}-{$row_next} } def ({$ps_image_data}) } def\n");
$psdata->write("/mrow-{$id}-{$row} { /mask-{$id}-data { mrow-{$id}-{$row_next} } def ({$ps_mask_data_str}) } def\n");
- };
+ }
$psdata->write("/image-{$id}-data { row-{$id}-1 } def\n");
$psdata->write("/mask-{$id}-data { mrow-{$id}-1 } def\n");
@@ -187,7 +177,7 @@ function alpha($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$g = $colors['green'];
$b = $colors['blue'];
- $handler =& CSS::get_handler(CSS_BACKGROUND_COLOR);
+ $handler =& (new CSS())->get_handler(CSS_BACKGROUND_COLOR);
$bg = $handler->get_visible_background_color();
$r = (int)($r + ($bg[0] - $r)*$a/127);
$g = (int)($g + ($bg[1] - $g)*$a/127);
@@ -204,13 +194,13 @@ function alpha($psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$ps_image_data = "";
$ctr = 1; $row += 1;
- };
- };
- };
+ }
+ }
+ }
if ($ps_image_data) {
$psdata->write("/row-{$id}-{$row} { /image-{$id}-data { row-{$id}-{$row_next} } def ({$ps_image_data}) } def\n");
- };
+ }
$psdata->write("/image-{$id}-data { row-{$id}-1 } def\n");
$psdata->write("/image-{$id}-init { } def\n");
diff --git a/public_html/ps.l2.image.encoder.stream.inc.php b/public_html/ps.l2.image.encoder.stream.inc.php
index 6e3649f..63ec53f 100644
--- a/public_html/ps.l2.image.encoder.stream.inc.php
+++ b/public_html/ps.l2.image.encoder.stream.inc.php
@@ -6,11 +6,11 @@ class PSL2ImageEncoderStream extends PSImageEncoderStream {
function by_lines($image, &$size_x, &$size_y) {
$lines = array();
- $size_x = imagesx($image->get_handle());
- $size_y = imagesy($image->get_handle());
+ $size_x = imagesx($image);
+ $size_y = imagesy($image);
$dest_img = imagecreatetruecolor($size_x, $size_y);
- imagecopymerge($dest_img, $image->get_handle(), 0, 0, 0, 0, $size_x, $size_y, 100);
+ imagecopymerge($dest_img, $image, 0, 0, 0, 0, $size_x, $size_y, 100);
// initialize line length counter
$ctr = 0;
@@ -32,10 +32,10 @@ function by_lines($image, &$size_x, &$size_y) {
$line .= "\n";
$ctr = 0;
}
- };
+ }
$lines[] = $line;
- };
+ }
return $lines;
}
diff --git a/public_html/ps.l3.image.encoder.stream.inc.php b/public_html/ps.l3.image.encoder.stream.inc.php
index 814e94a..1b9b751 100644
--- a/public_html/ps.l3.image.encoder.stream.inc.php
+++ b/public_html/ps.l3.image.encoder.stream.inc.php
@@ -3,21 +3,21 @@
require_once(HTML2PS_DIR.'ps.image.encoder.stream.inc.php');
class PSL3ImageEncoderStream extends PSImageEncoderStream {
- function PSL3ImageEncoderStream() {
+ function __construct() {
$this->last_image_id = 0;
}
function auto(&$psdata, $src_img, &$size_x, &$size_y, &$tcolor, &$image, &$mask) {
- if (imagecolortransparent($src_img->get_handle()) == -1) {
- $id = $this->solid($psdata, $src_img->get_handle(), $size_x, $size_y, $image->get_handle(), $mask);
+ if (imagecolortransparent($src_img) == -1) {
+ $id = $this->solid($psdata, $src_img, $size_x, $size_y, $image, $mask);
$tcolor = 0;
return $id;
} else {
- $id = $this->transparent($psdata, $src_img->get_handle(), $size_x, $size_y, $image->get_handle(), $mask);
+ $id = $this->transparent($psdata, $src_img, $size_x, $size_y, $image, $mask);
$tcolor = 1;
return $id;
- };
+ }
}
// Encodes "solid" image without any transparent parts
@@ -61,8 +61,8 @@ function solid(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$psdata->write("\n");
$ctr = 0;
}
- };
- };
+ }
+ }
// terminate the stream data
$psdata->write(">\ndef\n");
@@ -121,8 +121,8 @@ function transparent(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$psdata->write("\n");
$ctr = 0;
}
- };
- };
+ }
+ }
// terminate the stream data
$psdata->write(">\ndef\n");
@@ -144,7 +144,7 @@ function transparent(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$mask_data = ($mask_data << 1) | 0x1;
} else {
$mask_data = ($mask_data << 1);
- };
+ }
$bit_ctr ++;
// If we've filled the whole byte, write it into the mask data stream
@@ -153,7 +153,7 @@ function transparent(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
while ($bit_ctr < 8) {
$mask_data = ($mask_data << 1) | 0x01;
$bit_ctr ++;
- };
+ }
$psdata->write(sprintf("%02X", $mask_data & 0xff));
@@ -167,9 +167,9 @@ function transparent(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$psdata->write("\n");
$ctr = 0;
}
- };
- };
- };
+ }
+ }
+ }
// terminate the stream data
// Write any incomplete mask byte to the mask data stream
@@ -180,7 +180,7 @@ function transparent(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$bit_ctr ++;
}
$psdata->write(sprintf("%02X", $mask_data));
- };
+ }
$psdata->write(">\ndef\n");
// return image and mask data references
@@ -206,7 +206,7 @@ function alpha(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$ctr = 0;
// Save visible background color
- $handler =& CSS::get_handler(CSS_BACKGROUND_COLOR);
+ $handler =& (new CSS())->get_handler(CSS_BACKGROUND_COLOR);
$bg = $handler->get_visible_background_color();
for ($y = 0; $y < $size_y; $y++) {
@@ -233,8 +233,8 @@ function alpha(&$psdata, $src_img, &$size_x, &$size_y, &$image, &$mask) {
$psdata->write("\n");
$ctr = 0;
}
- };
- };
+ }
+ }
// terminate the stream data
$psdata->write(">\ndef\n");
diff --git a/public_html/ps.text.inc.php b/public_html/ps.text.inc.php
new file mode 100644
index 0000000..549b8f0
--- /dev/null
+++ b/public_html/ps.text.inc.php
@@ -0,0 +1,42 @@
+ $code) {
+ if (ord($code)>=32 && ord($code)<128) {
+ $g_utf8_to_encodings_mapping[$utf][$encoding] = $code;
+ } else {
+ $g_utf8_to_encodings_mapping[$utf][$encoding] = sprintf("\\%03o",ord($code));
+ }
+ }
+}
+
+// FIXME: just a workaround for now; these arrays should be joined
+$g_utf8_to_encodings_mapping_pdf = array();
+foreach (array_keys($g_utf8_converters) as $encoding) {
+ $flipped = array_flip($g_utf8_converters[$encoding][0]);
+ foreach ($flipped as $utf => $code) {
+ $g_utf8_to_encodings_mapping_pdf[$utf][$encoding] = $code;
+ }
+}
+
+function quote_ps($psdata) {
+ $str = str_replace("\\", "\\\\", $psdata);
+ $str = str_replace(array("(",")","%"), array("\\(","\\)","\\%"), $str);
+
+ // Replace characters having 8-bit set with their octal representation
+ for ($i=0; $i 127) {
+ $str = substr_replace($str, sprintf("\\%o", ord($str[$i])), $i, 1);
+ $i += 3;
+ }
+ }
+
+ return $str;
+}
+
+?>
\ No newline at end of file
diff --git a/public_html/ps.unicode.inc.php b/public_html/ps.unicode.inc.php
index 6499eb2..d09645a 100644
--- a/public_html/ps.unicode.inc.php
+++ b/public_html/ps.unicode.inc.php
@@ -8,11 +8,11 @@
// foreach ($g_utf8_converters as $key => $value) {
// if ($value[1] == $psname) {
// return $value[0];
-// };
-// };
+// }
+// }
// return 0;
-// };
+// }
$GLOBALS['g_encoding_aliases'] = array(
'us-ascii' => 'iso-8859-1',
@@ -42,6 +42,6 @@
'windows-1251' => array($GLOBALS['g_windows_1251'],"Windows-1251-Encoding"),
'windows-1252' => array($GLOBALS['g_windows_1252'],"Windows-1252-Encoding"),
'symbol' => array($GLOBALS['g_symbol'],"Symbol-Encoding"),
- 'dingbats' => array($GLOBALS['g_dingbats'],"Dingbats-Encoding")
+ 'dingbats' => array($GLOBALS['g_dingbats'],"Dingbats-Encoding"),
);
?>
\ No newline at end of file
diff --git a/public_html/render.queue.class.php b/public_html/render.queue.class.php
index 1ccfcf6..b4ff98a 100644
--- a/public_html/render.queue.class.php
+++ b/public_html/render.queue.class.php
@@ -3,7 +3,7 @@
class RenderQueue {
var $_root_context;
- function RenderQueue() {
+ function __construct() {
$this->set_root_context(null);
}
diff --git a/public_html/render.stacking.context.class.php b/public_html/render.stacking.context.class.php
index 8f099df..dd802ed 100644
--- a/public_html/render.stacking.context.class.php
+++ b/public_html/render.stacking.context.class.php
@@ -3,16 +3,16 @@
class RenderStackingContext {
var $_stacking_levels;
- function RenderStackingContext() {
+ function __construct() {
$this->set_stacking_levels(array());
- $level =& new StackingLevel('in-flow-non-inline');
+ $level= new StackingLevel('in-flow-non-inline');
$this->add_stacking_level($level);
- $level =& new StackingLevel('in-flow-floats');
+ $level= new StackingLevel('in-flow-floats');
$this->add_stacking_level($level);
- $level =& new StackingLevel('in-flow-inline');
+ $level= new StackingLevel('in-flow-inline');
$this->add_stacking_level($level);
}
diff --git a/public_html/render.stacking.level.class.php b/public_html/render.stacking.level.class.php
index 0669ace..ff8a103 100644
--- a/public_html/render.stacking.level.class.php
+++ b/public_html/render.stacking.level.class.php
@@ -3,7 +3,7 @@
class RenderStackingLevel {
var $_boxes;
- function RenderStackingLevel() {
+ function __construct() {
$this->set_boxes(array());
}
diff --git a/public_html/sample.batch.php b/public_html/sample.batch.php
new file mode 100644
index 0000000..fc095c3
--- /dev/null
+++ b/public_html/sample.batch.php
@@ -0,0 +1,159 @@
+ 'screen',
+ 'renderimages' => true,
+ 'renderforms' => true,
+ 'renderlinks' => true,
+ 'mode' => 'html',
+ 'debugbox' => false,
+ 'draw_page_border' => false
+ );
+
+$media = (new Media())->predefined('A4');
+$media->set_landscape(false);
+$media->set_margins(array('left' => 10,
+ 'right' => 10,
+ 'top' => 10,
+ 'bottom' => 10));
+$media->set_pixels(1024);
+
+$g_px_scale = mm2pt($media->width() - $media->margins['left'] - $media->margins['right']) / $media->pixels;
+$g_pt_scale = $g_px_scale * 1.43;
+
+$pipeline = new Pipeline;
+$pipeline->fetchers[] = new FetcherURL;
+$pipeline->data_filters[] = new DataFilterDoctype();
+$pipeline->data_filters[] = new DataFilterUTF8("");
+$pipeline->data_filters[] = new DataFilterHTML2XHTML;
+$pipeline->parser = new ParserXHTML;
+$pipeline->pre_tree_filters = array();
+$pipeline->layout_engine = new LayoutEngineDefault;
+$pipeline->post_tree_filters = array();
+$pipeline->output_driver = new OutputDriverFPDF();
+
+$time = time();
+foreach ($urls as $url) {
+ $pipeline->destination = new DestinationFile($url);
+ $pipeline->process($url, $media);
+
+ $message = sprintf("TEST
-
-
-
-
-
-
HEADER: In all pages
-
HEADER: In all pages but first
-
HEADER: Only in first page
-
-
-
-A long seguence of <br> to get more than one page
-
-
+
+
+
+TEST
+
+
+
+
+
+
HEADER: In all pages
+
HEADER: In all pages but first
+
HEADER: Only in first page
+
+
+
+A long seguence of <br> to get more than one page
+
+
\ No newline at end of file
diff --git a/public_html/samples/sample.batch.php b/public_html/samples/sample.batch.php
index 581de51..3f9596e 100644
--- a/public_html/samples/sample.batch.php
+++ b/public_html/samples/sample.batch.php
@@ -1,12 +1,17 @@
'screen',
@@ -116,51 +119,41 @@
'debugbox' => false,
'draw_page_border' => false
);
-require_once(dirname(__FILE__).'/../config.inc.php');
-require_once(HTML2PS_DIR.'pipeline.class.php');
-require_once(HTML2PS_DIR.'fetcher.url.class.php');
-parse_config_file(HTML2PS_DIR.'html2ps.config');
-
-$g_config = array(
- 'cssmedia' => 'screen',
- 'renderimages' => true,
- 'renderforms' => false,
- 'renderlinks' => true,
- 'mode' => 'html',
- 'debugbox' => false,
- 'draw_page_border' => false
- );
-$media = Media::predefined('A4');
+$media = (new Media())->predefined('A4');
$media->set_landscape(false);
-$media->set_margins(array('left' => 0,
- 'right' => 0,
- 'top' => 0,
- 'bottom' => 0));
+$media->set_margins(array('left' => 10,
+ 'right' => 10,
+ 'top' => 10,
+ 'bottom' => 10));
$media->set_pixels(1024);
$g_px_scale = mm2pt($media->width() - $media->margins['left'] - $media->margins['right']) / $media->pixels;
$g_pt_scale = $g_px_scale * 1.43;
+$pipeline = new Pipeline;
+$pipeline->fetchers[] = new FetcherURL;
+$pipeline->data_filters[] = new DataFilterDoctype();
+$pipeline->data_filters[] = new DataFilterUTF8("");
+$pipeline->data_filters[] = new DataFilterHTML2XHTML;
+$pipeline->parser = new ParserXHTML;
+$pipeline->pre_tree_filters = array();
+$pipeline->layout_engine = new LayoutEngineDefault;
+$pipeline->post_tree_filters = array();
+$pipeline->output_driver = new OutputDriverFPDF();
-foreach($urls as $url) {
- $url_file = str_replace('http://' ,'', $url);
- $url_file = str_replace(':', '_', $url_file);
- $url_file = str_replace('/', '_', $url_file);
- $url_file = str_replace('.', '_', $url_file);
+$time = time();
+foreach ($urls as $url) {
+ $pipeline->destination = new DestinationFile($url);
+ $pipeline->process($url, $media);
- $pipeline = new Pipeline;
- $pipeline->configure($g_config);
- $pipeline->fetchers[] = new FetcherURL;
- $pipeline->data_filters[] = new DataFilterHTML2XHTML;
- $pipeline->parser = new ParserXHTML;
- $pipeline->layout_engine = new LayoutEngineDefault;
- $pipeline->output_driver = new OutputDriverFPDF($media);
- $pipeline->destination = new DestinationFile($url_file);
+ $message = sprintf("column, $colspan->size, $spanned_widths);
- };
-
- return $widths;
- }
-
/**
* Fit table columns to the given width
*/
- function table_columns_fit(&$table, $width, &$context) {
+ function table_columns_fit($table, $width, &$context) {
$minw = $table->get_table_columns_min_widths($context);
$maxw = $table->get_table_columns_max_widths($context);
- $minw = $this->use_colspans($table, $minw, $context, 'get_min_width', $minw, $maxw);
- $maxw = $this->use_colspans($table, $maxw, $context, 'get_max_width', $minw, $maxw);
-
// Store number of columns
- $columns = count($minw);
+ $columns = is_countable($minw) ? count($minw) : 0;
// Apply column width constraints
$minwc = array();
$maxwc = array();
- $cellpadding = $table->get_css_property(CSS_HTML2PS_CELLPADDING);
- $cellspacing = $table->get_css_property(CSS_HTML2PS_CELLSPACING);
+ $cellpadding = $table->getCSSProperty(CSS_HTML2PS_CELLPADDING);
+ $cellspacing = $table->getCSSProperty(CSS_HTML2PS_CELLSPACING);
for ($i=0; $iget_cwc($i);
@@ -94,7 +38,7 @@ function table_columns_fit(&$table, $width, &$context) {
$minwc[$i] = max($minw[$i], $cwc->apply($minw[$i]-$extra, $table_width) + $extra);
$maxwc[$i] = max($minw[$i], $cwc->apply($maxw[$i]-$extra, $table_width) + $extra);
- };
+ }
$minwc = $table->normalize_min_widths($width, $minw, $minwc);
$minwc = $table->_table_apply_colspans($minwc, $context, 'get_min_width', $minwc, $maxwc);
@@ -177,13 +121,13 @@ function table_columns_fit(&$table, $width, &$context) {
if (!isset($widths[$j])) {
$sum_max_cw += max($maxw[$j], $maxwc[$j]);
$sum_min_cw += max($minw[$j], $minwc[$j]);
- };
- };
+ }
+ }
// If some unplaced columns have maximal (constrained width) greater zero
if ($sum_max_cw > 0) {
$current_max = min($current_max * $rest / $sum_max_cw, $rest - $sum_min_cw + max($minwc[$i], $minw[$i]));
- };
+ }
// Check for minimal width (either unconstrained or constrained) of current column
$current_max = max($current_max, $minw[$i] == 0 ? $minwc[$i] : $minw[$i]);
@@ -197,8 +141,8 @@ function table_columns_fit(&$table, $width, &$context) {
if (array_sum($widths) < EPSILON) {
for ($i=0; $iget_css_property(CSS_WIDTH);
+ $wc = $table->getCSSProperty(CSS_WIDTH);
if (!$wc->isNull()) {
if (array_sum($widths) < $width) {
// Let's make zero-width columns
// non-zero width (so that they columd be expanded) and re-try expanding columns
//
for ($i=0; $iget_non_constrained_width_flags();
@@ -226,19 +170,19 @@ function table_columns_fit(&$table, $width, &$context) {
if (!any_flag_set($flags)) {
$flags = $table->get_non_image_constrained_width_flags();
if (!any_flag_set($flags)) {
- for ($i=0; $iput_full_width(array_sum($widths));
diff --git a/public_html/strategy.table.layout.fixed.php b/public_html/strategy.table.layout.fixed.php
index 9492a36..b052d0e 100644
--- a/public_html/strategy.table.layout.fixed.php
+++ b/public_html/strategy.table.layout.fixed.php
@@ -1,7 +1,7 @@
cols_count(); $i < $size; $i++) {
$cwc =& $table->get_cwc($i);
$widths[] = $cwc->apply(0, $table->parent->get_width());
- };
+ }
return $widths;
}
}
diff --git a/public_html/strategy.width.absolute.positioned.php b/public_html/strategy.width.absolute.positioned.php
index 2e470b4..b1f7168 100644
--- a/public_html/strategy.width.absolute.positioned.php
+++ b/public_html/strategy.width.absolute.positioned.php
@@ -1,7 +1,7 @@
_get_containing_block();
$containing_block_width = $containing_block['right'] - $containing_block['left'];
- $right =& $box->get_css_property(CSS_RIGHT);
- $left =& $box->get_css_property(CSS_LEFT);
- $wc =& $box->get_css_property(CSS_WIDTH);
+ $right =& $box->getCSSProperty(CSS_RIGHT);
+ $left =& $box->getCSSProperty(CSS_LEFT);
+ $wc =& $box->getCSSProperty(CSS_WIDTH);
// For the purposes of this section and the next, the term "static
// position" (of an element) refers, roughly, to the position an
@@ -81,8 +81,8 @@ function apply(&$box, &$context) {
// apply rule number one below.
if ($left->isAuto() && $right->isAuto() && $wc->isNull()) {
// @todo: support 'direction' property for the containing block
- $box->setCSSProperty(CSS_LEFT, ValueLeft::fromString('0'));
- };
+ $box->setCSSProperty(CSS_LEFT, (new ValueLeft())->fromString('0'));
+ }
// If none of the three is 'auto': If both 'margin-left' and
// 'margin-right' are 'auto', solve the equation under the extra
@@ -100,7 +100,7 @@ function apply(&$box, &$context) {
// @todo: implement
$box->put_width($wc->apply($box->get_width(),
$containing_block_width));
- };
+ }
// Otherwise, set 'auto' values for 'margin-left' and
// 'margin-right' to 0, and pick the one of the following six
@@ -110,7 +110,7 @@ function apply(&$box, &$context) {
// 'auto', then the width is shrink-to-fit. Then solve for 'left')
if ($left->isAuto() && !$right->isAuto() && $wc->isNull()) {
$box->put_width($shrink_to_fit_width);
- };
+ }
// Case 2 ('left' and 'right' are 'auto' and 'width' is not
// 'auto', then if the 'direction' property of the containing
@@ -121,21 +121,21 @@ function apply(&$box, &$context) {
// @todo: implement 'direction' support
$box->put_width($wc->apply($box->get_width(),
$containing_block_width));
- };
+ }
// Case 3 ('width' and 'right' are 'auto' and 'left' is not
// 'auto', then the width is shrink-to-fit . Then solve for
// 'right')
if (!$left->isAuto() && $right->isAuto() && $wc->isNull()) {
$box->put_width($shrink_to_fit_width);
- };
+ }
// Case 4 ('left' is 'auto', 'width' and 'right' are not 'auto',
// then solve for 'left')
if ($left->isAuto() && !$right->isAuto() && !$wc->isNull()) {
$box->put_width($wc->apply($box->get_width(),
$containing_block_width));
- };
+ }
// Case 5 ('width' is 'auto', 'left' and 'right' are not 'auto',
// then solve for 'width')
@@ -143,14 +143,14 @@ function apply(&$box, &$context) {
$box->put_width($containing_block_width -
$left->getPoints($containing_block_width) -
$right->getPoints($containing_block_width));
- };
+ }
// Case 6 ('right' is 'auto', 'left' and 'width' are not 'auto',
// then solve for 'right')
if (!$left->isAuto() && $right->isAuto() && !$wc->isNull()) {
$box->put_width($wc->apply($box->get_width(),
$containing_block_width));
- };
+ }
/**
* After this we should remove width constraints or we may encounter problem
diff --git a/public_html/strategy.width.max.natural.php b/public_html/strategy.width.max.natural.php
index 3be6935..4b18092 100644
--- a/public_html/strategy.width.max.natural.php
+++ b/public_html/strategy.width.max.natural.php
@@ -5,14 +5,14 @@ class StrategyWidthMaxNatural {
var $_maxw;
var $_cmaxw;
- function StrategyWidthMaxNatural($limit = 10E6) {
+ function __construct($limit = 10E6) {
$this->_limit = $limit;
}
function add_width($delta) {
if ($this->_cmaxw + $delta > $this->_limit) {
$this->line_break();
- };
+ }
$this->_cmaxw += $delta;
}
@@ -25,7 +25,7 @@ function apply(&$box, &$context) {
$this->_maxw = 0;
// We need to add text indent to the max width
- $text_indent = $box->get_css_property(CSS_TEXT_INDENT);
+ $text_indent = $box->getCSSProperty(CSS_TEXT_INDENT);
$this->_cmaxw = $text_indent->calculate($box);
for ($i=0, $size = count($box->content); $i<$size; $i++) {
@@ -40,14 +40,14 @@ function apply(&$box, &$context) {
if (is_inline($child)) {
$this->add_width($child->get_max_width_natural($context, $this->_limit));
- } elseif ($child->get_css_property(CSS_FLOAT) !== FLOAT_NONE) {
- $wc = $child->get_css_property(CSS_WIDTH);
+ } elseif ($child->getCSSProperty(CSS_FLOAT) !== FLOAT_NONE) {
+ $wc = $child->getCSSProperty(CSS_WIDTH);
if (!$wc->isFraction()) {
$delta = $child->get_max_width($context, $this->_limit);
} else {
$delta = $child->get_max_width_natural($context, $this->_limit);
- };
+ }
$this->add_width($delta);
} else {
@@ -56,7 +56,7 @@ function apply(&$box, &$context) {
// Process special case with percentage constrained table
$item = $child;
- $item_wc = $item->get_css_property(CSS_WIDTH);
+ $item_wc = $item->getCSSProperty(CSS_WIDTH);
if (is_a($item, "TableBox") &&
$item_wc->isFraction()) {
@@ -68,12 +68,12 @@ function apply(&$box, &$context) {
$this->_cmaxw = max($this->_cmaxw,
$item_wc->apply($child->get_width(),
$child->get_width()));
- };
- };
+ }
+ }
$this->line_break();
- };
- };
+ }
+ }
}
// Check if last line have maximal width
diff --git a/public_html/strategy.width.max.php b/public_html/strategy.width.max.php
index d403bed..42140f7 100644
--- a/public_html/strategy.width.max.php
+++ b/public_html/strategy.width.max.php
@@ -5,14 +5,14 @@ class StrategyWidthMax {
var $_maxw;
var $_cmaxw;
- function StrategyWidthMax($limit = 10E6) {
+ function __construct($limit = 10E6) {
$this->_limit = $limit;
}
function add_width($delta) {
if ($this->_cmaxw + $delta > $this->_limit) {
$this->line_break();
- };
+ }
$this->_cmaxw += $delta;
}
@@ -25,7 +25,7 @@ function apply(&$box, &$context) {
$this->_maxw = 0;
// We need to add text indent to the max width
- $text_indent = $box->get_css_property(CSS_TEXT_INDENT);
+ $text_indent = $box->getCSSProperty(CSS_TEXT_INDENT);
$this->_cmaxw = $text_indent->calculate($box);
for ($i=0, $size = count($box->content); $i<$size; $i++) {
@@ -36,24 +36,24 @@ function apply(&$box, &$context) {
} elseif (!$child->out_of_flow()) {
if (is_inline($child) ||
- $child->get_css_property(CSS_FLOAT) !== FLOAT_NONE) {
+ $child->getCSSProperty(CSS_FLOAT) !== FLOAT_NONE) {
$this->add_width($child->get_max_width($context, $this->_limit));
} else {
$this->line_break();
$this->add_width($child->get_max_width($context, $this->_limit));
// Process special case with percentage constrained table
- $item_wc = $child->get_css_property(CSS_WIDTH);
+ $item_wc = $child->getCSSProperty(CSS_WIDTH);
if (is_a($child, "TableBox") &&
is_a($item_wc, "WCFraction")) {
$this->_cmaxw = max($this->_cmaxw,
$item_wc->apply($box->get_width(),
$box->parent->get_expandable_width()));
- };
+ }
$this->line_break();
- };
- };
+ }
+ }
}
// Check if last line have maximal width
@@ -63,14 +63,14 @@ function apply(&$box, &$context) {
// Note that max width cannot differ from constrained width,
// if any width constraints apply
//
- $wc = $box->get_css_property(CSS_WIDTH);
+ $wc = $box->getCSSProperty(CSS_WIDTH);
if ($wc->applicable($box)) {
if ($box->parent) {
$this->_maxw = $wc->apply($this->_maxw, $box->parent->get_width());
} else {
$this->_maxw = $wc->apply($this->_maxw, $this->_maxw);
- };
- };
+ }
+ }
return $this->_maxw + $box->_get_hor_extra();
}
diff --git a/public_html/strategy.width.min.nowrap.php b/public_html/strategy.width.min.nowrap.php
index 0e96a6c..c704b13 100644
--- a/public_html/strategy.width.min.nowrap.php
+++ b/public_html/strategy.width.min.nowrap.php
@@ -4,7 +4,7 @@ class StrategyWidthMinNowrap {
var $_maxw;
var $_cmaxw;
- function StrategyWidthMinNowrap() {
+ function __construct() {
}
function add_width($delta) {
@@ -20,7 +20,7 @@ function apply(&$box, &$context) {
$this->_maxw = 0;
// We need to add text indent to the width
- $ti = $box->get_css_property(CSS_TEXT_INDENT);
+ $ti = $box->getCSSProperty(CSS_TEXT_INDENT);
$this->add_width($ti->calculate($box));
for ($i=0, $size = count($box->content); $i<$size; $i++) {
@@ -37,14 +37,14 @@ function apply(&$box, &$context) {
$this->add_width($child->get_min_width($context));
$this->line_break();
}
- };
+ }
}
// Check if last line have maximal width
$this->line_break();
// Apply width constraint to min width. Return maximal value
- $wc = $box->get_css_property(CSS_WIDTH);
+ $wc = $box->getCSSProperty(CSS_WIDTH);
return max($this->_maxw, $wc->apply($this->_maxw, $box->parent->get_width())) + $box->_get_hor_extra();
}
}
diff --git a/public_html/strategy.width.min.php b/public_html/strategy.width.min.php
index 97994b7..818af80 100644
--- a/public_html/strategy.width.min.php
+++ b/public_html/strategy.width.min.php
@@ -4,7 +4,7 @@ class StrategyWidthMin {
var $_maxw;
var $_cmaxw;
- function StrategyWidthMin() {
+ function __construct() {
}
function add_width($delta) {
@@ -26,13 +26,13 @@ function apply(&$box, &$context) {
if ($content_size == 0) {
$min_width = $box->_get_hor_extra();
return $min_width;
- };
+ }
/**
* If we're in 'nowrap' mode, minimal and maximal width will be equal
*/
- $white_space = $box->get_css_property(CSS_WHITE_SPACE);
- $pseudo_nowrap = $box->get_css_property(CSS_HTML2PS_NOWRAP);
+ $white_space = $box->getCSSProperty(CSS_WHITE_SPACE);
+ $pseudo_nowrap = $box->getCSSProperty(CSS_HTML2PS_NOWRAP);
if ($white_space == WHITESPACE_NOWRAP ||
$pseudo_nowrap == NOWRAP_NOWRAP) {
$min_width = $box->get_min_nowrap_width($context);
@@ -46,28 +46,28 @@ function apply(&$box, &$context) {
while ($start_index < $content_size &&
$box->content[$start_index]->out_of_flow()) {
$start_index++;
- };
+ }
if ($start_index < $content_size) {
- $ti = $box->get_css_property(CSS_TEXT_INDENT);
+ $ti = $box->getCSSProperty(CSS_TEXT_INDENT);
$minw =
$ti->calculate($box) +
$box->content[$start_index]->get_min_width($context);
} else {
$minw = 0;
- };
+ }
for ($i=$start_index; $i<$content_size; $i++) {
$item =& $box->content[$i];
if (!$item->out_of_flow()) {
$minw = max($minw, $item->get_min_width($context));
- };
- };
+ }
+ }
/**
* Apply width constraint to min width. Return maximal value
*/
- $wc = $box->get_css_property(CSS_WIDTH);
+ $wc = $box->getCSSProperty(CSS_WIDTH);
$containing_block = $box->_get_containing_block();
$min_width = max($minw,
diff --git a/public_html/stubs.file_get_contents.inc.php b/public_html/stubs.file_get_contents.inc.php
index e0b88e3..65adbcd 100644
--- a/public_html/stubs.file_get_contents.inc.php
+++ b/public_html/stubs.file_get_contents.inc.php
@@ -7,6 +7,6 @@ function file_get_contents($file) {
return implode('',$lines);
} else {
return "";
- };
+ }
}
?>
\ No newline at end of file
diff --git a/public_html/system.php b/public_html/system.php
new file mode 100644
index 0000000..e1c0829
--- /dev/null
+++ b/public_html/system.php
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/public_html/systemcheck.php b/public_html/systemcheck.php
new file mode 100644
index 0000000..c3ff195
--- /dev/null
+++ b/public_html/systemcheck.php
@@ -0,0 +1,29 @@
+check_cache_dir();
+}
+?>
\ No newline at end of file
diff --git a/public_html/tag.frame.inc.php b/public_html/tag.frame.inc.php
index f25801a..5741f2a 100644
--- a/public_html/tag.frame.inc.php
+++ b/public_html/tag.frame.inc.php
@@ -34,7 +34,7 @@ function guess_lengths($lengths_src, $total) {
$values = array();
foreach ($lengths as $length) {
$values[] = 0;
- };
+ }
/**
* First pass: fixed-width sizes (%Length). There's two types of
@@ -70,8 +70,8 @@ function guess_lengths($lengths_src, $total) {
* Pixel value
*/
$values[$i] = px2pt($length_src);
- };
- };
+ }
+ }
// Second pass: relative-width columns
$rest = $total - array_sum($values);
@@ -80,8 +80,8 @@ function guess_lengths($lengths_src, $total) {
foreach ($lengths as $length_src) {
if (substr($length_src,strlen($length_src)-1,1) == "*") {
$parts += max(1,substr($length_src,0,strlen($length)-1));
- };
- };
+ }
+ }
if ($parts > 0) {
$part_size = $rest / $parts;
@@ -91,19 +91,19 @@ function guess_lengths($lengths_src, $total) {
if (substr($length,strlen($length)-1,1) == "*") {
$values[$i] = $part_size * max(1,substr($length,0,strlen($length)-1));
- };
- };
- };
+ }
+ }
+ }
// Fix over/underconstrained framesets
$width = array_sum($values);
if ($width > 0) {
$koeff = $total / $width;
- for($i = 0; $i < count($values); $i++) {
+ for($i = 0; $i < count((array) $values); $i++) {
$values[$i] *= $koeff;
- };
- };
+ }
+ }
return $values;
}
diff --git a/public_html/tag.ulol.inc.php b/public_html/tag.ulol.inc.php
new file mode 100644
index 0000000..cb2ec1f
--- /dev/null
+++ b/public_html/tag.ulol.inc.php
@@ -0,0 +1,36 @@
+has_attribute('start')) {
+ $start = $root->get_attribute('start');
+ }
+
+ array_unshift($g_list_item_nums,$start);
+
+ return;
+}
+
+function do_ulol_special_post(&$root) {
+ global $g_list_item_nums;
+ array_shift($g_list_item_nums);
+
+ return;
+}
+
+function get_list_item_num() {
+ global $g_list_item_nums;
+ return $g_list_item_nums[0];
+}
+
+function list_item_end() {
+ global $g_list_item_nums;
+ $g_list_item_nums[0]++;
+}
+?>
\ No newline at end of file
diff --git a/public_html/templates/http_error.html b/public_html/templates/http_error.html
new file mode 100644
index 0000000..4a54992
--- /dev/null
+++ b/public_html/templates/http_error.html
@@ -0,0 +1,49 @@
+
+
+html2ps/html2pdf error message
+
+
+
+HTTP error
+Could not open URL you've specified.
+
+
Server responded with:
+
+
+
+
+
diff --git a/public_html/templates/missing_afm.html b/public_html/templates/missing_afm.html
new file mode 100644
index 0000000..325b586
--- /dev/null
+++ b/public_html/templates/missing_afm.html
@@ -0,0 +1,70 @@
+
+
+html2ps/html2pdf error message
+
+
+
+Error
+
+Font metric file PS (Compact) output method. Metric files may be taken from Ghostscript distribution.
+
+
+
+Problem Solution
+
+
+Metric files are not installed on your server
+
+Install either ghostscript-fonts or any other Type1 font package containing metric files. Edit
+.html2ps.config and config.inc.php to point to installed metric files.
+
+
+
+The TYPE1_FONTS_REPOSITORY points to incorrect directory.
+Edit config.inc.php; set the value of TYPE1_FONTS_REPOSITORY to directory where your font metric files reside.
+
+
+You have no requested metric file.
+
+Probably you're using non-standard font package. HTML2PS is configured to work with fonts distributed with Ghostscript out-of-the-box.
+If you're using other fonts, edit .html2ps.config. metrics items should contain names of metric files you're using.
+
+
+
+
+
diff --git a/public_html/test.form.php b/public_html/test.form.php
new file mode 100644
index 0000000..e6b041c
--- /dev/null
+++ b/public_html/test.form.php
@@ -0,0 +1,24 @@
+
\ No newline at end of file
diff --git a/public_html/test.php b/public_html/test.php
new file mode 100644
index 0000000..bb10b01
--- /dev/null
+++ b/public_html/test.php
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/public_html/test1.php b/public_html/test1.php
new file mode 100644
index 0000000..311db95
--- /dev/null
+++ b/public_html/test1.php
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/public_html/test2.php b/public_html/test2.php
new file mode 100644
index 0000000..0214b07
--- /dev/null
+++ b/public_html/test2.php
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/public_html/tree.navigation.inc.php b/public_html/tree.navigation.inc.php
index 24ac96e..c7d3f0f 100644
--- a/public_html/tree.navigation.inc.php
+++ b/public_html/tree.navigation.inc.php
@@ -1,79 +1,41 @@
_callback = $callback;
- }
-
- function run(&$node) {
- call_user_func($this->_callback, array('node' => &$node));
- $this->walk_element($node);
- }
-
- function walk_element(&$node) {
- if (!isset($node->content)) {
- return;
- };
-
- for ($i = 0, $size = count($node->content); $i < $size; $i++) {
- $child =& $node->content[$i];
- $this->run($child);
- };
- }
-}
-
-function &traverse_dom_tree_pdf(&$root) {
+function traverse_dom_tree_pdf(&$root) {
switch ($root->node_type()) {
case XML_DOCUMENT_NODE:
- $child =& $root->first_child();
+ $child = $root->first_child();
while($child) {
- $body =& traverse_dom_tree_pdf($child);
- if ($body) {
- return $body;
- }
- $child =& $child->next_sibling();
- };
-
- $null = null;
- return $null;
- case XML_ELEMENT_NODE:
- if (strtolower($root->tagname()) == "body") {
- return $root;
+ $body = traverse_dom_tree_pdf($child);
+ if ($body) { return $body; }
+ $child = $child->next_sibling();
}
+ break;
+ case XML_ELEMENT_NODE:
+ if (strtolower($root->tagname()) == "body") { return $root; }
- $child =& $root->first_child();
+ $child = $root->first_child();
while ($child) {
- $body =& traverse_dom_tree_pdf($child);
- if ($body) {
- return $body;
- }
- $child =& $child->next_sibling();
- };
+ $body = traverse_dom_tree_pdf($child);
+ if ($body) { return $body; }
+ $child = $child->next_sibling();
+ }
- $null = null;
- return $null;
+ return null;
default:
- $null = null;
- return $null;
+ return null;
}
-};
+}
function dump_tree(&$box, $level) {
print(str_repeat(" ", $level));
- if (is_a($box, 'TextBox')) {
- print(get_class($box).":".$box->uid.":".join('/', $box->words)."\n");
- } else {
- print(get_class($box).":".$box->uid."\n");
- };
+ print(get_class($box).":".$box->uid."\n");
if (isset($box->content)) {
for ($i=0; $icontent); $i++) {
dump_tree($box->content[$i], $level+1);
- };
- };
-};
+ }
+ }
+}
?>
\ No newline at end of file
diff --git a/public_html/treebuilder.class.php b/public_html/treebuilder.class.php
index 3fc72f4..c6487e9 100644
--- a/public_html/treebuilder.class.php
+++ b/public_html/treebuilder.class.php
@@ -1,32 +1,27 @@
loadXML($xmlstring);
+ return (new DOMTree())->from_DOMDocument($DOMDocument);
+ }
+ if (file_exists(HTML2PS_DIR.'/classes/include.php')) {
require_once(HTML2PS_DIR.'classes/include.php');
import('org.active-link.xml.XML');
import('org.active-link.xml.XMLDocument');
@@ -41,11 +36,11 @@ function build($xmlstring) {
// in decimal form
while (preg_match("@&#(\d+);@",$xmlstring, $matches)) {
$xmlstring = preg_replace("@&#".$matches[1].";@",code_to_utf8($matches[1]),$xmlstring);
- };
+ }
// in hexadecimal form
while (preg_match("@&#x(\d+);@i",$xmlstring, $matches)) {
$xmlstring = preg_replace("@&#x".$matches[1].";@i",code_to_utf8(hexdec($matches[1])),$xmlstring);
- };
+ }
$tree = ActiveLinkDOMTree::from_XML(new XML($xmlstring));
@@ -53,5 +48,5 @@ function build($xmlstring) {
}
die("None of DOM/XML, DOM or ActiveLink DOM extension found. Check your PHP configuration.");
}
-};
-?>
+}
+?>
\ No newline at end of file
diff --git a/public_html/unittest/fetcher.memory.php b/public_html/unittest/fetcher.memory.php
index f4bd126..6b22cf6 100644
--- a/public_html/unittest/fetcher.memory.php
+++ b/public_html/unittest/fetcher.memory.php
@@ -4,7 +4,7 @@ class MyFetcherMemory extends Fetcher {
var $base_path;
var $content;
- function MyFetcherMemory($content, $base_path) {
+ function __construct($content, $base_path) {
$this->content = $content;
$this->base_path = $base_path;
}
@@ -16,9 +16,9 @@ function get_data($url) {
// remove the "file:///" protocol
if (substr($url,0,8)=='file:///') {
$url=substr($url,8);
- };
-
- $url = urldecode($url);
+ // remove the additional '/' that is currently inserted by utils_url.php
+ if (PHP_OS == "WINNT") $url=substr($url,1);
+ }
return new FetchedDataURL(@file_get_contents($url), array(), "");
}
}
diff --git a/public_html/unittest/generic.test.php b/public_html/unittest/generic.test.php
index 988fd3b..fa5aeac 100644
--- a/public_html/unittest/generic.test.php
+++ b/public_html/unittest/generic.test.php
@@ -1,34 +1,22 @@
clear_box_id_map();
- $pipeline->fetchers = array(new MyFetcherMemory($html, realpath(dirname(__FILE__))),
- new FetcherURL());
- return $pipeline->_layout_item("", $media, 0, $context, $positioned_filter);
- }
-
- function &preparePipeline(&$media) {
- $pipeline = PipelineFactory::create_default_pipeline("", "");
+ function runPipeline($html, $media = null) {
+ $pipeline = (new PipelineFactory())->create_default_pipeline("", "");
$pipeline->configure(array('scalepoints' => false));
+ $pipeline->fetchers = array(new MyFetcherMemory($html, ""));
$pipeline->data_filters[] = new DataFilterHTML2XHTML();
$pipeline->destination = new DestinationFile("test.pdf");
- $pipeline->_prepare($media);
- return $pipeline;
- }
-
- function runPipeline($html, &$media = null, &$pipeline = null, &$context = null, &$postponed = null) {
parse_config_file('../html2ps.config');
if (is_null($media)) {
- $media = Media::predefined("A4");
- };
+ $media = (new Media())->predefined("A4");
+ }
- $pipeline = $this->preparePipeline($media);
- $tree = $this->layoutPipeline($html, $pipeline, $media, $context, $postponed);
- return $tree;
+ $pipeline->_prepare($media);
+ return $pipeline->_layout_item("", $media, 0, $context, $positioned_filter);
}
}
?>
\ No newline at end of file
diff --git a/public_html/unittest/index.php b/public_html/unittest/index.php
index f28ea15..491f9d7 100644
--- a/public_html/unittest/index.php
+++ b/public_html/unittest/index.php
@@ -1,26 +1,25 @@
-addTestFile($testfile);
-};
-$test->addTestFile('test.white-space.php');
-$test->run(new HtmlReporter());
-
+addTestFile($testfile);
+// }
+$test->addTestFile('test.orphans.php');
+$test->addTestFile('test.widows.php');
+$test->run(new HtmlReporter());
+
?>
\ No newline at end of file
diff --git a/public_html/unittest/sample css.css b/public_html/unittest/sample css.css
index a64ab4c..69c0f8c 100644
--- a/public_html/unittest/sample css.css
+++ b/public_html/unittest/sample css.css
@@ -1,3 +1,3 @@
-#div1 {
- color: red;
+#div1 {
+ color: red;
}
\ No newline at end of file
diff --git a/public_html/unittest/test.border-bottom.1.html b/public_html/unittest/test.border-bottom.1.html
index 58f676e..d6ba9d3 100644
--- a/public_html/unittest/test.border-bottom.1.html
+++ b/public_html/unittest/test.border-bottom.1.html
@@ -1,7 +1,7 @@
-
-TEXT
-
-
-
-TEXT
+
+TEXT
+
+
+
+TEXT
\ No newline at end of file
diff --git a/public_html/unittest/test.border-bottom.php b/public_html/unittest/test.border-bottom.php
index 1b1d6b1..06ba151 100644
--- a/public_html/unittest/test.border-bottom.php
+++ b/public_html/unittest/test.border-bottom.php
@@ -1,43 +1,43 @@
-runPipeline(file_get_contents('test.border-bottom.1.html'));
-
- $element =& $tree->get_element_by_id('div1');
- $border =& $element->getCSSProperty(CSS_BORDER);
- $top =& $border->get_top();
- $this->assertEqual($top->get_style(), BS_NONE);
- $left =& $border->get_left();
- $this->assertEqual($left->get_style(), BS_NONE);
- $right =& $border->get_right();
- $this->assertEqual($right->get_style(), BS_NONE);
- $bottom =& $border->get_bottom();
- $this->assertEqual($bottom->get_style(), BS_SOLID);
- $width =& $bottom->get_width();
- $this->assertEqual($width, px2pt(1));
- $color =& $bottom->get_color();
- $this->assertEqual($color->r, 0);
- $this->assertEqual($color->g, 0);
- $this->assertEqual($color->b, 0);
-
- $element =& $tree->get_element_by_id('div2');
- $border =& $element->getCSSProperty(CSS_BORDER);
- $top =& $border->get_top();
- $this->assertEqual($top->get_style(), BS_NONE);
- $left =& $border->get_left();
- $this->assertEqual($left->get_style(), BS_NONE);
- $right =& $border->get_right();
- $this->assertEqual($right->get_style(), BS_NONE);
- $bottom =& $border->get_bottom();
- $this->assertEqual($bottom->get_style(), BS_SOLID);
- $width =& $bottom->get_width();
- $this->assertEqual($width, px2pt(1));
- $color =& $bottom->get_color();
- $this->assertEqual($color->r, 0);
- $this->assertEqual($color->g, 0);
- $this->assertEqual($color->b, 0);
- }
-}
-
+runPipeline(file_get_contents('test.border-bottom.1.html'));
+
+ $element =& $tree->get_element_by_id('div1');
+ $border =& $element->getCSSProperty(CSS_BORDER);
+ $top =& $border->get_top();
+ $this->assertEqual($top->get_style(), BS_NONE);
+ $left =& $border->get_left();
+ $this->assertEqual($left->get_style(), BS_NONE);
+ $right =& $border->get_right();
+ $this->assertEqual($right->get_style(), BS_NONE);
+ $bottom =& $border->get_bottom();
+ $this->assertEqual($bottom->get_style(), BS_SOLID);
+ $width =& $bottom->get_width();
+ $this->assertEqual($width, px2pt(1));
+ $color =& $bottom->get_color();
+ $this->assertEqual($color->r, 0);
+ $this->assertEqual($color->g, 0);
+ $this->assertEqual($color->b, 0);
+
+ $element =& $tree->get_element_by_id('div2');
+ $border =& $element->getCSSProperty(CSS_BORDER);
+ $top =& $border->get_top();
+ $this->assertEqual($top->get_style(), BS_NONE);
+ $left =& $border->get_left();
+ $this->assertEqual($left->get_style(), BS_NONE);
+ $right =& $border->get_right();
+ $this->assertEqual($right->get_style(), BS_NONE);
+ $bottom =& $border->get_bottom();
+ $this->assertEqual($bottom->get_style(), BS_SOLID);
+ $width =& $bottom->get_width();
+ $this->assertEqual($width, px2pt(1));
+ $color =& $bottom->get_color();
+ $this->assertEqual($color->r, 0);
+ $this->assertEqual($color->g, 0);
+ $this->assertEqual($color->b, 0);
+ }
+}
+
?>
\ No newline at end of file
diff --git a/public_html/unittest/test.border-left.1.html b/public_html/unittest/test.border-left.1.html
index b78b4ef..40f437e 100644
--- a/public_html/unittest/test.border-left.1.html
+++ b/public_html/unittest/test.border-left.1.html
@@ -1,7 +1,7 @@
-
-TEXT
-
-
-
-TEXT
+
+TEXT
+
+
+
+TEXT
\ No newline at end of file
diff --git a/public_html/unittest/test.border-left.php b/public_html/unittest/test.border-left.php
index c0b4ff9..f4e1c4b 100644
--- a/public_html/unittest/test.border-left.php
+++ b/public_html/unittest/test.border-left.php
@@ -1,43 +1,43 @@
-runPipeline(file_get_contents('test.border-left.1.html'));
-
- $element =& $tree->get_element_by_id('div1');
- $border =& $element->getCSSProperty(CSS_BORDER);
- $top =& $border->get_top();
- $this->assertEqual($top->get_style(), BS_NONE);
- $bottom =& $border->get_bottom();
- $this->assertEqual($bottom->get_style(), BS_NONE);
- $right =& $border->get_right();
- $this->assertEqual($right->get_style(), BS_NONE);
- $left =& $border->get_left();
- $this->assertEqual($left->get_style(), BS_SOLID);
- $width =& $left->get_width();
- $this->assertEqual($width, px2pt(1));
- $color =& $left->get_color();
- $this->assertEqual($color->r, 0);
- $this->assertEqual($color->g, 0);
- $this->assertEqual($color->b, 0);
-
- $element =& $tree->get_element_by_id('div2');
- $border =& $element->getCSSProperty(CSS_BORDER);
- $top =& $border->get_top();
- $this->assertEqual($top->get_style(), BS_NONE);
- $bottom =& $border->get_bottom();
- $this->assertEqual($bottom->get_style(), BS_NONE);
- $right =& $border->get_right();
- $this->assertEqual($right->get_style(), BS_NONE);
- $left =& $border->get_left();
- $this->assertEqual($left->get_style(), BS_SOLID);
- $width =& $left->get_width();
- $this->assertEqual($width, px2pt(1));
- $color =& $left->get_color();
- $this->assertEqual($color->r, 0);
- $this->assertEqual($color->g, 0);
- $this->assertEqual($color->b, 0);
- }
-}
-
+runPipeline(file_get_contents('test.border-left.1.html'));
+
+ $element =& $tree->get_element_by_id('div1');
+ $border =& $element->getCSSProperty(CSS_BORDER);
+ $top =& $border->get_top();
+ $this->assertEqual($top->get_style(), BS_NONE);
+ $bottom =& $border->get_bottom();
+ $this->assertEqual($bottom->get_style(), BS_NONE);
+ $right =& $border->get_right();
+ $this->assertEqual($right->get_style(), BS_NONE);
+ $left =& $border->get_left();
+ $this->assertEqual($left->get_style(), BS_SOLID);
+ $width =& $left->get_width();
+ $this->assertEqual($width, px2pt(1));
+ $color =& $left->get_color();
+ $this->assertEqual($color->r, 0);
+ $this->assertEqual($color->g, 0);
+ $this->assertEqual($color->b, 0);
+
+ $element =& $tree->get_element_by_id('div2');
+ $border =& $element->getCSSProperty(CSS_BORDER);
+ $top =& $border->get_top();
+ $this->assertEqual($top->get_style(), BS_NONE);
+ $bottom =& $border->get_bottom();
+ $this->assertEqual($bottom->get_style(), BS_NONE);
+ $right =& $border->get_right();
+ $this->assertEqual($right->get_style(), BS_NONE);
+ $left =& $border->get_left();
+ $this->assertEqual($left->get_style(), BS_SOLID);
+ $width =& $left->get_width();
+ $this->assertEqual($width, px2pt(1));
+ $color =& $left->get_color();
+ $this->assertEqual($color->r, 0);
+ $this->assertEqual($color->g, 0);
+ $this->assertEqual($color->b, 0);
+ }
+}
+
?>
\ No newline at end of file
diff --git a/public_html/unittest/test.border-right.1.html b/public_html/unittest/test.border-right.1.html
index 3bf7e60..38b7ba6 100644
--- a/public_html/unittest/test.border-right.1.html
+++ b/public_html/unittest/test.border-right.1.html
@@ -1,7 +1,7 @@
-
-TEXT
-
-
-
-TEXT
+
+TEXT
+
+
+
+TEXT
\ No newline at end of file
diff --git a/public_html/unittest/test.border-right.php b/public_html/unittest/test.border-right.php
index 94bc169..85cffb3 100644
--- a/public_html/unittest/test.border-right.php
+++ b/public_html/unittest/test.border-right.php
@@ -1,43 +1,43 @@
-runPipeline(file_get_contents('test.border-right.1.html'));
-
- $element =& $tree->get_element_by_id('div1');
- $border =& $element->getCSSProperty(CSS_BORDER);
- $top =& $border->get_top();
- $this->assertEqual($top->get_style(), BS_NONE);
- $bottom =& $border->get_bottom();
- $this->assertEqual($bottom->get_style(), BS_NONE);
- $left =& $border->get_left();
- $this->assertEqual($left->get_style(), BS_NONE);
- $right =& $border->get_right();
- $this->assertEqual($right->get_style(), BS_SOLID);
- $width =& $right->get_width();
- $this->assertEqual($width, px2pt(1));
- $color =& $right->get_color();
- $this->assertEqual($color->r, 0);
- $this->assertEqual($color->g, 0);
- $this->assertEqual($color->b, 0);
-
- $element =& $tree->get_element_by_id('div2');
- $border =& $element->getCSSProperty(CSS_BORDER);
- $top =& $border->get_top();
- $this->assertEqual($top->get_style(), BS_NONE);
- $bottom =& $border->get_bottom();
- $this->assertEqual($bottom->get_style(), BS_NONE);
- $left =& $border->get_left();
- $this->assertEqual($left->get_style(), BS_NONE);
- $right =& $border->get_right();
- $this->assertEqual($right->get_style(), BS_SOLID);
- $width =& $right->get_width();
- $this->assertEqual($width, px2pt(1));
- $color =& $right->get_color();
- $this->assertEqual($color->r, 0);
- $this->assertEqual($color->g, 0);
- $this->assertEqual($color->b, 0);
- }
-}
-
+runPipeline(file_get_contents('test.border-right.1.html'));
+
+ $element =& $tree->get_element_by_id('div1');
+ $border =& $element->getCSSProperty(CSS_BORDER);
+ $top =& $border->get_top();
+ $this->assertEqual($top->get_style(), BS_NONE);
+ $bottom =& $border->get_bottom();
+ $this->assertEqual($bottom->get_style(), BS_NONE);
+ $left =& $border->get_left();
+ $this->assertEqual($left->get_style(), BS_NONE);
+ $right =& $border->get_right();
+ $this->assertEqual($right->get_style(), BS_SOLID);
+ $width =& $right->get_width();
+ $this->assertEqual($width, px2pt(1));
+ $color =& $right->get_color();
+ $this->assertEqual($color->r, 0);
+ $this->assertEqual($color->g, 0);
+ $this->assertEqual($color->b, 0);
+
+ $element =& $tree->get_element_by_id('div2');
+ $border =& $element->getCSSProperty(CSS_BORDER);
+ $top =& $border->get_top();
+ $this->assertEqual($top->get_style(), BS_NONE);
+ $bottom =& $border->get_bottom();
+ $this->assertEqual($bottom->get_style(), BS_NONE);
+ $left =& $border->get_left();
+ $this->assertEqual($left->get_style(), BS_NONE);
+ $right =& $border->get_right();
+ $this->assertEqual($right->get_style(), BS_SOLID);
+ $width =& $right->get_width();
+ $this->assertEqual($width, px2pt(1));
+ $color =& $right->get_color();
+ $this->assertEqual($color->r, 0);
+ $this->assertEqual($color->g, 0);
+ $this->assertEqual($color->b, 0);
+ }
+}
+
?>
\ No newline at end of file
diff --git a/public_html/unittest/test.border-top.1.html b/public_html/unittest/test.border-top.1.html
index 40dbc41..282561f 100644
--- a/public_html/unittest/test.border-top.1.html
+++ b/public_html/unittest/test.border-top.1.html
@@ -1,7 +1,7 @@
-
-TEXT
-
-
-
-TEXT
+
+TEXT
+
+
+
+TEXT
\ No newline at end of file
diff --git a/public_html/unittest/test.border-top.php b/public_html/unittest/test.border-top.php
index 7010c31..495428b 100644
--- a/public_html/unittest/test.border-top.php
+++ b/public_html/unittest/test.border-top.php
@@ -1,43 +1,43 @@
-runPipeline(file_get_contents('test.border-top.1.html'));
-
- $element =& $tree->get_element_by_id('div1');
- $border =& $element->getCSSProperty(CSS_BORDER);
- $right =& $border->get_right();
- $this->assertEqual($right->get_style(), BS_NONE);
- $bottom =& $border->get_bottom();
- $this->assertEqual($bottom->get_style(), BS_NONE);
- $left =& $border->get_left();
- $this->assertEqual($left->get_style(), BS_NONE);
- $top =& $border->get_top();
- $this->assertEqual($top->get_style(), BS_SOLID);
- $width =& $top->get_width();
- $this->assertEqual($width, px2pt(1));
- $color =& $top->get_color();
- $this->assertEqual($color->r, 0);
- $this->assertEqual($color->g, 0);
- $this->assertEqual($color->b, 0);
-
- $element =& $tree->get_element_by_id('div2');
- $border =& $element->getCSSProperty(CSS_BORDER);
- $right =& $border->get_right();
- $this->assertEqual($right->get_style(), BS_NONE);
- $bottom =& $border->get_bottom();
- $this->assertEqual($bottom->get_style(), BS_NONE);
- $left =& $border->get_left();
- $this->assertEqual($left->get_style(), BS_NONE);
- $top =& $border->get_top();
- $this->assertEqual($top->get_style(), BS_SOLID);
- $width =& $top->get_width();
- $this->assertEqual($width, px2pt(1));
- $color =& $top->get_color();
- $this->assertEqual($color->r, 0);
- $this->assertEqual($color->g, 0);
- $this->assertEqual($color->b, 0);
- }
-}
-
+runPipeline(file_get_contents('test.border-top.1.html'));
+
+ $element =& $tree->get_element_by_id('div1');
+ $border =& $element->getCSSProperty(CSS_BORDER);
+ $right =& $border->get_right();
+ $this->assertEqual($right->get_style(), BS_NONE);
+ $bottom =& $border->get_bottom();
+ $this->assertEqual($bottom->get_style(), BS_NONE);
+ $left =& $border->get_left();
+ $this->assertEqual($left->get_style(), BS_NONE);
+ $top =& $border->get_top();
+ $this->assertEqual($top->get_style(), BS_SOLID);
+ $width =& $top->get_width();
+ $this->assertEqual($width, px2pt(1));
+ $color =& $top->get_color();
+ $this->assertEqual($color->r, 0);
+ $this->assertEqual($color->g, 0);
+ $this->assertEqual($color->b, 0);
+
+ $element =& $tree->get_element_by_id('div2');
+ $border =& $element->getCSSProperty(CSS_BORDER);
+ $right =& $border->get_right();
+ $this->assertEqual($right->get_style(), BS_NONE);
+ $bottom =& $border->get_bottom();
+ $this->assertEqual($bottom->get_style(), BS_NONE);
+ $left =& $border->get_left();
+ $this->assertEqual($left->get_style(), BS_NONE);
+ $top =& $border->get_top();
+ $this->assertEqual($top->get_style(), BS_SOLID);
+ $width =& $top->get_width();
+ $this->assertEqual($width, px2pt(1));
+ $color =& $top->get_color();
+ $this->assertEqual($color->r, 0);
+ $this->assertEqual($color->g, 0);
+ $this->assertEqual($color->b, 0);
+ }
+}
+
?>
\ No newline at end of file
diff --git a/public_html/unittest/test.css.background.attachment.php b/public_html/unittest/test.css.background.attachment.php
index eb9301a..0632955 100644
--- a/public_html/unittest/test.css.background.attachment.php
+++ b/public_html/unittest/test.css.background.attachment.php
@@ -1,36 +1,36 @@
-runPipeline('
-
-
-
-
-
-
-
-
-
-
-');
-
- $div1 =& $tree->get_element_by_id('div1');
- $this->assertEqual(BACKGROUND_ATTACHMENT_FIXED, $div1->getCSSProperty(CSS_BACKGROUND_ATTACHMENT));
-
- $div2 =& $tree->get_element_by_id('div2');
- $this->assertEqual(BACKGROUND_ATTACHMENT_SCROLL, $div2->getCSSProperty(CSS_BACKGROUND_ATTACHMENT));
-
- $div3 =& $tree->get_element_by_id('div3');
- $this->assertEqual(BACKGROUND_ATTACHMENT_SCROLL, $div3->getCSSProperty(CSS_BACKGROUND_ATTACHMENT));
-
- $this->assertEqual(BACKGROUND_ATTACHMENT_FIXED, $tree->getCSSProperty(CSS_BACKGROUND_ATTACHMENT));
- }
-}
-
+runPipeline('
+
+
+
+
+
+
+
+
+
+
+');
+
+ $div1 =& $tree->get_element_by_id('div1');
+ $this->assertEqual(BACKGROUND_ATTACHMENT_FIXED, $div1->getCSSProperty(CSS_BACKGROUND_ATTACHMENT));
+
+ $div2 =& $tree->get_element_by_id('div2');
+ $this->assertEqual(BACKGROUND_ATTACHMENT_SCROLL, $div2->getCSSProperty(CSS_BACKGROUND_ATTACHMENT));
+
+ $div3 =& $tree->get_element_by_id('div3');
+ $this->assertEqual(BACKGROUND_ATTACHMENT_SCROLL, $div3->getCSSProperty(CSS_BACKGROUND_ATTACHMENT));
+
+ $this->assertEqual(BACKGROUND_ATTACHMENT_FIXED, $tree->getCSSProperty(CSS_BACKGROUND_ATTACHMENT));
+ }
+}
+
?>
\ No newline at end of file
diff --git a/public_html/unittest/test.css.content.php b/public_html/unittest/test.css.content.php
index 6321ebc..5f45d70 100644
--- a/public_html/unittest/test.css.content.php
+++ b/public_html/unittest/test.css.content.php
@@ -9,7 +9,7 @@ function testCSSContentWithEscapesInsideHTML() {
$content =& $element->getCSSProperty(CSS_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "<span style="font-weight: bold;">My</span> Page");
}
@@ -19,7 +19,7 @@ function testCSSContentWithEscapes() {
$this->assertTrue($collection->contains(CSS_CONTENT));
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$content =& $collection->getPropertyValue(CSS_CONTENT);
$this->assertEqual($content->render($counters), "<span style="font-weight: bold;">My</span> Page");
}
@@ -30,7 +30,7 @@ function testCSSHTMLContentWithEscapes() {
$this->assertTrue($collection->contains(CSS_HTML2PS_HTML_CONTENT));
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$content =& $collection->getPropertyValue(CSS_HTML2PS_HTML_CONTENT);
$this->assertEqual($content->render($counters), "<span style="font-weight: bold;">My</span> Page");
}
@@ -41,13 +41,13 @@ function testCSSContentWithCounters() {
$this->assertTrue($collection->contains(CSS_CONTENT));
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
- $page_counter =& new CSSCounter('page');
+ $page_counter= new CSSCounter('page');
$page_counter->set(10);
$counters->add($page_counter);
- $sample_counter =& new CSSCounter('sample');
+ $sample_counter= new CSSCounter('sample');
$sample_counter->set(1);
$counters->add($sample_counter);
@@ -61,13 +61,13 @@ function testCSSContentWithCountersAndSemicolons() {
$this->assertTrue($collection->contains(CSS_CONTENT));
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
- $page_counter =& new CSSCounter('page');
+ $page_counter= new CSSCounter('page');
$page_counter->set(1);
$counters->add($page_counter);
- $sample_counter =& new CSSCounter('pages');
+ $sample_counter= new CSSCounter('pages');
$sample_counter->set(10);
$counters->add($sample_counter);
@@ -81,7 +81,7 @@ function testCSSContentEmptyWithQuotes() {
$this->assertTrue($collection->contains(CSS_CONTENT));
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$content =& $collection->getPropertyValue(CSS_CONTENT);
$this->assertEqual($content->render($counters), "");
}
@@ -92,7 +92,7 @@ function testCSSContentEmptyWithApostrophes() {
$this->assertTrue($collection->contains(CSS_CONTENT));
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$content =& $collection->getPropertyValue(CSS_CONTENT);
$this->assertEqual($content->render($counters), "");
}
@@ -104,7 +104,7 @@ function testCSSContentEmptyWithOtherProperties() {
$this->assertTrue($collection->contains(CSS_CONTENT));
$this->assertTrue($collection->contains(CSS_HTML2PS_HTML_CONTENT));
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$content =& $collection->getPropertyValue(CSS_CONTENT);
$this->assertEqual($content->render($counters), "");
diff --git a/public_html/unittest/test.css.content.string.php b/public_html/unittest/test.css.content.string.php
index a824a95..22df3ba 100644
--- a/public_html/unittest/test.css.content.string.php
+++ b/public_html/unittest/test.css.content.string.php
@@ -5,7 +5,7 @@ function testCSContentStringNewline() {
$content =& ValueContent::parse('"Sample\
Content"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample Content");
@@ -16,7 +16,7 @@ function testCSContentStringNewline2() {
\
Content"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample Content");
@@ -25,7 +25,7 @@ function testCSContentStringNewline2() {
function testCSSContentStringEscape6DigitsSpace() {
$content =& ValueContent::parse('"Sample\00000A Content"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample\nContent");
@@ -34,7 +34,7 @@ function testCSSContentStringEscape6DigitsSpace() {
function testCSSContentStringEscape6DigitsSpaces() {
$content =& ValueContent::parse('"Sample\00000A Content"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample\n Content");
@@ -43,7 +43,7 @@ function testCSSContentStringEscape6DigitsSpaces() {
function testCSSContentStringEscape6DigitsNoSpace() {
$content =& ValueContent::parse('"Sample\00000ALine"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample\nLine");
@@ -52,7 +52,7 @@ function testCSSContentStringEscape6DigitsNoSpace() {
function testCSSContentStringEscape6DigitsNoSpaceHexadecimal() {
$content =& ValueContent::parse('"Sample\00000AContent"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample\nContent");
@@ -61,7 +61,7 @@ function testCSSContentStringEscape6DigitsNoSpaceHexadecimal() {
function testCSSContentStringEscapeSpace() {
$content =& ValueContent::parse('"Sample\A Content"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample\nContent");
@@ -70,7 +70,7 @@ function testCSSContentStringEscapeSpace() {
function testCSSContentStringEscapeSpaces() {
$content =& ValueContent::parse('"Sample\A Content"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample\n Content");
@@ -79,7 +79,7 @@ function testCSSContentStringEscapeSpaces() {
function testCSSContentStringEscapeNoSpace() {
$content =& ValueContent::parse('"Sample\ALine"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "Sample\nLine");
@@ -88,7 +88,7 @@ function testCSSContentStringEscapeNoSpace() {
function testCSSContentStringEscapeNoSpaceHex() {
$content =& ValueContent::parse('"Sample\4Content"');
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$rendered = $content->render($counters);
$this->assertEqual($rendered, "SampleLontent");
diff --git a/public_html/unittest/test.css.margin.boxes.php b/public_html/unittest/test.css.margin.boxes.php
index d7b33d1..7201f6c 100644
--- a/public_html/unittest/test.css.margin.boxes.php
+++ b/public_html/unittest/test.css.margin.boxes.php
@@ -3,15 +3,15 @@
class TestCSSParseMarginBoxes extends GenericTest {
function testCSSParseMarginBoxesTopLeftCornerSize() {
parse_config_file('../html2ps.config');
- $media =& Media::predefined('A4');
+ $media =& (new Media())->predefined('A4');
$media->set_margins(array('left' => 10,
'top' => 10,
'right' => 10,
'bottom' => 10));
- $pipeline =& PipelineFactory::create_default_pipeline('utf-8', 'test.pdf');
+ $pipeline =& (new PipelineFactory())->create_default_pipeline('utf-8', 'test.pdf');
$pipeline->_setupScales($media);
- $pipeline->_cssState = array(new CSSState(CSS::get()));
+ $pipeline->_cssState = array(new CSSState((new CSS())->get()));
$boxes = $pipeline->reflow_margin_boxes(1, $media);
@@ -22,15 +22,15 @@ function testCSSParseMarginBoxesTopLeftCornerSize() {
function testCSSParseMarginBoxesTopLeftSizeNoContent() {
parse_config_file('../html2ps.config');
- $media =& Media::predefined('A4');
+ $media =& (new Media())->predefined('A4');
$media->set_margins(array('left' => 10,
'top' => 10,
'right' => 10,
'bottom' => 10));
- $pipeline =& PipelineFactory::create_default_pipeline('utf-8', 'test.pdf');
+ $pipeline =& (new PipelineFactory())->create_default_pipeline('utf-8', 'test.pdf');
$pipeline->_setupScales($media);
- $pipeline->_cssState = array(new CSSState(CSS::get()));
+ $pipeline->_cssState = array(new CSSState((new CSS())->get()));
$boxes = $pipeline->reflow_margin_boxes(1, $media);
@@ -41,15 +41,15 @@ function testCSSParseMarginBoxesTopLeftSizeNoContent() {
function testCSSParseMarginBoxesTopLeftSize() {
parse_config_file('../html2ps.config');
- $media =& Media::predefined('A4');
+ $media =& (new Media())->predefined('A4');
$media->set_margins(array('left' => 10,
'top' => 10,
'right' => 10,
'bottom' => 10));
- $pipeline =& PipelineFactory::create_default_pipeline('utf-8', 'test.pdf');
+ $pipeline =& (new PipelineFactory())->create_default_pipeline('utf-8', 'test.pdf');
$pipeline->_prepare($media);
- $pipeline->_cssState = array(new CSSState(CSS::get()));
+ $pipeline->_cssState = array(new CSSState((new CSS())->get()));
parse_css_atpage_rules('@page { @top-left { content: "TEXT"; } }', $pipeline);
$boxes = $pipeline->reflow_margin_boxes(1, $media);
diff --git a/public_html/unittest/test.css.page.break.after.php b/public_html/unittest/test.css.page.break.after.php
index d32efc4..5c10543 100644
--- a/public_html/unittest/test.css.page.break.after.php
+++ b/public_html/unittest/test.css.page.break.after.php
@@ -2,24 +2,22 @@
class TestCSSPageBreakAfter extends GenericTest {
function testCSSPageBreakAfter1() {
- $tree = $this->runPipeline(file_get_contents('test.css.page.break.after.1.html'));
- $div = $tree->get_element_by_id('div');
- $this->assertEqual(PAGE_BREAK_AVOID, $div->getCSSProperty(CSS_PAGE_BREAK_AFTER));
- }
-
- function testCSSPageBreakAfter2() {
- $tree = $this->runPipeline(file_get_contents('test.css.page.break.after.2.html'),
- $media);
- $page_heights = PageBreakLocator::getPages($tree,
- mm2pt($media->real_height()),
- mm2pt($media->height() - $media->margins['top']));
+ $tree = $this->runPipeline('
+
+
+
+
+
+
+
+
+');
- $this->assertEqual(count($page_heights), 2);
+ $div = $tree->getElementById('div');
- $div = $tree->get_element_by_id('div');
- $h1 = $tree->get_element_by_id('h1');
-
- $this->assertEqual($page_heights[0], $div->get_full_height());
+ $this->assertEqual(PAGE_BREAK_AVOID, $div->getCSSProperty(CSS_PAGE_BREAK_AFTER));
}
}
diff --git a/public_html/unittest/test.css.page.break.before.php b/public_html/unittest/test.css.page.break.before.php
index b214454..087b387 100644
--- a/public_html/unittest/test.css.page.break.before.php
+++ b/public_html/unittest/test.css.page.break.before.php
@@ -2,9 +2,20 @@
class TestCSSPageBreakBefore extends GenericTest {
function testCSSPageBreakBefore1() {
- $tree = $this->runPipeline(file_get_contents('test.css.page.break.before.1.html'));
+ $tree = $this->runPipeline('
+
+
+
+
+
+
+
+
+');
- $div = $tree->get_element_by_id('div');
+ $div = $tree->getElementById('div');
$this->assertEqual(PAGE_BREAK_AVOID, $div->getCSSProperty(CSS_PAGE_BREAK_BEFORE));
}
diff --git a/public_html/unittest/test.css.page.break.inside.php b/public_html/unittest/test.css.page.break.inside.php
index 3b36bbc..091a894 100644
--- a/public_html/unittest/test.css.page.break.inside.php
+++ b/public_html/unittest/test.css.page.break.inside.php
@@ -15,7 +15,7 @@ function testCSSPageBreakInside1() {
');
- $div = $tree->get_element_by_id('div');
+ $div = $tree->getElementById('div');
$this->assertEqual(PAGE_BREAK_AVOID, $div->getCSSProperty(CSS_PAGE_BREAK_INSIDE));
}
diff --git a/public_html/unittest/test.css.parse.atrules.php b/public_html/unittest/test.css.parse.atrules.php
index c10463e..aa6dd49 100644
--- a/public_html/unittest/test.css.parse.atrules.php
+++ b/public_html/unittest/test.css.parse.atrules.php
@@ -2,7 +2,7 @@
class TestCSSParseAtRules extends GenericTest {
function testCSSParseAtRulesSimple() {
- $pipeline =& PipelineFactory::create_default_pipeline('utf-8', 'test.pdf');
+ $pipeline =& (new PipelineFactory())->create_default_pipeline('utf-8', 'test.pdf');
$new_css_content =& parse_css_atpage_rules('body { background-color: green; } @page { background-color: red; } #test { border: none; }', $pipeline);
$this->assertEqual($new_css_content, 'body { background-color: green; } #test { border: none; }');
@@ -15,7 +15,7 @@ function testCSSParseAtRulesSimple() {
}
function testCSSParseAtRulesNested() {
- $pipeline =& PipelineFactory::create_default_pipeline('utf-8', 'test.pdf');
+ $pipeline =& (new PipelineFactory())->create_default_pipeline('utf-8', 'test.pdf');
$new_css_content =& parse_css_atpage_rules('body { background-color: green; } @page { @top-left { background-color: lime; } } #test { border: none; }', $pipeline);
$this->assertEqual($new_css_content, 'body { background-color: green; } #test { border: none; }');
@@ -28,7 +28,7 @@ function testCSSParseAtRulesNested() {
}
function testCSSParseAtRulesNestedContent() {
- $pipeline =& PipelineFactory::create_default_pipeline('utf-8', 'test.pdf');
+ $pipeline =& (new PipelineFactory())->create_default_pipeline('utf-8', 'test.pdf');
$new_css_content =& parse_css_atpage_rules('body { background-color: green; } @page { @top-left { content: "TEXT"; } } #test { border: none; }', $pipeline);
$this->assertEqual($new_css_content, 'body { background-color: green; } #test { border: none; }');
diff --git a/public_html/unittest/test.css.parse.php b/public_html/unittest/test.css.parse.php
index dddb8cb..cf4cd28 100644
--- a/public_html/unittest/test.css.parse.php
+++ b/public_html/unittest/test.css.parse.php
@@ -21,7 +21,7 @@ function testCSSParseProperty() {
$this->assertTrue($collection->contains(CSS_HTML2PS_HTML_CONTENT));
$content =& $collection->getPropertyValue(CSS_HTML2PS_HTML_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "Sample;Text");
}
@@ -31,7 +31,7 @@ function testCSSParsePropertyWithoutTrailingSemicolon() {
$this->assertTrue($collection->contains(CSS_CONTENT));
$content =& $collection->getPropertyValue(CSS_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "TEXT");
}
@@ -42,7 +42,7 @@ function testCSSParsePropertyMultipart() {
$this->assertTrue($collection->contains(CSS_HTML2PS_HTML_CONTENT));
$content =& $collection->getPropertyValue(CSS_HTML2PS_HTML_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "Double Quoted StringSingle Quoted String");
}
@@ -58,7 +58,7 @@ function testCSSParseProperties() {
$this->assertEqual($collection->getPropertyValue(CSS_FONT_WEIGHT), WEIGHT_BOLD);
$content =& $collection->getPropertyValue(CSS_HTML2PS_HTML_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "Sample;Text");
$color = $collection->getPropertyValue(CSS_COLOR);
@@ -81,7 +81,7 @@ function testCSSParsePropertiesMultiline() {
$this->assertEqual($collection->getPropertyValue(CSS_FONT_WEIGHT), WEIGHT_BOLD);
$content =& $collection->getPropertyValue(CSS_HTML2PS_HTML_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "Sample;Text");
$color = $collection->getPropertyValue(CSS_COLOR);
@@ -104,7 +104,7 @@ function testCSSParsePropertiesMultilineWithoutTrailingSemicolon() {
$this->assertEqual($collection->getPropertyValue(CSS_FONT_WEIGHT), WEIGHT_BOLD);
$content =& $collection->getPropertyValue(CSS_HTML2PS_HTML_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "Sample;Text");
$color = $collection->getPropertyValue(CSS_COLOR);
@@ -129,7 +129,7 @@ function testCSSParsePropertiesMultilineWithoutTrailingSemicolon2() {
$this->assertEqual($collection->getPropertyValue(CSS_FONT_WEIGHT), WEIGHT_BOLD);
$content =& $collection->getPropertyValue(CSS_HTML2PS_HTML_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "Sample;Text");
$color = $collection->getPropertyValue(CSS_COLOR);
@@ -154,7 +154,7 @@ function testCSSParsePropertiesMultilineWithLinefeedsAround() {
$this->assertEqual($collection->getPropertyValue(CSS_FONT_WEIGHT), WEIGHT_BOLD);
$content =& $collection->getPropertyValue(CSS_HTML2PS_HTML_CONTENT);
- $counters =& new CSSCounterCollection();
+ $counters= new CSSCounterCollection();
$this->assertEqual($content->render($counters), "Sample;Text");
$color = $collection->getPropertyValue(CSS_COLOR);
diff --git a/public_html/unittest/test.css.priority.php b/public_html/unittest/test.css.priority.php
index e85f79a..c0e0ecd 100644
--- a/public_html/unittest/test.css.priority.php
+++ b/public_html/unittest/test.css.priority.php
@@ -1,46 +1,46 @@
-runPipeline('
-
-
-
-
-
-
-
-
-');
-
- $cell1 =& $tree->get_element_by_id('cell1');
- $color =& $cell1->getCSSProperty(CSS_BACKGROUND_COLOR);
- $this->assertEqual(1, $color->r);
- $this->assertEqual(0, $color->g);
- $this->assertEqual(0, $color->b);
-
- $cell2 =& $tree->get_element_by_id('cell2');
- $color =& $cell2->getCSSProperty(CSS_BACKGROUND_COLOR);
- $this->assertEqual(0, $color->r);
- $this->assertEqual(1, $color->g);
- $this->assertEqual(0, $color->b);
-
- $cell3 =& $tree->get_element_by_id('cell3');
- $color =& $cell3->getCSSProperty(CSS_BACKGROUND_COLOR);
- $this->assertEqual(0, $color->r);
- $this->assertEqual(0, $color->g);
- $this->assertEqual(1, $color->b);
- }
-}
-
+runPipeline('
+
+
+
+
+
+
+
+
+');
+
+ $cell1 =& $tree->get_element_by_id('cell1');
+ $color =& $cell1->getCSSProperty(CSS_BACKGROUND_COLOR);
+ $this->assertEqual(1, $color->r);
+ $this->assertEqual(0, $color->g);
+ $this->assertEqual(0, $color->b);
+
+ $cell2 =& $tree->get_element_by_id('cell2');
+ $color =& $cell2->getCSSProperty(CSS_BACKGROUND_COLOR);
+ $this->assertEqual(0, $color->r);
+ $this->assertEqual(1, $color->g);
+ $this->assertEqual(0, $color->b);
+
+ $cell3 =& $tree->get_element_by_id('cell3');
+ $color =& $cell3->getCSSProperty(CSS_BACKGROUND_COLOR);
+ $this->assertEqual(0, $color->r);
+ $this->assertEqual(0, $color->g);
+ $this->assertEqual(1, $color->b);
+ }
+}
+
?>
\ No newline at end of file
diff --git a/public_html/unittest/test.font.inherit.php b/public_html/unittest/test.font.inherit.php
index 5fd1e86..8b3fb45 100644
--- a/public_html/unittest/test.font.inherit.php
+++ b/public_html/unittest/test.font.inherit.php
@@ -21,8 +21,8 @@ function testInheritEM() {
');
- $outer_div = $tree->get_element_by_id('outer');
- $inner_div = $tree->get_element_by_id('inner');
+ $outer_div = $tree->getElementById('outer');
+ $inner_div = $tree->getElementById('inner');
$body_font_size = $tree->getCSSProperty(CSS_FONT_SIZE);
$outer_font_size = $outer_div->getCSSProperty(CSS_FONT_SIZE);
@@ -53,8 +53,8 @@ function testEMinEM() {