← All changes | mpdf/classes/svg.php +10 -14 1.7.5 → 1.5 View file →

		@@ -1878,12 +1878,12 @@
1878	1878	$this->mpdf_ref->ConvertIndic($txt);
1879	1879
1880	1880
1881	1881	if ($current_style['text-anchor']=='middle') {
1882		- $tw = $this->mpdf_ref->GetStringWidth($txt)*_MPDFK/2; // mPDF 4.4.003 // mPDF 5.4.09
	1882	+ $tw = $this->mpdf_ref->GetStringWidth($txt)*$this->mpdf_ref->k/2; // mPDF 4.4.003
1883	1883	}
1884	1884	else if ($current_style['text-anchor']=='end') {
1885		- $tw = $this->mpdf_ref->GetStringWidth($txt)*_MPDFK; // mPDF 4.4.003 // mPDF 5.4.09
	1885	+ $tw = $this->mpdf_ref->GetStringWidth($txt)*$this->mpdf_ref->k; // mPDF 4.4.003
1886	1886	}
1887	1887	else $tw = 0;
1888	1888
1889	1889	if (!$this->mpdf_ref->usingCoreFont) {
		@@ -1901,13 +1901,8 @@
1901	1901	// mPDF 5.0.041
1902	1902	// mPDF 5.0.051
1903	1903	$path_cmd = sprintf('q BT /F%d %s %.3F Tf %.3F %.3F Td %s Tr %s %s %s Tj ET Q ',$this->mpdf_ref->CurrentFont['i'],$opacitystr, $this->mpdf_ref->FontSizePt,$pdfx*$this->kp,$pdfy*$this->kp,$render,$fillstr,$strokestr,$txt)."\n";
1904	1904	unset($this->txt_data[0], $this->txt_data[1],$this->txt_data[2]);
1905		-
1906		- // mPDF 5.4.12
1907		- if (isset($current_style['font-size-parent'])) {
1908		- $this->mpdf_ref->SetFontSize($current_style['font-size-parent']);
1909		- }
1910	1905	}
1911	1906	else
1912	1907	{
1913	1908	return ' ';
		@@ -2000,8 +1995,9 @@
2000	1995
2001	1996	// select digits not followed by percent sign nor preceeded by forward slash
2002	1997	$tmp = preg_replace("/(.*)\b(\d+)[\b|\/](.*)/i","$2",$critere_style['font']);
2003	1998	if ($tmp != $critere_style['font']){
	1999	+ // mPDF 4.4.003
2004	2000	$current_style['font-size'] = $this->ConvertSVGSizePts($tmp);
2005	2001	$this->mpdf_ref->SetFont('','',$current_style['font-size'],false);
2006	2002	}
2007	2003
		@@ -2009,8 +2005,9 @@
2009	2005
2010	2006	if(isset($critere_style['fill'])){
2011	2007	$current_style['fill'] = $critere_style['fill'];
2012	2008	}
	2009	+ // mPDF 4.4.003
2013	2010	if(isset($critere_style['stroke'])){
2014	2011	$current_style['stroke'] = $critere_style['stroke'];
2015	2012	}
2016	2013	if(isset($critere_style['stroke-width'])){
		@@ -2033,17 +2030,15 @@
2033	2030	$current_style['font-weight'] = $critere_style['font-weight'];
2034	2031	}
2035	2032
2036	2033	if(isset($critere_style['font-size'])){
2037		- // mPDF 5.4.12
2038		- if (strpos($critere_style['font-size'], '%')!==false) {
2039		- $current_style['font-size-parent'] = $current_style['font-size'];
2040		- }
	2034	+ // mPDF 4.4.003
2041	2035	$current_style['font-size'] = $this->ConvertSVGSizePts($critere_style['font-size']);
2042	2036	$this->mpdf_ref->SetFont('','',$current_style['font-size'],false);
2043	2037	}
2044	2038
2045	2039	if(isset($critere_style['font-family'])){
	2040	+ // mPDF 4.4.003
2046	2041	$v = $critere_style['font-family'];
2047	2042	$aux_fontlist = explode(",",$v);
2048	2043	$found = 0;
2049	2044	foreach($aux_fontlist AS $f) {
		@@ -2177,12 +2172,12 @@
2177	2172	break;
2178	2173
2179	2174	case 'path':
2180	2175	$path = $attribs['d'];
2181		- // mPDF 5.6.65
2182		- preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', $path, $commands, PREG_SET_ORDER);
	2176	+ // mPDF 4.4.003
	2177	+ preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([e ,\-.\d]+)*/', $path, $commands, PREG_SET_ORDER);
2183	2178	$path_cmd = '';
2184		- $svg_class->subPathInit = true;
	2179	+ $svg_class->subPathInit = true; // mPDF 4.4.003
2185	2180	// mPDF 5.0.039
2186	2181	$svg_class->pathBBox = array(999999,999999,-999999,-999999);
2187	2182	foreach($commands as $c){
2188	2183	if(count($c)==3 || $c[2]==''){
		@@ -2415,8 +2410,9 @@
2415	2410	$svg_class->txt_data[1] = $attribs['y'];
2416	2411	$critere_style = $attribs;
2417	2412	unset($critere_style['x'], $critere_style['y']);
2418	2413	$svg_class->svgDefineTxtStyle($critere_style);
	2414	+
2419	2415	break;
2420	2416	}
2421	2417
2422	2418	//