From: <lph...@us...> - 2008-10-28 14:10:28
|
Revision: 15355 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15355&view=rev Author: lphuberdeau Date: 2008-10-28 14:10:13 +0000 (Tue, 28 Oct 2008) Log Message: ----------- [FIX]?\194?\160Support for color conversion and sub/superscript Modified Paths: -------------- trunk/tiki-editpage.php Modified: trunk/tiki-editpage.php =================================================================== --- trunk/tiki-editpage.php 2008-10-28 13:33:13 UTC (rev 15354) +++ trunk/tiki-editpage.php 2008-10-28 14:10:13 UTC (rev 15355) @@ -425,6 +425,31 @@ $p['stack'][] = array('tag' => $c[$i]['data']['name'], 'string' => "\n"); } break; + case "span": + if( isset($c[$i]['pars']) + && isset($c[$i]['pars']['style']) + && preg_match( "/background(\-color)?: rgb\((\d+), (\d+), (\d+)\)/", $c[$i]['pars']['style']['value'], $parts ) ) { + $src .= "~~#" + . str_pad( dechex( 255-$parts[1] ), 2, '0', STR_PAD_LEFT ) + . str_pad( dechex( 255-$parts[2] ), 2, '0', STR_PAD_LEFT ) + . str_pad( dechex( 255-$parts[3] ), 2, '0', STR_PAD_LEFT ) + . ',#' + . str_pad( dechex( $parts[1] ), 2, '0', STR_PAD_LEFT ) + . str_pad( dechex( $parts[2] ), 2, '0', STR_PAD_LEFT ) + . str_pad( dechex( $parts[3] ), 2, '0', STR_PAD_LEFT ) + . ':'; + $p['stack'][] = array('tag' => 'span', 'string' => "~~"); + } elseif( isset($c[$i]['pars']) + && isset($c[$i]['pars']['style']) + && preg_match( "/color: rgb\((\d+), (\d+), (\d+)\)/", $c[$i]['pars']['style']['value'], $parts ) ) { + $src .= "~~#" + . str_pad( dechex( $parts[1] ), 2, '0', STR_PAD_LEFT ) + . str_pad( dechex( $parts[2] ), 2, '0', STR_PAD_LEFT ) + . str_pad( dechex( $parts[3] ), 2, '0', STR_PAD_LEFT ) + . ':'; + $p['stack'][] = array('tag' => 'span', 'string' => "~~"); + } + break; case "b": $src .= '__'; $p['stack'][] = array('tag' => 'b', 'string' => '__'); break; case "i": $src .= "''"; $p['stack'][] = array('tag' => 'i', 'string' => "''"); break; case "em": $src .= "''"; $p['stack'][] = array('tag' => 'em', 'string' => "''"); break; @@ -813,6 +838,10 @@ $parsed = $tikilib->parse_data($edit_data,array('absolute_links'=>true, 'noparseplugins'=>true,'noheaderinc'=>true)); $parsed = preg_replace('/<span class=\"img\">(.*?)<\/span>/im','$1', $parsed); // remove spans round img's $parsed = preg_replace("/src=\"img\/smiles\//im","src=\"".$tikiroot."img/smiles/", $parsed); // fix smiley src's + $parsed = str_replace( + array( '{SUP()}', '{SUP}', '{SUB()}', '{SUB}' ), + array( '<sup>', '</sup>', '<sub>', '</sub>' ), + $parsed ); $smarty->assign('pagedata', $parsed); $prefs['wiki_edit_section'] = $secedit; $prefs['feature_wiki_ext_icon'] = $exticons; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |