diff --git a/library/vendor/JShrink/LICENSE b/library/vendor/JShrink/LICENSE index 68caa37c6..c6597d85c 100644 --- a/library/vendor/JShrink/LICENSE +++ b/library/vendor/JShrink/LICENSE @@ -1,24 +1,29 @@ +BSD 3-Clause License + Copyright (c) 2009, Robert Hafner All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Stash Project nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL Robert Hafner BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/library/vendor/JShrink/Minifier.php b/library/vendor/JShrink/Minifier.php index ad8157f17..171a7b6c2 100644 --- a/library/vendor/JShrink/Minifier.php +++ b/library/vendor/JShrink/Minifier.php @@ -243,7 +243,7 @@ class Minifier // do reg check of doom $this->b = $this->getReal(); - if (($this->b == '/' && strpos('(,=:[!&|?', $this->a) !== false)) { + if (($this->b == '/' && strpos('(,=:[!&|?*+-%', $this->a) !== false)) { $this->saveRegex(); } } diff --git a/library/vendor/JShrink/SOURCE b/library/vendor/JShrink/SOURCE index a236ec215..794856288 100644 --- a/library/vendor/JShrink/SOURCE +++ b/library/vendor/JShrink/SOURCE @@ -1,6 +1,6 @@ #!/bin/bash set -eux -VERSION=1.3.1 +VERSION=1.3.2 curl -LsS https://github.com/tedious/JShrink/archive/v"$VERSION".tar.gz -o /tmp/JShrink.tar.gz tar xzf /tmp/JShrink.tar.gz --strip-components 1 JShrink-"$VERSION"/LICENSE tar xzf /tmp/JShrink.tar.gz --strip-components 3 JShrink-"$VERSION"/src/JShrink/Minifier.php diff --git a/library/vendor/Parsedown/Parsedown.php b/library/vendor/Parsedown/Parsedown.php index 87d612ab8..a34b44f0f 100644 --- a/library/vendor/Parsedown/Parsedown.php +++ b/library/vendor/Parsedown/Parsedown.php @@ -17,7 +17,7 @@ class Parsedown { # ~ - const version = '1.7.1'; + const version = '1.7.3'; # ~ @@ -429,7 +429,21 @@ class Parsedown if (isset($matches[1])) { - $class = 'language-'.$matches[1]; + /** + * https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes + * Every HTML element may have a class attribute specified. + * The attribute, if specified, must have a value that is a set + * of space-separated tokens representing the various classes + * that the element belongs to. + * [...] + * The space characters, for the purposes of this specification, + * are U+0020 SPACE, U+0009 CHARACTER TABULATION (tab), + * U+000A LINE FEED (LF), U+000C FORM FEED (FF), and + * U+000D CARRIAGE RETURN (CR). + */ + $language = substr($matches[1], 0, strcspn($matches[1], " \t\n\f\r")); + + $class = 'language-'.$language; $Element['attributes'] = array( 'class' => $class, diff --git a/library/vendor/Parsedown/SOURCE b/library/vendor/Parsedown/SOURCE index ead5e4ec4..4570e917c 100644 --- a/library/vendor/Parsedown/SOURCE +++ b/library/vendor/Parsedown/SOURCE @@ -1,4 +1,4 @@ -RELEASE=1.7.1 +RELEASE=1.7.3 PARSEDOWN=parsedown-$RELEASE curl https://codeload.github.com/erusev/parsedown/tar.gz/${RELEASE} -o ${PARSEDOWN}.tar.gz tar xfz ${PARSEDOWN}.tar.gz --strip-components 1 ${PARSEDOWN}/Parsedown.php ${PARSEDOWN}/LICENSE.txt diff --git a/library/vendor/dompdf/SOURCE b/library/vendor/dompdf/SOURCE index 1cebf923b..b21547113 100644 --- a/library/vendor/dompdf/SOURCE +++ b/library/vendor/dompdf/SOURCE @@ -2,15 +2,13 @@ set -eux #GLOBIGNORE=$0; rm -rf * -#DOMPDF_VERSION=0.8.2 -DOMPDF_VERSION=6a77a427984f97743018ace3e095fbf0edaaee29 # https://github.com/dompdf/dompdf/pull/1854 - +DOMPDF_VERSION=0.8.3 PHP_FONTLIB_VERSION=0.5.1 PHP_SVGLIB_VERSION=0.3.2 rm -rf lib/ src/ -curl -LsS https://github.com/dompdf/dompdf/archive/"$DOMPDF_VERSION".tar.gz -o /tmp/dompdf.tar.gz +curl -LsS https://github.com/dompdf/dompdf/archive/v"$DOMPDF_VERSION".tar.gz -o /tmp/dompdf.tar.gz tar xf /tmp/dompdf.tar.gz --strip-components 1 dompdf-"$DOMPDF_VERSION"/{lib,src,LICENSE.LGPL} rm /tmp/dompdf.tar.gz mv LICENSE.LGPL LICENSE diff --git a/library/vendor/dompdf/lib/Cpdf.php b/library/vendor/dompdf/lib/Cpdf.php index 55ac3d33d..7748d4f15 100644 --- a/library/vendor/dompdf/lib/Cpdf.php +++ b/library/vendor/dompdf/lib/Cpdf.php @@ -464,28 +464,28 @@ class Cpdf // Named with limited valid values case 'NonFullScreenPageMode': if (!in_array($v, array('UseNone', 'UseOutlines', 'UseThumbs', 'UseOC'))) { - continue 2; + break; } $o['info'][$k] = $v; break; case 'Direction': if (!in_array($v, array('L2R', 'R2L'))) { - continue 2; + break; } $o['info'][$k] = $v; break; case 'PrintScaling': if (!in_array($v, array('None', 'AppDefault'))) { - continue 2; + break; } $o['info'][$k] = $v; break; case 'Duplex': if (!in_array($v, array('None', 'AppDefault'))) { - continue 2; + break; } $o['info'][$k] = $v; break; diff --git a/library/vendor/dompdf/lib/res/broken_image.svg b/library/vendor/dompdf/lib/res/broken_image.svg new file mode 100644 index 000000000..09b97e6c3 --- /dev/null +++ b/library/vendor/dompdf/lib/res/broken_image.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/library/vendor/dompdf/src/Adapter/CPDF.php b/library/vendor/dompdf/src/Adapter/CPDF.php index 889eb4da2..d976627b8 100644 --- a/library/vendor/dompdf/src/Adapter/CPDF.php +++ b/library/vendor/dompdf/src/Adapter/CPDF.php @@ -152,7 +152,7 @@ class CPDF implements Canvas private $_page_text; /** - * Array of pages for accesing after rendering is initially complete + * Array of pages for accessing after rendering is initially complete * * @var array */ @@ -275,7 +275,7 @@ class CPDF implements Canvas /** * Opens a new 'object' * - * While an object is open, all drawing actions are recored in the object, + * While an object is open, all drawing actions are recorded in the object, * as opposed to being drawn on the current page. Objects can be added * later to a specific page or to several pages. * diff --git a/library/vendor/dompdf/src/Adapter/PDFLib.php b/library/vendor/dompdf/src/Adapter/PDFLib.php index b07e91b1f..e999c580e 100644 --- a/library/vendor/dompdf/src/Adapter/PDFLib.php +++ b/library/vendor/dompdf/src/Adapter/PDFLib.php @@ -49,14 +49,46 @@ class PDFLib implements Canvas static $IN_MEMORY = true; /** - * @var Dompdf + * Saves the major version of PDFLib for compatibility requests + * + * @var null|int + */ + static private $MAJOR_VERSION = null; + + + /** + * Transforms the list of native fonts into PDFLib compatible names (casesensitive) + * + * @var array + */ + static public $nativeFontsTpPDFLib = array( + "courier" => "Courier", + "courier-bold" => "Courier-Bold", + "courier-oblique" => "Courier-Oblique", + "courier-boldoblique" => "Courier-BoldOblique", + "helvetica" => "Helvetica", + "helvetica-bold" => "Helvetica-Bold", + "helvetica-oblique" => "Helvetica-Oblique", + "helvetica-boldoblique" => "Helvetica-BoldOblique", + "times" => "Times-Roman", + "times-roman" => "Times-Roman", + "times-bold" => "Times-Bold", + "times-italic" => "Times-Italic", + "times-bolditalic" => "Times-BoldItalic", + "symbol" => "Symbol", + "zapfdinbats" => "ZapfDingbats", + "zapfdingbats" => "ZapfDingbats", + ); + + /** + * @var \Dompdf\Dompdf */ private $_dompdf; /** * Instance of PDFLib class * - * @var \PDFlib + * @var \PDFLib */ private $_pdf; @@ -116,6 +148,13 @@ class PDFLib implements Canvas */ private $_fonts; + /** + * Cache of fontFile checks + * + * @var array + */ + private $_fontsFiles; + /** * List of objects (templates) to add to multiple pages * @@ -161,7 +200,7 @@ class PDFLib implements Canvas /** * Class constructor * - * @param mixed $paper The size of paper to use either a string (see {@link Dompdf\Adapter\CPDF::$PAPER_SIZES}) or + * @param string|array $paper The size of paper to use either a string (see {@link Dompdf\Adapter\CPDF::$PAPER_SIZES}) or * an array(xmin,ymin,xmax,ymax) * @param string $orientation The orientation of the document (either 'landscape' or 'portrait') * @param Dompdf $dompdf @@ -170,7 +209,7 @@ class PDFLib implements Canvas { if (is_array($paper)) { $size = $paper; - } else if (isset(self::$PAPER_SIZES[mb_strtolower($paper)])) { + } elseif (isset(self::$PAPER_SIZES[mb_strtolower($paper)])) { $size = self::$PAPER_SIZES[mb_strtolower($paper)]; } else { $size = self::$PAPER_SIZES["letter"]; @@ -189,14 +228,25 @@ class PDFLib implements Canvas $license = $dompdf->getOptions()->getPdflibLicense(); if (strlen($license) > 0) { - $this->_pdf->set_parameter("license", $license); + $this->setPDFLibParameter("license", $license); } - $this->_pdf->set_parameter("textformat", "utf8"); - $this->_pdf->set_parameter("fontwarning", "false"); + $this->setPDFLibParameter("textformat", "utf8"); + if ($this->getPDFLibMajorVersion() >= 7) { + $this->setPDFLibParameter("errorpolicy", "return"); + // $this->_pdf->set_option('logging={filename=' . \APP_PATH . '/logs/pdflib.log classes={api=1 warning=2}}'); + // $this->_pdf->set_option('errorpolicy=exception'); + } else { + $this->setPDFLibParameter("fontwarning", "false"); + } - // TODO: fetch PDFLib version information for the producer field - $this->_pdf->set_info("Producer Addendum", sprintf("%s + PDFLib", $dompdf->version)); + $searchPath = $this->_dompdf->getOptions()->getFontDir(); + if (empty($searchPath) === false) { + $this->_pdf->set_option('searchpath={' . $searchPath . '}'); + } + + // fetch PDFLib version information for the producer field + $this->_pdf->set_info("Producer Addendum", sprintf("%s + PDFLib %s", $dompdf->version, $this->getPDFLibMajorVersion())); // Silence pedantic warnings about missing TZ settings $tz = @date_default_timezone_get(); @@ -291,6 +341,7 @@ class PDFLib implements Canvas $ret = $this->_pdf->begin_template($this->_width, $this->_height); $this->_pdf->save(); $this->_objs[$ret] = array("start_page" => $this->_page_number); + return $ret; } @@ -332,7 +383,7 @@ class PDFLib implements Canvas * - 'nextodd' add to all odd numbered pages from the next one * - 'nexteven' add to all even numbered pages from the next one * - * @param int $object the object handle returned by open_object() + * @param int $object the object handle returned by open_object() * @param string $where */ public function add_object($object, $where = 'all') @@ -453,10 +504,10 @@ class PDFLib implements Canvas /** * Sets the line style * - * @param float $width + * @param float $width * @param $cap * @param string $join - * @param array $dash + * @param array $dash * * @return void */ @@ -466,23 +517,43 @@ class PDFLib implements Canvas $dash[] = $dash[0]; } - if (count($dash) > 1) { - $this->_pdf->setdashpattern("dasharray={" . implode(" ", $dash) . "}"); + if ($this->getPDFLibMajorVersion() >= 9) { + if (count($dash) > 1) { + $this->_pdf->set_graphics_option("dasharray={" . implode(" ", $dash) . "}"); + } else { + $this->_pdf->set_graphics_option("dasharray=none"); + } } else { - $this->_pdf->setdash(0, 0); + if (count($dash) > 1) { + $this->_pdf->setdashpattern("dasharray={" . implode(" ", $dash) . "}"); + } else { + $this->_pdf->setdash(0, 0); + } } switch ($join) { case "miter": - $this->_pdf->setlinejoin(0); + if ($this->getPDFLibMajorVersion() >= 9) { + $this->_pdf->set_graphics_option('linejoin=0'); + } else { + $this->_pdf->setlinejoin(0); + } break; case "round": - $this->_pdf->setlinejoin(1); + if ($this->getPDFLibMajorVersion() >= 9) { + $this->_pdf->set_graphics_option('linejoin=1'); + } else { + $this->_pdf->setlinejoin(1); + } break; case "bevel": - $this->_pdf->setlinejoin(2); + if ($this->getPDFLibMajorVersion() >= 9) { + $this->_pdf->set_graphics_option('linejoin=2'); + } else { + $this->_pdf->setlinejoin(2); + } break; default: @@ -491,15 +562,27 @@ class PDFLib implements Canvas switch ($cap) { case "butt": - $this->_pdf->setlinecap(0); + if ($this->getPDFLibMajorVersion() >= 9) { + $this->_pdf->set_graphics_option('linecap=0'); + } else { + $this->_pdf->setlinecap(0); + } break; case "round": - $this->_pdf->setlinecap(1); + if ($this->getPDFLibMajorVersion() >= 9) { + $this->_pdf->set_graphics_option('linecap=1'); + } else { + $this->_pdf->setlinecap(1); + } break; case "square": - $this->_pdf->setlinecap(2); + if ($this->getPDFLibMajorVersion() >= 9) { + $this->_pdf->set_graphics_option('linecap=2'); + } else { + $this->_pdf->setlinecap(2); + } break; default: @@ -583,7 +666,7 @@ class PDFLib implements Canvas */ public function _set_fill_opacity($opacity, $mode = "Normal") { - if ($mode === "Normal") { + if ($mode === "Normal" && is_null($opacity) === false) { $this->_set_gstate("opacityfill=$opacity"); } } @@ -596,7 +679,7 @@ class PDFLib implements Canvas */ public function _set_stroke_opacity($opacity, $mode = "Normal") { - if ($mode === "Normal") { + if ($mode === "Normal" && is_null($opacity) === false) { $this->_set_gstate("opacitystroke=$opacity"); } } @@ -609,7 +692,7 @@ class PDFLib implements Canvas */ public function set_opacity($opacity, $mode = "Normal") { - if ($mode === "Normal") { + if ($mode === "Normal" && is_null($opacity) === false) { $this->_set_gstate("opacityfill=$opacity opacitystroke=$opacity"); $this->_current_opacity = $opacity; } @@ -627,6 +710,7 @@ class PDFLib implements Canvas $gstate = $this->_pdf->create_gstate($gstate_options); $this->_gstates[$gstate] = $gstate_options; } + return $this->_pdf->set_gstate($gstate); } @@ -644,7 +728,7 @@ class PDFLib implements Canvas * fitwindow Fit the complete page to the window. * fixed */ - //$this->_pdf->set_parameter("openaction", $view); + //$this->setPDFLibParameter("openaction", $view); } /** @@ -658,48 +742,17 @@ class PDFLib implements Canvas */ protected function _load_font($font, $encoding = null, $options = "") { - // Set up font paths - if ($this->_pdf->get_parameter("FontOutline", 1) === "") { - $families = $this->_dompdf->getFontMetrics()->getFontFamilies(); - foreach ($families as $files) { - foreach ($files as $file) { - $face = basename($file); - $afm = null; - - // Prefer ttfs to afms - if (file_exists("$file.ttf")) { - $outline = "$file.ttf"; - - } else if (file_exists("$file.TTF")) { - $outline = "$file.TTF"; - - } else if (file_exists("$file.pfb")) { - $outline = "$file.pfb"; - if (file_exists("$file.afm")) { - $afm = "$file.afm"; - } - - } else if (file_exists("$file.PFB")) { - $outline = "$file.PFB"; - if (file_exists("$file.AFM")) { - $afm = "$file.AFM"; - } - } else { - continue; - } - - $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}"); - - if (!is_null($afm)) { - $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}"); - } - } - } + // Fix for PDFLibs case-sensitive font names + $baseFont = basename($font); + $isNativeFont = false; + if (isset(self::$nativeFontsTpPDFLib[$baseFont])) { + $font = self::$nativeFontsTpPDFLib[$baseFont]; + $isNativeFont = true; } // Check if the font is a native PDF font // Embed non-native fonts - $test = strtolower(basename($font)); + $test = strtolower($baseFont); if (in_array($test, DOMPDF::$nativeFonts)) { $font = basename($font); } else { @@ -718,13 +771,71 @@ class PDFLib implements Canvas } $key = "$font:$encoding:$options"; - if (isset($this->_fonts[$key])) { return $this->_fonts[$key]; - } else { + } + + // Native fonts are build in, just load it + if ($isNativeFont) { $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options); + return $this->_fonts[$key]; } + + $fontOutline = $this->getPDFLibParameter("FontOutline", 1); + if ($fontOutline === "" || $fontOutline <= 0) { + $families = $this->_dompdf->getFontMetrics()->getFontFamilies(); + foreach ($families as $files) { + foreach ($files as $file) { + $face = basename($file); + $afm = null; + + if (isset($this->_fontsFiles[$face])) { + continue; + } + + // Prefer ttfs to afms + if (file_exists("$file.ttf")) { + $outline = "$file.ttf"; + } elseif (file_exists("$file.TTF")) { + $outline = "$file.TTF"; + } elseif (file_exists("$file.pfb")) { + $outline = "$file.pfb"; + if (file_exists("$file.afm")) { + $afm = "$file.afm"; + } + } elseif (file_exists("$file.PFB")) { + $outline = "$file.PFB"; + if (file_exists("$file.AFM")) { + $afm = "$file.AFM"; + } + } else { + continue; + } + + $this->_fontsFiles[$face] = true; + + if ($this->getPDFLibMajorVersion() >= 9) { + $this->setPDFLibParameter("FontOutline", '{' . "$face=$outline" . '}'); + } else { + $this->setPDFLibParameter("FontOutline", "\{$face\}=\{$outline\}"); + } + + if (is_null($afm)) { + continue; + } + if ($this->getPDFLibMajorVersion() >= 9) { + $this->setPDFLibParameter("FontAFM", '{' . "$face=$afm" . '}'); + } else { + $this->setPDFLibParameter("FontAFM", "\{$face\}=\{$afm\}"); + } + } + } + } + + $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options); + + return $this->_fonts[$key]; } /** @@ -759,7 +870,7 @@ class PDFLib implements Canvas $this->_pdf->lineto($x2, $y2); $this->_pdf->stroke(); - $this->_set_line_transparency("Normal", $this->_current_opacity); + $this->_set_stroke_opacity($this->_current_opacity, "Normal"); } /** @@ -802,7 +913,7 @@ class PDFLib implements Canvas $this->_pdf->arc($x1, $y1, $r1, $astart, $aend); $this->_pdf->stroke(); - $this->_set_line_transparency("Normal", $this->_current_opacity); + $this->_set_stroke_opacity($this->_current_opacity, "Normal"); } /** @@ -812,7 +923,7 @@ class PDFLib implements Canvas * @param float $h * @param array $color * @param float $width - * @param null $style + * @param null $style */ public function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) { @@ -824,7 +935,7 @@ class PDFLib implements Canvas $this->_pdf->rect($x1, $y1, $w, $h); $this->_pdf->stroke(); - $this->_set_line_transparency("Normal", $this->_current_opacity); + $this->_set_stroke_opacity($this->_current_opacity, "Normal"); } /** @@ -843,7 +954,7 @@ class PDFLib implements Canvas $this->_pdf->rect(floatval($x1), floatval($y1), floatval($w), floatval($h)); $this->_pdf->fill(); - $this->_set_fill_transparency("Normal", $this->_current_opacity); + $this->_set_fill_opacity($this->_current_opacity, "Normal"); } /** @@ -874,7 +985,6 @@ class PDFLib implements Canvas */ public function clipping_roundrectangle($x1, $y1, $w, $h, $rTL, $rTR, $rBR, $rBL) { - // @todo $this->clipping_rectangle($x1, $y1, $w, $h); } @@ -965,9 +1075,9 @@ class PDFLib implements Canvas /** * @param array $points * @param array $color - * @param null $width - * @param null $style - * @param bool $fill + * @param null $width + * @param null $style + * @param bool $fill */ public function polygon($points, $color, $width = null, $style = null, $fill = false) { @@ -994,8 +1104,8 @@ class PDFLib implements Canvas $this->_pdf->closepath_stroke(); } - $this->_set_fill_transparency("Normal", $this->_current_opacity); - $this->_set_line_transparency("Normal", $this->_current_opacity); + $this->_set_fill_opacity($this->_current_opacity, "Normal"); + $this->_set_stroke_opacity($this->_current_opacity, "Normal"); } /** @@ -1003,9 +1113,9 @@ class PDFLib implements Canvas * @param float $y * @param float $r * @param array $color - * @param null $width - * @param null $style - * @param bool $fill + * @param null $width + * @param null $style + * @param bool $fill */ public function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) { @@ -1026,16 +1136,16 @@ class PDFLib implements Canvas $this->_pdf->stroke(); } - $this->_set_fill_transparency("Normal", $this->_current_opacity); - $this->_set_line_transparency("Normal", $this->_current_opacity); + $this->_set_fill_opacity($this->_current_opacity, "Normal"); + $this->_set_stroke_opacity($this->_current_opacity, "Normal"); } /** * @param string $img_url - * @param float $x - * @param float $y - * @param int $w - * @param int $h + * @param float $x + * @param float $y + * @param int $w + * @param int $h * @param string $resolution */ public function image($img_url, $x, $y, $w, $h, $resolution = "normal") @@ -1056,15 +1166,15 @@ class PDFLib implements Canvas } /** - * @param float $x - * @param float $y + * @param float $x + * @param float $y * @param string $text * @param string $font - * @param float $size - * @param array $color - * @param int $word_spacing - * @param int $char_spacing - * @param int $angle + * @param float $size + * @param array $color + * @param int $word_spacing + * @param int $char_spacing + * @param int $angle */ public function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $word_spacing = 0, $char_spacing = 0, $angle = 0) { @@ -1081,7 +1191,7 @@ class PDFLib implements Canvas $this->_pdf->fit_textline($text, $x, $y, "rotate=$angle wordspacing=$word_spacing charspacing=$char_spacing "); - $this->_set_fill_transparency("Normal", $this->_current_opacity); + $this->_set_fill_opacity($this->_current_opacity, "Normal"); } /** @@ -1107,11 +1217,11 @@ class PDFLib implements Canvas /** * Add a link to the pdf * - * @param string $url The url to link to - * @param float $x The x position of the link - * @param float $y The y position of the link - * @param float $width The width of the link - * @param float $height The height of the link + * @param string $url The url to link to + * @param float $x The x position of the link + * @param float $y The y position of the link + * @param float $width The width of the link + * @param float $height The height of the link */ public function add_link($url, $x, $y, $width, $height) { @@ -1140,9 +1250,9 @@ class PDFLib implements Canvas /** * @param string $text * @param string $font - * @param float $size - * @param int $word_spacing - * @param int $letter_spacing + * @param float $size + * @param int $word_spacing + * @param int $letter_spacing * @return mixed */ public function get_text_width($text, $font, $size, $word_spacing = 0, $letter_spacing = 0) @@ -1163,7 +1273,7 @@ class PDFLib implements Canvas /** * @param string $font - * @param float $size + * @param float $size * @return float */ public function get_font_height($font, $size) @@ -1177,17 +1287,19 @@ class PDFLib implements Canvas // $desc is usually < 0, $ratio = $this->_dompdf->getOptions()->getFontHeightRatio(); + return $size * ($asc - $desc) * $ratio; } /** * @param string $font - * @param float $size + * @param float $size * @return float */ public function get_font_baseline($font, $size) { $ratio = $this->_dompdf->getOptions()->getFontHeightRatio(); + return $this->get_font_height($font, $size) / $ratio * 1.1; } @@ -1199,15 +1311,15 @@ class PDFLib implements Canvas * * See {@link Style::munge_color()} for the format of the color array. * - * @param float $x - * @param float $y - * @param string $text the text to write - * @param string $font the font file to use - * @param float $size the font size, in points - * @param array $color - * @param float $word_space word spacing adjustment - * @param float $char_space char spacing adjustment - * @param float $angle angle to write the text at, measured CW starting from the x-axis + * @param float $x + * @param float $y + * @param string $text the text to write + * @param string $font the font file to use + * @param float $size the font size, in points + * @param array $color + * @param float $word_space word spacing adjustment + * @param float $char_space char spacing adjustment + * @param float $angle angle to write the text at, measured CW starting from the x-axis */ public function page_text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $word_space = 0.0, $char_space = 0.0, $angle = 0.0) { @@ -1296,7 +1408,7 @@ class PDFLib implements Canvas * Streams the PDF to the client. * * @param string $filename The filename to present to the client. - * @param array $options Associative array: 'compress' => 1 or 0 (default 1); 'Attachment' => 1 or 0 (default 1). + * @param array $options Associative array: 'compress' => 1 or 0 (default 1); 'Attachment' => 1 or 0 (default 1). * @throws Exception */ public function stream($filename = "document.pdf", $options = array()) @@ -1305,15 +1417,19 @@ class PDFLib implements Canvas die("Unable to stream pdf: headers already sent"); } - if (!isset($options["compress"])) $options["compress"] = true; - if (!isset($options["Attachment"])) $options["Attachment"] = true; + if (!isset($options["compress"])) { + $options["compress"] = true; + } + if (!isset($options["Attachment"])) { + $options["Attachment"] = true; + } $this->_add_page_text(); if ($options["compress"]) { - $this->_pdf->set_value("compress", 6); + $this->setPDFLibValue("compress", 6); } else { - $this->_pdf->set_value("compress", 0); + $this->setPDFLibValue("compress", 0); } $this->_close(); @@ -1372,14 +1488,16 @@ class PDFLib implements Canvas */ public function output($options = array()) { - if (!isset($options["compress"])) $options["compress"] = true; + if (!isset($options["compress"])) { + $options["compress"] = true; + } $this->_add_page_text(); if ($options["compress"]) { - $this->_pdf->set_value("compress", 6); + $this->setPDFLibValue("compress", 6); } else { - $this->_pdf->set_value("compress", 0); + $this->setPDFLibValue("compress", 0); } $this->_close(); @@ -1402,6 +1520,78 @@ class PDFLib implements Canvas return $data; } + + /** + * @param string $keyword + * @param string $optlist + * @return mixed + */ + protected function getPDFLibParameter($keyword, $optlist = "") + { + if ($this->getPDFLibMajorVersion() >= 9) { + return $this->_pdf->get_option($keyword, ""); + } + + return $this->_pdf->get_parameter($keyword, $optlist); + } + + /** + * @param string $keyword + * @param string $value + * @return mixed + */ + protected function setPDFLibParameter($keyword, $value) + { + if ($this->getPDFLibMajorVersion() >= 9) { + return $this->_pdf->set_option($keyword . "=" . $value); + } + + return $this->_pdf->set_parameter($keyword, $value); + } + + /** + * @param string $keyword + * @param string $optlist + * @return mixed + */ + protected function getPDFLibValue($keyword, $optlist = "") + { + if ($this->getPDFLibMajorVersion() >= 9) { + return $this->getPDFLibParameter($keyword, $optlist); + } + + return $this->_pdf->get_value($keyword); + } + + /** + * @param string $keyword + * @param string $value + * @return mixed + */ + protected function setPDFLibValue($keyword, $value) + { + if ($this->getPDFLibMajorVersion() >= 9) { + return $this->setPDFLibParameter($keyword, $value); + } + + return $this->_pdf->set_value($keyword, $value); + } + + /** + * @return int + */ + private function getPDFLibMajorVersion() + { + if (is_null(self::$MAJOR_VERSION)) { + if (method_exists($this->_pdf, "get_option")) { + self::$MAJOR_VERSION = abs(intval($this->_pdf->get_option("major", ""))); + } else { + self::$MAJOR_VERSION = abs(intval($this->_pdf->get_value("major", ""))); + } + } + + return self::$MAJOR_VERSION; + } } // Workaround for idiotic limitation on statics... diff --git a/library/vendor/dompdf/src/CanvasFactory.php b/library/vendor/dompdf/src/CanvasFactory.php index d9d22bed0..b2bf1276a 100644 --- a/library/vendor/dompdf/src/CanvasFactory.php +++ b/library/vendor/dompdf/src/CanvasFactory.php @@ -46,7 +46,7 @@ class CanvasFactory } else { - if ($backend === "gd") { + if ($backend === "gd" && extension_loaded('gd')) { $class = "Dompdf\\Adapter\\GD"; } else { $class = "Dompdf\\Adapter\\CPDF"; diff --git a/library/vendor/dompdf/src/Css/Style.php b/library/vendor/dompdf/src/Css/Style.php index 42327abbf..96ac5d42b 100644 --- a/library/vendor/dompdf/src/Css/Style.php +++ b/library/vendor/dompdf/src/Css/Style.php @@ -776,7 +776,7 @@ class Style * For easier finding all assignments, attempted to allowing only explicite assignment: * Very many uses, e.g. AbstractFrameReflower.php -> for now leave as it is * function __set($prop, $val) { - * throw new Exception("Implicite replacement of assignment by __set. Not good."); + * throw new Exception("Implicit replacement of assignment by __set. Not good."); * } * function props_set($prop, $val) { ... } * @@ -1590,7 +1590,7 @@ class Style Only for combined attributes extra treatment needed. See below. div { border: 1px red; } - div { border: solid; } // Not combined! Only one occurence of same style per context + div { border: solid; } // Not combined! Only one occurrence of same style per context // div { border: 1px red; } div a { border: solid; } // Adding to border style ok by inheritance @@ -1608,13 +1608,13 @@ class Style At individual property like border-top-width need to check whether overriding value is also !important. Also store the !important condition for later overrides. Since not known who is initiating the override, need to get passed !important as parameter. - !important Paramter taken as in the original style in the css file. + !important Parameter taken as in the original style in the css file. When property border !important given, do not mark subsets like border_style as important. Only individual properties. Note: Setting individual property directly from css with e.g. set_border_top_style() is not needed, because - missing set funcions handled by a generic handler __set(), including the !important. + missing set functions handled by a generic handler __set(), including the !important. Setting individual property of as sub-property is handled below. Implementation see at _set_style_side_type() @@ -1969,7 +1969,7 @@ class Style * * Other than with border and list, existing partial attributes should * reset when starting here, even when not mentioned. - * If individual attribute is !important and explicite or implicite replacement is not, + * If individual attribute is !important and explicit or implicit replacement is not, * keep individual attribute * * require whitespace as delimiters for single value attributes @@ -1978,7 +1978,7 @@ class Style * font-style, font-variant, font-weight, font-size, line-height, font-family * * missing font-size and font-family might be not allowed, but accept it here and - * use default (medium size, enpty font name) + * use default (medium size, empty font name) * * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style * @param $val @@ -2172,7 +2172,7 @@ class Style // FIXME: handle partial values - //For consistency of individal and combined properties, and with ie8 and firefox3 + //For consistency of individual and combined properties, and with ie8 and firefox3 //reset all attributes, even if only partially given $this->_set_style_side_type('border', $side, '_style', self::$_defaults['border_' . $side . '_style'], $important); $this->_set_style_side_type('border', $side, '_width', self::$_defaults['border_' . $side . '_width'], $important); @@ -2544,7 +2544,7 @@ class Style //On setting or merging or inheriting list_style_image as well as list_style_type, //and url exists, then url has precedence, otherwise fall back to list_style_type - //Firefox is wrong here (list_style_image gets overwritten on explicite list_style_type) + //Firefox is wrong here (list_style_image gets overwritten on explicit list_style_type) //Internet Explorer 7/8 and dompdf is right. if (mb_substr($value, 0, 3) === "url") { diff --git a/library/vendor/dompdf/src/Css/Stylesheet.php b/library/vendor/dompdf/src/Css/Stylesheet.php index d981e2efd..9d1a1ecee 100644 --- a/library/vendor/dompdf/src/Css/Stylesheet.php +++ b/library/vendor/dompdf/src/Css/Stylesheet.php @@ -172,8 +172,12 @@ class Stylesheet $this->setFontMetrics($dompdf->getFontMetrics()); $this->_styles = array(); $this->_loaded_files = array(); - list($this->_protocol, $this->_base_host, $this->_base_path) = Helpers::explode_url($_SERVER["SCRIPT_FILENAME"]); - $this->_page_styles = array("base" => null); + $script = __FILE__; + if(isset($_SERVER["SCRIPT_FILENAME"])){ + $script = $_SERVER["SCRIPT_FILENAME"]; + } + list($this->_protocol, $this->_base_host, $this->_base_path) = Helpers::explode_url($script); + $this->_page_styles = array("base" => new Style($this)); } /** @@ -281,7 +285,7 @@ class Stylesheet } /** - * lookup a specifc Style collection + * lookup a specific Style collection * * lookup() returns the Style collection specified by $key, or null if the Style is * not found. @@ -441,7 +445,7 @@ class Stylesheet * @param bool $first_pass * * @throws Exception - * @return string + * @return array */ private function _css_selector_to_xpath($selector, $first_pass = false) { @@ -566,7 +570,7 @@ class Stylesheet break; case "+": - // All sibling elements that folow the current token + // All sibling elements that follow the current token if (mb_substr($query, -1, 1) !== "/") { $query .= "/"; } @@ -1261,7 +1265,7 @@ class Stylesheet throw new Exception("Error parsing css file: preg_match_all() failed."); } - // After matching, the array indicies are set as follows: + // After matching, the array indices are set as follows: // // [0] => complete text of match // [1] => contains '@import ...;' or '@media {' if applicable @@ -1357,7 +1361,7 @@ class Stylesheet $key = $page_selector; default: - continue 3; + break 2; } // Store the style for later... @@ -1556,7 +1560,7 @@ class Stylesheet foreach ($properties as $prop) { // If the $prop contains an url, the regex may be wrong - // @todo: fix the regex so that it works everytime + // @todo: fix the regex so that it works every time /*if (strpos($prop, "url(") === false) { if (preg_match("/([a-z-]+)\s*:\s*[^:]+$/i", $prop, $m)) $prop = $m[0]; @@ -1726,4 +1730,4 @@ class Stylesheet return $str; } -} \ No newline at end of file +} diff --git a/library/vendor/dompdf/src/Dompdf.php b/library/vendor/dompdf/src/Dompdf.php index af06fbeb5..90d26ae22 100644 --- a/library/vendor/dompdf/src/Dompdf.php +++ b/library/vendor/dompdf/src/Dompdf.php @@ -107,7 +107,7 @@ class Dompdf /** * Desired paper size ('letter', 'legal', 'A4', etc.) * - * @var string + * @var string|array */ private $paperSize; @@ -273,6 +273,11 @@ class Dompdf { mb_internal_encoding('UTF-8'); + if (version_compare(PHP_VERSION, '7.0.0') >= 0) + { + ini_set('pcre.jit', 0); + } + if (isset($options) && $options instanceof Options) { $this->setOptions($options); } elseif (is_array($options)) { @@ -397,8 +402,8 @@ class Dompdf } /** - * @param $str - * @param null $encoding + * @param string $str + * @param string $encoding * @deprecated */ public function load_html($str, $encoding = 'UTF-8') @@ -607,7 +612,7 @@ class Dompdf if (!$accept) { //found at least one mediatype, but none of the accepted ones //Skip this css file. - continue 2; + break; } } @@ -628,7 +633,7 @@ class Dompdf ($media = $tag->getAttribute("media")) && !in_array($media, $acceptedmedia) ) { - continue 2; + break; } $css = ""; @@ -1030,7 +1035,7 @@ class Dompdf /** * Sets the paper size & orientation * - * @param string $size 'letter', 'legal', 'A4', etc. {@link Dompdf\Adapter\CPDF::$PAPER_SIZES} + * @param string|array $size 'letter', 'legal', 'A4', etc. {@link Dompdf\Adapter\CPDF::$PAPER_SIZES} * @param string $orientation 'portrait' or 'landscape' * @return $this */ diff --git a/library/vendor/dompdf/src/FontMetrics.php b/library/vendor/dompdf/src/FontMetrics.php index 0266e589e..712bd0acc 100644 --- a/library/vendor/dompdf/src/FontMetrics.php +++ b/library/vendor/dompdf/src/FontMetrics.php @@ -125,7 +125,7 @@ class FontMetrics $fontDir = $this->getOptions()->getFontDir(); $rootDir = $this->getOptions()->getRootDir(); - // FIXME: tempoarary define constants for cache files <= v0.6.2 + // FIXME: temporarily define constants for cache files <= v0.6.2 if (!defined("DOMPDF_DIR")) { define("DOMPDF_DIR", $rootDir); } if (!defined("DOMPDF_FONT_DIR")) { define("DOMPDF_FONT_DIR", $fontDir); } @@ -186,7 +186,6 @@ class FontMetrics $fontDir = $this->getOptions()->getFontDir(); $remoteHash = md5($remoteFile); $localFile = $fontDir . DIRECTORY_SEPARATOR . $remoteHash; - $localTempFile = @tempnam($this->options->get("tempDir"), "dompdf-font-"); $cacheEntry = $localFile; $localFile .= ".".strtolower(pathinfo(parse_url($remoteFile, PHP_URL_PATH),PATHINFO_EXTENSION)); @@ -198,6 +197,8 @@ class FontMetrics if (false === $remoteFileContent) { return false; } + + $localTempFile = @tempnam($this->options->get("tempDir"), "dompdf-font-"); file_put_contents($localTempFile, $remoteFileContent); $font = Font::load($localTempFile); diff --git a/library/vendor/dompdf/src/Frame.php b/library/vendor/dompdf/src/Frame.php index 0a3061b4a..31ea00a1f 100644 --- a/library/vendor/dompdf/src/Frame.php +++ b/library/vendor/dompdf/src/Frame.php @@ -148,7 +148,7 @@ class Frame protected $_is_cache = array(); /** - * Tells wether the frame was already pushed to the next page + * Tells whether the frame was already pushed to the next page * * @var bool */ @@ -160,7 +160,7 @@ class Frame public $_float_next_line = false; /** - * Tells wether the frame was split + * Tells whether the frame was split * * @var bool */ diff --git a/library/vendor/dompdf/src/Frame/FrameTree.php b/library/vendor/dompdf/src/Frame/FrameTree.php index 5d53b1678..1d2585439 100644 --- a/library/vendor/dompdf/src/Frame/FrameTree.php +++ b/library/vendor/dompdf/src/Frame/FrameTree.php @@ -22,7 +22,7 @@ use Dompdf\Frame; * * The FrameTree consists of {@link Frame} objects each tied to specific * DOMNode objects in a specific DomDocument. The FrameTree has the same - * structure as the DomDocument, but adds additional capabalities for + * structure as the DomDocument, but adds additional capabilities for * styling and layout. * * @package dompdf @@ -90,7 +90,7 @@ class FrameTree } /** - * Returns the DOMDocument object representing the curent html document + * Returns the DOMDocument object representing the current html document * * @return DOMDocument */ diff --git a/library/vendor/dompdf/src/FrameDecorator/AbstractFrameDecorator.php b/library/vendor/dompdf/src/FrameDecorator/AbstractFrameDecorator.php index b3c4db534..777fc3ce8 100644 --- a/library/vendor/dompdf/src/FrameDecorator/AbstractFrameDecorator.php +++ b/library/vendor/dompdf/src/FrameDecorator/AbstractFrameDecorator.php @@ -83,7 +83,7 @@ abstract class AbstractFrameDecorator extends Frame private $_positionned_parent; /** - * Cache for the get_parent wehile loop results + * Cache for the get_parent while loop results * * @var Frame */ @@ -438,6 +438,7 @@ abstract class AbstractFrameDecorator extends Frame } /** + * @param bool $use_cache * @return AbstractFrameDecorator */ function get_parent($use_cache = true) diff --git a/library/vendor/dompdf/src/FrameDecorator/ListBullet.php b/library/vendor/dompdf/src/FrameDecorator/ListBullet.php index 42ef7b96a..5b2311886 100644 --- a/library/vendor/dompdf/src/FrameDecorator/ListBullet.php +++ b/library/vendor/dompdf/src/FrameDecorator/ListBullet.php @@ -48,7 +48,7 @@ class ListBullet extends AbstractFrameDecorator return 0; } - return $style->get_font_size() * self::BULLET_SIZE + 2 * self::BULLET_PADDING; + return $style->font_size * self::BULLET_SIZE + 2 * self::BULLET_PADDING; } /** @@ -64,7 +64,7 @@ class ListBullet extends AbstractFrameDecorator return 0; } - return $style->get_font_size() * self::BULLET_SIZE + 2 * self::BULLET_PADDING; + return $style->font_size * self::BULLET_SIZE + 2 * self::BULLET_PADDING; } /** diff --git a/library/vendor/dompdf/src/FrameDecorator/Page.php b/library/vendor/dompdf/src/FrameDecorator/Page.php index 8f4139075..39921aba8 100644 --- a/library/vendor/dompdf/src/FrameDecorator/Page.php +++ b/library/vendor/dompdf/src/FrameDecorator/Page.php @@ -169,7 +169,6 @@ class Page extends AbstractFrameDecorator */ function check_forced_page_break(Frame $frame) { - // Skip check if page is already split if ($this->_page_full) { return null; @@ -195,9 +194,10 @@ class Page extends AbstractFrameDecorator // Prevent cascading splits $frame->split(null, true); // We have to grab the style again here because split() resets - // $frame->style to the frame's orignal style. + // $frame->style to the frame's original style. $frame->get_style()->page_break_before = "auto"; $this->_page_full = true; + $frame->_already_pushed = true; return true; } @@ -207,6 +207,7 @@ class Page extends AbstractFrameDecorator $frame->split(null, true); $prev->get_style()->page_break_after = "auto"; $this->_page_full = true; + $frame->_already_pushed = true; return true; } @@ -217,6 +218,7 @@ class Page extends AbstractFrameDecorator $frame->split(null, true); $prev_last_child->get_style()->page_break_after = "auto"; $this->_page_full = true; + $frame->_already_pushed = true; return true; } @@ -235,6 +237,10 @@ class Page extends AbstractFrameDecorator * break occurs here, the used values of the relevant * 'margin-top' and 'margin-bottom' properties are set to '0'. * 2. Between line boxes inside a block box. + * 3. Between the content edge of a block container box and the + * outer edges of its child content (margin edges of block-level + * children or line box edges for inline-level children) if there + * is a (non-zero) gap between them. * * These breaks are subject to the following rules: * @@ -284,7 +290,7 @@ class Page extends AbstractFrameDecorator if (in_array($display, $block_types)) { // Avoid breaks within table-cells - if ($this->_in_table) { + if ($this->_in_table > ($display === "table" ? 1 : 0)) { Helpers::dompdf_debug("page-break", "In table: " . $this->_in_table); return false; @@ -330,10 +336,14 @@ class Page extends AbstractFrameDecorator return false; } - // If the frame is the first block-level frame, use the value from - // $frame's parent instead. + // If the frame is the first block-level frame, only allow a page + // break if there is a (non-zero) gap between the frame and its + // parent if (!$prev && $parent) { - return $this->_page_break_allowed($parent); + Helpers::dompdf_debug("page-break", "First block level frame, checking gap"); + + return $frame->get_style()->length_in_pt($frame->get_style()->margin_top) != 0 + || $parent->get_style()->length_in_pt($parent->get_style()->padding_top) != 0; } Helpers::dompdf_debug("page-break", "block: break allowed"); @@ -414,7 +424,7 @@ class Page extends AbstractFrameDecorator $p = $p->find_block_parent(); } - // Avoid breaking after the first row of a table + // Avoid breaking before the first row of a table if ($table && $table->get_first_child() === $frame || $table->get_first_child()->get_first_child() === $frame) { Helpers::dompdf_debug("page-break", "table: first-row"); @@ -459,27 +469,10 @@ class Page extends AbstractFrameDecorator */ function check_page_break(Frame $frame) { - //FIXME: should not need to do this since we're tracking table status in `$this->_in_table` - $p = $frame; - $in_table = false; - while ($p) { - if ($p->is_table()) { $in_table = true; break; } - $p = $p->get_parent(); - } - // Do not split if we have already or if the frame was already - // pushed to the next page (prevents infinite loops) - if ($in_table) { - if ($this->_page_full && $frame->_already_pushed) { - return false; - } - } elseif ($this->_page_full || $frame->_already_pushed) { + if ($this->_page_full || $frame->_already_pushed) { return false; } - //FIXME: work-around for infinite loop due to tables - if ($in_table && $frame->_already_pushed) { - return false; - } $p = $frame; do { $display = $p->get_style()->display; @@ -488,22 +481,12 @@ class Page extends AbstractFrameDecorator } } while ($p = $p->get_parent()); - // If the frame is absolute of fixed it shouldn't break + // If the frame is absolute or fixed it shouldn't break $p = $frame; do { if ($p->is_absolute()) { return false; } - - // FIXME If the row is taller than the page and - // if it the first of the page, we don't break - $display = $p->get_style()->display; - if ($display === "table-row" - && !$p->get_prev_sibling() - && $p->get_margin_height() > $this->get_margin_height() - ) { - return false; - } } while ($p = $p->get_parent()); $margin_height = $frame->get_margin_height(); @@ -519,7 +502,6 @@ class Page extends AbstractFrameDecorator $p = $p->get_parent(); } - // Check if $frame flows off the page if ($max_y <= $this->_bottom_page_margin) { // no: do nothing @@ -532,6 +514,7 @@ class Page extends AbstractFrameDecorator // yes: determine page break location $iter = $frame; $flg = false; + $pushed_flg = false; $in_table = $this->_in_table; @@ -544,11 +527,14 @@ class Page extends AbstractFrameDecorator break; } - if ($this->_page_break_allowed($iter)) { + if ($iter->_already_pushed) { + $pushed_flg = true; + } elseif ($this->_page_break_allowed($iter)) { Helpers::dompdf_debug("page-break", "break allowed, splitting."); $iter->split(null, true); $this->_page_full = true; $this->_in_table = $in_table; + $iter->_already_pushed = true; $frame->_already_pushed = true; return true; @@ -562,9 +548,15 @@ class Page extends AbstractFrameDecorator } $iter = $next; + $pushed_flg = false; continue; } + if ($pushed_flg) { + // The frame was already pushed, avoid breaking on a previous page + break; + } + if ($next = $iter->get_prev_sibling()) { Helpers::dompdf_debug("page-break", "following prev sibling."); @@ -608,6 +600,7 @@ class Page extends AbstractFrameDecorator if ($iter) { $iter->split(null, true); + $iter->_already_pushed = true; } else { return false; } diff --git a/library/vendor/dompdf/src/FrameReflower/AbstractFrameReflower.php b/library/vendor/dompdf/src/FrameReflower/AbstractFrameReflower.php index 48e66a74c..946d0969e 100644 --- a/library/vendor/dompdf/src/FrameReflower/AbstractFrameReflower.php +++ b/library/vendor/dompdf/src/FrameReflower/AbstractFrameReflower.php @@ -116,7 +116,7 @@ abstract class AbstractFrameReflower } // Collapse our first child's margin, if there is no border or padding - if ($style->get_border_top_width() == 0 && $style->length_in_pt($style->padding_top) == 0) { + if ($style->border_top_width == 0 && $style->length_in_pt($style->padding_top) == 0) { $f = $this->_frame->get_first_child(); if ( $f && !$f->is_block() && !$f->is_table() ) { while ( $f = $f->get_next_sibling() ) { @@ -143,7 +143,7 @@ abstract class AbstractFrameReflower } // Collapse our last child's margin, if there is no border or padding - if ($style->get_border_bottom_width() == 0 && $style->length_in_pt($style->padding_bottom) == 0) { + if ($style->border_bottom_width == 0 && $style->length_in_pt($style->padding_bottom) == 0) { $l = $this->_frame->get_last_child(); if ( $l && !$l->is_block() && !$l->is_table() ) { while ( $l = $l->get_prev_sibling() ) { @@ -398,7 +398,7 @@ abstract class AbstractFrameReflower continue; } - preg_match('/(counters?)(^\()*?\(\s*([^\s,]+)\s*(,\s*["\']?([^"\'\)]+)["\']?\s*(,\s*([^\s)]+)\s*)?)?\)/i', $match[1], $args); + preg_match('/(counters?)(^\()*?\(\s*([^\s,]+)\s*(,\s*["\']?([^"\'\)]*)["\']?\s*(,\s*([^\s)]+)\s*)?)?\)/i', $match[1], $args); $counter_id = $args[3]; if (strtolower($args[1]) == 'counter') { // counter(name [,style]) diff --git a/library/vendor/dompdf/src/FrameReflower/Block.php b/library/vendor/dompdf/src/FrameReflower/Block.php index ef77be7cd..c6b75eb01 100644 --- a/library/vendor/dompdf/src/FrameReflower/Block.php +++ b/library/vendor/dompdf/src/FrameReflower/Block.php @@ -604,7 +604,7 @@ class Block extends AbstractFrameReflower break; case "text-top": // FIXME: this should be the height of the frame minus the height of the text - $y_offset = $height - (float)$style->length_in_pt($style->get_line_height(), $style->font_size); + $y_offset = $height - (float)$style->length_in_pt($style->line_height, $style->font_size); break; case "top": diff --git a/library/vendor/dompdf/src/FrameReflower/Table.php b/library/vendor/dompdf/src/FrameReflower/Table.php index 3ff262b2d..1f560c053 100644 --- a/library/vendor/dompdf/src/FrameReflower/Table.php +++ b/library/vendor/dompdf/src/FrameReflower/Table.php @@ -447,7 +447,7 @@ class Table extends AbstractFrameReflower $style->margin_right = sprintf("%Fpt", $right);; } else { if ($left === "auto") { - $left = (float)$style->length_in_pt($cb["w"] - $right - $width, $cb["w"]); + $left = (float)$style->length_in_pt($cb["w"], $cb["w"]) - (float)$style->length_in_pt($right, $cb["w"]) - (float)$style->length_in_pt($width, $cb["w"]); } if ($right === "auto") { $left = (float)$style->length_in_pt($left, $cb["w"]); diff --git a/library/vendor/dompdf/src/FrameReflower/Text.php b/library/vendor/dompdf/src/FrameReflower/Text.php index 7ae13971b..321efeba5 100644 --- a/library/vendor/dompdf/src/FrameReflower/Text.php +++ b/library/vendor/dompdf/src/FrameReflower/Text.php @@ -467,9 +467,18 @@ class Text extends AbstractFrameReflower $style->border_right_width, $style->margin_right), $line_width); $min += $delta; + $min_word = $min; $max += $delta; - return $this->_min_max_cache = array($min, $max, "min" => $min, "max" => $max); + if ($style->word_wrap === 'break-word') { + // If it is allowed to break words, the min width is the widest character. + // But for performance reasons, we only check the first character. + $char = mb_substr($str, 0, 1); + $min_char = $this->getFontMetrics()->getTextWidth($char, $font, $size, $word_spacing, $char_spacing); + $min = $delta + $min_char; + } + + return $this->_min_max_cache = array($min, $max, $min_word, "min" => $min, "max" => $max, 'min_word' => $min_word); } /** diff --git a/library/vendor/dompdf/src/Helpers.php b/library/vendor/dompdf/src/Helpers.php index fc9db640e..ab05b6a74 100644 --- a/library/vendor/dompdf/src/Helpers.php +++ b/library/vendor/dompdf/src/Helpers.php @@ -63,7 +63,7 @@ class Helpers } // Is the url already fully qualified, a Data URI, or a reference to a named anchor? - if (mb_strpos($url, "://") !== false || mb_substr($url, 0, 1) === "#" || mb_strpos($url, "data:") === 0 || mb_strpos($url, "mailto:") === 0) { + if (mb_strpos($url, "://") !== false || mb_substr($url, 0, 1) === "#" || mb_strpos($url, "data:") === 0 || mb_strpos($url, "mailto:") === 0 || mb_strpos($url, "tel:") === 0) { return $url; } @@ -583,6 +583,7 @@ class Helpers * getimagesize doesn't give a good size for 32bit BMP image v5 * * @param string $filename + * @param resource $context * @return array The same format as getimagesize($filename) */ public static function dompdf_getimagesize($filename, $context = null) diff --git a/library/vendor/dompdf/src/Image/Cache.php b/library/vendor/dompdf/src/Image/Cache.php index 479d2e679..e1139b11d 100644 --- a/library/vendor/dompdf/src/Image/Cache.php +++ b/library/vendor/dompdf/src/Image/Cache.php @@ -34,7 +34,7 @@ class Cache * * @var string */ - public static $broken_image = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABABAMAAABYR2ztAAAAA3NCSVQICAjb4U/gAAAAHlBMVEWZmZn////g4OCkpKS1tbXv7++9vb2tra3m5ub5+fkFnN6oAAAACXBIWXMAAAsSAAALEgHS3X78AAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M0BrLToAAAABZ0RVh0Q3JlYXRpb24gVGltZQAwNC8xMi8xMRPnI58AAAGZSURBVEiJhZbPasMwDMbTw2DHKhDQcbDQPsEge4BAjg0Mxh5gkBcY7Niwkpx32PvOjv9JspX60It/+fxJsqxW1b11gN11rA7N3v6vAd5nfR9fDYCTDiyzAeA6qgKd9QDNoAtsAKyKCxzAAfhdBuyHGwC3oovNvQOaxxJwnSNg3ZQFAlBy4ax7AG6ZBLrgA5Cn038SAPgREiaJHJASwXYEhEQQIACyikTTCWCBJJoANBfpPAKQdBLHFMBYkctcBKIE9lAGggt6gRjgA2GV44CL7m1WgS08fAAdsPHxyyMAIyHujgRwEldHArCKy5cBz90+gNOyf8TTyKOUQN2LPEmgnWWPcKD+sr+rnuqTK1avAcHfRSv3afTgVAbqmCPiggLtGM8aSkBNOidVjADrmIDYebT1PoGsWJEE8Oc0b96aZoe4iMBZPiADB6RAzEUA2vwRmyiAL3Lfv6MBSEmUEg7ALt/3LhxwLgj4QNw4UCbKEsaBNpPsyRbgVRASFig78BIGyJNIJQyQTwIi0RvgT98H+Mi6W67j3X8H/427u5bfpQGVAAAAAElFTkSuQmCC"; + public static $broken_image = "data:image/svg+xml;charset=utf8,%3C?xml version='1.0'?%3E%3Csvg width='64' height='64' xmlns='http://www.w3.org/2000/svg'%3E%3Cg%3E%3Crect stroke='%23666666' id='svg_1' height='60.499994' width='60.166667' y='1.666669' x='1.999998' stroke-width='1.5' fill='none'/%3E%3Cline stroke-linecap='null' stroke-linejoin='null' id='svg_3' y2='59.333253' x2='59.749916' y1='4.333415' x1='4.250079' stroke-width='1.5' stroke='%23999999' fill='none'/%3E%3Cline stroke-linecap='null' stroke-linejoin='null' id='svg_4' y2='59.999665' x2='4.062838' y1='3.750342' x1='60.062164' stroke-width='1.5' stroke='%23999999' fill='none'/%3E%3C/g%3E%3C/svg%3E"; public static $error_message = "Image not found or type unknown"; @@ -181,6 +181,6 @@ class Cache } } -if (file_exists(realpath(__DIR__ . "/../../lib/res/broken_image.png"))) { - Cache::$broken_image = realpath(__DIR__ . "/../../lib/res/broken_image.png"); +if (file_exists(realpath(__DIR__ . "/../../lib/res/broken_image.svg"))) { + Cache::$broken_image = realpath(__DIR__ . "/../../lib/res/broken_image.svg"); } \ No newline at end of file diff --git a/library/vendor/dompdf/src/Options.php b/library/vendor/dompdf/src/Options.php index ec30b0e2b..b6c7c362c 100644 --- a/library/vendor/dompdf/src/Options.php +++ b/library/vendor/dompdf/src/Options.php @@ -13,7 +13,7 @@ class Options /** * The location of a temporary directory. * - * The directory specified must be writeable by the webserver process. + * The directory specified must be writable by the webserver process. * The temporary directory is required to download remote images and when * using the PFDLib back end. * @@ -112,7 +112,7 @@ class Options * Image DPI setting * * This setting determines the default DPI setting for images and fonts. The - * DPI may be overridden for inline images by explictly setting the + * DPI may be overridden for inline images by explicitly setting the * image's width & height style attributes (i.e. if the image's native * width is 600 pixels and you specify the image's width as 72 points, * the image will have a DPI of 600 in the rendered PDF. The DPI of @@ -267,7 +267,7 @@ class Options * * @link http://www.pdflib.com * - * If pdflib present in web server and auto or selected explicitely above, + * If pdflib present in web server and auto or selected explicitly above, * a real license code must exist! * * @var string diff --git a/library/vendor/dompdf/src/Positioner/ListBullet.php b/library/vendor/dompdf/src/Positioner/ListBullet.php index 29da406e5..36691f232 100644 --- a/library/vendor/dompdf/src/Positioner/ListBullet.php +++ b/library/vendor/dompdf/src/Positioner/ListBullet.php @@ -41,7 +41,7 @@ class ListBullet extends AbstractPositioner $n = $frame->get_next_sibling(); if ($n) { $style = $n->get_style(); - $line_height = $style->length_in_pt($style->line_height, $style->get_font_size()); + $line_height = $style->length_in_pt($style->line_height, $style->font_size); $offset = (float)$style->length_in_pt($line_height, $n->get_containing_block("h")) - $frame->get_height(); $y += $offset / 2; } @@ -66,7 +66,7 @@ class ListBullet extends AbstractPositioner // For now give up on the above. Use Guesswork with font y-pos in the middle of the line spacing /*$style = $p->get_style(); - $font_size = $style->get_font_size(); + $font_size = $style->font_size; $line_height = (float)$style->length_in_pt($style->line_height, $font_size); $y += ($line_height - $font_size) / 2; */ diff --git a/library/vendor/dompdf/src/Renderer/ListBullet.php b/library/vendor/dompdf/src/Renderer/ListBullet.php index c220426cc..fa0bc3731 100644 --- a/library/vendor/dompdf/src/Renderer/ListBullet.php +++ b/library/vendor/dompdf/src/Renderer/ListBullet.php @@ -134,7 +134,7 @@ class ListBullet extends AbstractRenderer function render(Frame $frame) { $style = $frame->get_style(); - $font_size = $style->get_font_size(); + $font_size = $style->font_size; $line_height = (float)$style->length_in_pt($style->line_height, $frame->get_containing_block("h")); $this->_set_opacity($frame->get_opacity($style->opacity)); diff --git a/library/vendor/dompdf/src/Renderer/Text.php b/library/vendor/dompdf/src/Renderer/Text.php index 059c27eae..51e6e6259 100644 --- a/library/vendor/dompdf/src/Renderer/Text.php +++ b/library/vendor/dompdf/src/Renderer/Text.php @@ -69,7 +69,8 @@ class Text extends AbstractRenderer $x += (float)$style->length_in_pt(array($ml, $pl, $bl), $cb["w"]); $font = $style->font_family; - $size = $frame_font_size = $style->font_size; + $size = $style->font_size; + $frame_font_size = $frame->get_dompdf()->getFontMetrics()->getFontHeight($font, $size); $word_spacing = $frame->get_text_spacing() + (float)$style->length_in_pt($style->word_spacing); $char_spacing = (float)$style->length_in_pt($style->letter_spacing); $width = $style->width; @@ -113,7 +114,7 @@ class Text extends AbstractRenderer } $descent = $size * $underline_position; - $base = $size; + $base = $frame_font_size; // Handle text decoration: // http://www.w3.org/TR/CSS21/text.html#propdef-text-decoration @@ -159,7 +160,7 @@ class Text extends AbstractRenderer } if ($this->_dompdf->getOptions()->getDebugLayout() && $this->_dompdf->getOptions()->getDebugLayoutLines()) { - $text_width = $this->_dompdf->getFontMetrics()->getTextWidth($text, $font, $frame_font_size); + $text_width = $this->_dompdf->getFontMetrics()->getTextWidth($text, $font, $size); $this->_debug_layout(array($x, $y, $text_width + ($line->wc - 1) * $word_spacing, $frame_font_size), "orange", array(0.5, 0.5)); } } diff --git a/library/vendor/lessphp/LICENSE b/library/vendor/lessphp/LICENSE index b2338b1c8..49c9ea417 100644 --- a/library/vendor/lessphp/LICENSE +++ b/library/vendor/lessphp/LICENSE @@ -1,4 +1,4 @@ -For ease of distribution, lessphp 0.2.0 is under a dual license. +For ease of distribution, lessphp 0.4.0 is under a dual license. You are free to pick which one suits your needs. @@ -9,8 +9,8 @@ MIT LICENSE -Copyright (c) 2010 Leaf Corcoran, http://leafo.net/lessphp - +Copyright (c) 2013 Leaf Corcoran, http://leafo.net/lessphp + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -18,10 +18,10 @@ without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND diff --git a/library/vendor/lessphp/SOURCE b/library/vendor/lessphp/SOURCE index 3d4ddd72c..3f28ac03b 100644 --- a/library/vendor/lessphp/SOURCE +++ b/library/vendor/lessphp/SOURCE @@ -1,2 +1,7 @@ -http://leafo.net/lessphp/src/lessphp-0.4.0.tar.gz -tar xfz lessphp-0.4.0.tar.gz lessphp/lessc.inc.php lessphp/LICENSE +#!/bin/bash +set -eux +VERSION=0.5.0 + +curl -LsS https://github.com/leafo/lessphp/archive/v"$VERSION".tar.gz -o /tmp/lessphp.tar.gz +tar xfz /tmp/lessphp.tar.gz --strip-components 1 lessphp-$VERSION/lessc.inc.php lessphp-$VERSION/LICENSE +rm /tmp/lessphp.tar.gz \ No newline at end of file diff --git a/library/vendor/lessphp/lessc.inc.php b/library/vendor/lessphp/lessc.inc.php index 0699de52f..2292f219d 100644 --- a/library/vendor/lessphp/lessc.inc.php +++ b/library/vendor/lessphp/lessc.inc.php @@ -1,18 +1,18 @@ + * Copyright 2013, Leaf Corcoran * Licensed under MIT or GPLv3, see LICENSE */ /** - * The less compiler and parser. + * The LESS compiler and parser. * * Converting LESS to CSS is a three stage process. The incoming file is parsed * by `lessc_parser` into a syntax tree, then it is compiled into another tree @@ -27,7 +27,7 @@ * * In summary: * - * The `lessc` class creates an intstance of the parser, feeds it LESS code, + * The `lessc` class creates an instance of the parser, feeds it LESS code, * then transforms the resulting tree to a CSS tree. This class also holds the * evaluation context, such as all available mixins and variables at any given * time. @@ -38,9 +38,10 @@ * handling things like indentation. */ class lessc { - static public $VERSION = "v0.4.0"; - static protected $TRUE = array("keyword", "true"); - static protected $FALSE = array("keyword", "false"); + static public $VERSION = "v0.5.0"; + + static public $TRUE = array("keyword", "true"); + static public $FALSE = array("keyword", "false"); protected $libFunctions = array(); protected $registeredVars = array(); @@ -62,8 +63,6 @@ class lessc { protected $sourceParser = null; protected $sourceLoc = null; - static public $defaultValue = array("keyword", ""); - static protected $nextImportId = 0; // uniquely identify imports // attempts to find the path of an import url, returns null for css files @@ -283,39 +282,73 @@ class lessc { foreach ($this->sortProps($block->props) as $prop) { $this->compileProp($prop, $block, $out); } + $out->lines = $this->deduplicate($out->lines); + } - $out->lines = array_values(array_unique($out->lines)); + /** + * Deduplicate lines in a block. Comments are not deduplicated. If a + * duplicate rule is detected, the comments immediately preceding each + * occurence are consolidated. + */ + protected function deduplicate($lines) { + $unique = array(); + $comments = array(); + + foreach($lines as $line) { + if (strpos($line, '/*') === 0) { + $comments[] = $line; + continue; + } + if (!in_array($line, $unique)) { + $unique[] = $line; + } + array_splice($unique, array_search($line, $unique), 0, $comments); + $comments = array(); + } + return array_merge($unique, $comments); } protected function sortProps($props, $split = false) { $vars = array(); $imports = array(); $other = array(); + $stack = array(); foreach ($props as $prop) { switch ($prop[0]) { + case "comment": + $stack[] = $prop; + break; case "assign": + $stack[] = $prop; if (isset($prop[1][0]) && $prop[1][0] == $this->vPrefix) { - $vars[] = $prop; + $vars = array_merge($vars, $stack); } else { - $other[] = $prop; + $other = array_merge($other, $stack); } + $stack = array(); break; case "import": $id = self::$nextImportId++; $prop[] = $id; - $imports[] = $prop; + $stack[] = $prop; + $imports = array_merge($imports, $stack); $other[] = array("import_mixin", $id); + $stack = array(); break; default: - $other[] = $prop; + $stack[] = $prop; + $other = array_merge($other, $stack); + $stack = array(); + break; } } + $other = array_merge($other, $stack); if ($split) { - return array(array_merge($vars, $imports), $other); + return array(array_merge($imports, $vars), $other); } else { - return array_merge($vars, $imports, $other); + return array_merge($imports, $vars, $other); } } @@ -684,8 +717,7 @@ class lessc { $mixins = $this->findBlocks($block, $path, $orderedArgs, $keywordArgs); if ($mixins === null) { - // fwrite(STDERR,"failed to find block: ".implode(" > ", $path)."\n"); - break; // throw error here?? + $this->throwError("{$prop[1][0]} is undefined"); } foreach ($mixins as $mixin) { @@ -787,7 +819,7 @@ class lessc { * The input is expected to be reduced. This function will not work on * things like expressions and variables. */ - protected function compileValue($value) { + public function compileValue($value) { switch ($value[0]) { case 'list': // [1] - delimiter @@ -951,6 +983,39 @@ class lessc { return $this->lib_rgbahex($color); } + /** + * Given an url, decide whether to output a regular link or the base64-encoded contents of the file + * + * @param array $value either an argument list (two strings) or a single string + * @return string formatted url(), either as a link or base64-encoded + */ + protected function lib_data_uri($value) { + $mime = ($value[0] === 'list') ? $value[2][0][2] : null; + $url = ($value[0] === 'list') ? $value[2][1][2][0] : $value[2][0]; + + $fullpath = $this->findImport($url); + + if($fullpath && ($fsize = filesize($fullpath)) !== false) { + // IE8 can't handle data uris larger than 32KB + if($fsize/1024 < 32) { + if(is_null($mime)) { + if(class_exists('finfo')) { // php 5.3+ + $finfo = new finfo(FILEINFO_MIME); + $mime = explode('; ', $finfo->file($fullpath)); + $mime = $mime[0]; + } elseif(function_exists('mime_content_type')) { // PHP 5.2 + $mime = mime_content_type($fullpath); + } + } + + if(!is_null($mime)) // fallback if the mime type is still unknown + $url = sprintf('data:%s;base64,%s', $mime, base64_encode(file_get_contents($fullpath))); + } + } + + return 'url("'.$url.'")'; + } + // utility func to unquote a string protected function lib_e($arg) { switch ($arg[0]) { @@ -959,7 +1024,7 @@ class lessc { if (isset($items[0])) { return $this->lib_e($items[0]); } - return self::$defaultValue; + $this->throwError("unrecognised input"); case "string": $arg[1] = ""; return $arg; @@ -1009,8 +1074,14 @@ class lessc { } protected function lib_round($arg) { - $value = $this->assertNumber($arg); - return array("number", round($value), $arg[2]); + if($arg[0] != "list") { + $value = $this->assertNumber($arg); + return array("number", round($value), $arg[2]); + } else { + $value = $this->assertNumber($arg[2][0]); + $precision = $this->assertNumber($arg[2][1]); + return array("number", round($value, $precision), $arg[2][0][2]); + } } protected function lib_unit($arg) { @@ -1027,7 +1098,7 @@ class lessc { * Helper function to get arguments for color manipulation functions. * takes a list that contains a color like thing and a percentage */ - protected function colorArgs($args) { + public function colorArgs($args) { if ($args[0] != 'list' || count($args[2]) < 2) { return array(array('color', 0, 0, 0), 0); } @@ -1168,36 +1239,56 @@ class lessc { } protected function lib_contrast($args) { - if ($args[0] != 'list' || count($args[2]) < 3) { - return array(array('color', 0, 0, 0), 0); - } + $darkColor = array('color', 0, 0, 0); + $lightColor = array('color', 255, 255, 255); + $threshold = 0.43; - list($inputColor, $darkColor, $lightColor) = $args[2]; + if ( $args[0] == 'list' ) { + $inputColor = ( isset($args[2][0]) ) ? $this->assertColor($args[2][0]) : $lightColor; + $darkColor = ( isset($args[2][1]) ) ? $this->assertColor($args[2][1]) : $darkColor; + $lightColor = ( isset($args[2][2]) ) ? $this->assertColor($args[2][2]) : $lightColor; + $threshold = ( isset($args[2][3]) ) ? $this->assertNumber($args[2][3]) : $threshold; + } + else { + $inputColor = $this->assertColor($args); + } - $inputColor = $this->assertColor($inputColor); - $darkColor = $this->assertColor($darkColor); - $lightColor = $this->assertColor($lightColor); - $hsl = $this->toHSL($inputColor); + $inputColor = $this->coerceColor($inputColor); + $darkColor = $this->coerceColor($darkColor); + $lightColor = $this->coerceColor($lightColor); - if ($hsl[3] > 50) { - return $darkColor; - } + //Figure out which is actually light and dark! + if ( $this->lib_luma($darkColor) > $this->lib_luma($lightColor) ) { + $t = $lightColor; + $lightColor = $darkColor; + $darkColor = $t; + } - return $lightColor; + $inputColor_alpha = $this->lib_alpha($inputColor); + if ( ( $this->lib_luma($inputColor) * $inputColor_alpha) < $threshold) { + return $lightColor; + } + return $darkColor; } - protected function assertColor($value, $error = "expected color value") { + protected function lib_luma($color) { + $color = $this->coerceColor($color); + return (0.2126 * $color[0] / 255) + (0.7152 * $color[1] / 255) + (0.0722 * $color[2] / 255); + } + + + public function assertColor($value, $error = "expected color value") { $color = $this->coerceColor($value); if (is_null($color)) $this->throwError($error); return $color; } - protected function assertNumber($value, $error = "expecting number") { + public function assertNumber($value, $error = "expecting number") { if ($value[0] == "number") return $value[1]; $this->throwError($error); } - protected function assertArgs($value, $expectedArgs, $name="") { + public function assertArgs($value, $expectedArgs, $name="") { if ($expectedArgs == 1) { return $value; } else { @@ -1381,7 +1472,7 @@ class lessc { } $seen[$key] = true; - $out = $this->reduce($this->get($key, self::$defaultValue)); + $out = $this->reduce($this->get($key)); $seen[$key] = false; return $out; case "list": @@ -1409,8 +1500,9 @@ class lessc { list(, $name, $args) = $value; if ($name == "%") $name = "_sprintf"; + $f = isset($this->libFunctions[$name]) ? - $this->libFunctions[$name] : array($this, 'lib_'.$name); + $this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name)); if (is_callable($f)) { if ($args[0] == 'list') @@ -1517,7 +1609,7 @@ class lessc { return $value; } - protected function toBool($a) { + public function toBool($a) { if ($a) return self::$TRUE; else return self::$FALSE; } @@ -1740,7 +1832,7 @@ class lessc { // get the highest occurrence entry for a name - protected function get($name, $default=null) { + protected function get($name) { $current = $this->env; $isArguments = $name == $this->vPrefix . 'arguments'; @@ -1757,7 +1849,7 @@ class lessc { } } - return $default; + $this->throwError("variable $name is undefined"); } // inject array of unparsed strings into environment as variables @@ -1993,14 +2085,14 @@ class lessc { return $this->allParsedFiles; } - protected function addParsedFile($file) { + public function addParsedFile($file) { $this->allParsedFiles[realpath($file)] = filemtime($file); } /** * Uses the current value of $this->count to show line and line number */ - protected function throwError($msg = null) { + public function throwError($msg = null) { if ($this->sourceLoc >= 0) { $this->sourceParser->throwError($msg, $this->sourceLoc); } @@ -2266,14 +2358,13 @@ class lessc_parser { $this->whitespace(); // parse the entire file - $lastCount = $this->count; while (false !== $this->parseChunk()); if ($this->count != strlen($this->buffer)) $this->throwError(); // TODO report where the block was opened - if (!is_null($this->env->parent)) + if ( !property_exists($this->env, 'parent') || !is_null($this->env->parent) ) throw new exception('parse error: unclosed block'); return $this->env; @@ -2319,6 +2410,10 @@ class lessc_parser { if (empty($this->buffer)) return false; $s = $this->seek(); + if ($this->whitespace()) { + return true; + } + // setting a property if ($this->keyword($key) && $this->assign() && $this->propertyValue($value, $key) && $this->end()) @@ -2399,7 +2494,7 @@ class lessc_parser { } // opening a simple block - if ($this->tags($tags) && $this->literal('{')) { + if ($this->tags($tags) && $this->literal('{', false)) { $tags = $this->fixTags($tags); $this->pushBlock($tags); return true; @@ -2674,7 +2769,6 @@ class lessc_parser { // an import statement protected function import(&$out) { - $s = $this->seek(); if (!$this->literal('@import')) return false; // @import "something.css" media; @@ -3034,7 +3128,6 @@ class lessc_parser { // list of tags of specifying mixin path // optionally separated by > (lazy, accepts extra >) protected function mixinTags(&$tags) { - $s = $this->seek(); $tags = array(); while ($this->tag($tt, true)) { $tags[] = $tt; @@ -3262,7 +3355,7 @@ class lessc_parser { // consume an end of statement delimiter protected function end() { - if ($this->literal(';')) { + if ($this->literal(';', false)) { return true; } elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') { // if there is end of file or a closing block next then we don't need a ; @@ -3411,9 +3504,9 @@ class lessc_parser { if ($this->writeComments) { $gotWhite = false; while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) { - if (isset($m[1]) && empty($this->commentsSeen[$this->count])) { + if (isset($m[1]) && empty($this->seenComments[$this->count])) { $this->append(array("comment", $m[1])); - $this->commentsSeen[$this->count] = true; + $this->seenComments[$this->count] = true; } $this->count += strlen($m[0]); $gotWhite = true;