it-blaster / typograph-bundle

Service/TypographService.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         }
 
         if (!isset($this->configs[$config])) {
-            throw new InvalidConfigurationException('Typograph\'s config "'. $config .'" doesn\'t exist');
+            throw new InvalidConfigurationException('Typograph\'s config "'.$config.'" doesn\'t exist');
         }
 
         return EMTypograph::fast_apply($string, $this->configs[$config]);

EMT/EMTTretNobr.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 		

 		foreach ($triad as $value) {

 			$value = (int) $value;

-			if ($value > 255) {

+			if ($value>255) {

 				$addTag = false;

 				break;

 			}

EMT/EMTTretNumber.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		'math_chars' => array(

 				'description'	=> 'Математические знаки больше/меньше/плюс минус/неравно',

 				'pattern' 		=> array('/!=/', '/\<=/', '/([^=]|^)\>=/', '/~=/', '/\+-/'),

-				'replacement' 	=> array('&ne;', '&le;', '\1&ge;', '&cong;', '&plusmn;' )

+				'replacement' 	=> array('&ne;', '&le;', '\1&ge;', '&cong;', '&plusmn;')

 			),

 			/*

 		'split_number_to_triads' => array(

EMT/EMTTretSymbol.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 		'arrows_symbols' => array(

 				'description'	=> 'Замена стрелок вправо-влево на html коды',

 				'pattern' 		=> array('/(\s|\>|\&nbsp\;|^)\-\>($|\s|\&nbsp\;|\<)/', '/(\s|\>|\&nbsp\;|^|;)\<\-(\s|\&nbsp\;|$)/', '/→/u', '/←/u'),

-				'replacement' 	=> array('\1&rarr;\2', '\1&larr;\2', '&rarr;', '&larr;' )

+				'replacement' 	=> array('\1&rarr;\2', '\1&larr;\2', '&rarr;', '&larr;')

 			),			

 		);

 }
\ No newline at end of file

EMT/EMTTretOptAlign.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 	protected function oaquote_extra()

 	{

 		$this->_text = $this->preg_replace_e(

-				'/(<' .self::BASE64_PARAGRAPH_TAG . '>)([\040\t]+)?(\&laquo\;)/e', 

+				'/(<'.self::BASE64_PARAGRAPH_TAG.'>)([\040\t]+)?(\&laquo\;)/e', 

 				'$m[1] . $this->tag($m[3], "span", array("class"=>"oa_oquote_nl"))',

 				$this->_text);

 	}

EMT/EMTTretEtc.php

Spacing +3 added lines, -3 removed lines

@@ -70,14 +70,14 @@
 		$match = '/(^|[^a-zа-яё])([a-zа-яё]+)\&nbsp\;('.$b.')/iu';

 		do {

 			$this->_text = preg_replace($match, '\1\3\2 ', $this->_text);

-		} while(preg_match($match, $this->_text));

+		} while (preg_match($match, $this->_text));

 

 		$match = '/('.$e.')\&nbsp\;([a-zа-яё]+)($|[^a-zа-яё])/iu';

 		do {

 			$this->_text = preg_replace($match, ' \2\1\3', $this->_text);

-		} while(preg_match($match, $this->_text));

+		} while (preg_match($match, $this->_text));

 		

-		$this->_text = $this->preg_replace_e('/'.$b.'.*?'.$e.'/iue', 'str_replace(" "," ",$m[0]);' , $this->_text );

+		$this->_text = $this->preg_replace_e('/'.$b.'.*?'.$e.'/iue', 'str_replace(" "," ",$m[0]);', $this->_text);

 	}

 	

 }

EMT/EMTypograph.php

Spacing +33 added lines, -33 removed lines

@@ -27,7 +27,7 @@ 
     );

 	

 	

-	protected $group_list  = array(

+	protected $group_list = array(

 		'Quote'     => true,

 		'Dash'      => true,

 		'Nobr'      => true,

@@ -43,8 +43,8 @@ 
 	);

 	protected $all_options = array(

 	

-		'Quote.quotes' => array( 'description' => 'Расстановка «кавычек-елочек» первого уровня', 'selector' => "Quote.*quote" ),

-		'Quote.quotation' => array( 'description' => 'Внутренние кавычки-лапки', 'selector' => "Quote", 'setting' => 'no_bdquotes', 'reversed' => true ),

+		'Quote.quotes' => array('description' => 'Расстановка «кавычек-елочек» первого уровня', 'selector' => "Quote.*quote"),

+		'Quote.quotation' => array('description' => 'Внутренние кавычки-лапки', 'selector' => "Quote", 'setting' => 'no_bdquotes', 'reversed' => true),

 							

 		'Dash.to_libo_nibud' => 'direct',

 		'Dash.iz_za_pod' => 'direct',

@@ -58,7 +58,7 @@ 
 		'Nobr.nbsp_celcius' => 'direct',		

 		'Nobr.hyphen_nowrap_in_small_words' => 'direct',

 		'Nobr.hyphen_nowrap' => 'direct',

-		'Nobr.nowrap' => array('description' => 'Nobr (по умолчанию) & nowrap', 'disabled' => true, 'selector' => '*', 'setting' => 'nowrap' ),

+		'Nobr.nowrap' => array('description' => 'Nobr (по умолчанию) & nowrap', 'disabled' => true, 'selector' => '*', 'setting' => 'nowrap'),

 		

 		'Symbol.tm_replace'     => 'direct',

 		'Symbol.r_sign_replace' => 'direct',

@@ -66,7 +66,7 @@ 
 		'Symbol.apostrophe' => 'direct',

 		'Symbol.degree_f' => 'direct',

 		'Symbol.arrows_symbols' => 'direct',

-		'Symbol.no_inches' => array( 'description' => 'Расстановка дюйма после числа', 'selector' => "Quote", 'setting' => 'no_inches', 'reversed' => true ),

+		'Symbol.no_inches' => array('description' => 'Расстановка дюйма после числа', 'selector' => "Quote", 'setting' => 'no_inches', 'reversed' => true),

 		

 		'Punctmark.auto_comma' => 'direct',

 		'Punctmark.hellip' => 'direct',

@@ -91,9 +91,9 @@ 
 		

 		'Space.many_spaces_to_one' => 'direct',	

 		'Space.clear_percent' => 'direct',	

-		'Space.clear_before_after_punct' => array( 'description' => 'Удаление пробелов перед и после знаков препинания в предложении', 'selector' => 'Space.remove_space_before_punctuationmarks'),

-		'Space.autospace_after' => array( 'description' => 'Расстановка пробелов после знаков препинания', 'selector' => 'Space.autospace_after_*'),

-		'Space.bracket_fix' => array( 'description' => 'Удаление пробелов внутри скобок, а также расстановка пробела перед скобками', 

+		'Space.clear_before_after_punct' => array('description' => 'Удаление пробелов перед и после знаков препинания в предложении', 'selector' => 'Space.remove_space_before_punctuationmarks'),

+		'Space.autospace_after' => array('description' => 'Расстановка пробелов после знаков препинания', 'selector' => 'Space.autospace_after_*'),

+		'Space.bracket_fix' => array('description' => 'Удаление пробелов внутри скобок, а также расстановка пробела перед скобками', 

 				'selector' => array('Space.nbsp_before_open_quote', 'Punctmark.fix_brackets')),

 				

 		'Abbr.nbsp_money_abbr' => 'direct',		

@@ -108,11 +108,11 @@ 
 		'Abbr.nobr_before_unit_volt' => 'direct',		

 		'Abbr.nbsp_before_unit' => 'direct',		

 		

-		'OptAlign.all' => array( 'description' => 'Все настройки оптического выравнивания', 'hide' => true, 'selector' => 'OptAlign.*'),

+		'OptAlign.all' => array('description' => 'Все настройки оптического выравнивания', 'hide' => true, 'selector' => 'OptAlign.*'),

 		'OptAlign.oa_oquote' => 'direct',	

 		'OptAlign.oa_obracket_coma' => 'direct',	

 		'OptAlign.oa_oquote_extra' => 'direct',	

-		'OptAlign.layout' => array( 'description' => 'Inline стили или CSS' ),

+		'OptAlign.layout' => array('description' => 'Inline стили или CSS'),

 		

 		'Text.paragraphs' => 'direct',

 		'Text.auto_links' => 'direct',

@@ -122,7 +122,7 @@ 
 		

 		

 		//'Etc.no_nbsp_in_nobr' => 'direct',		

-		'Etc.unicode_convert' => array('description' => 'Преобразовывать html-сущности в юникод', 'selector' => '*', 'setting' => 'dounicode' , 'disabled' => true),

+		'Etc.unicode_convert' => array('description' => 'Преобразовывать html-сущности в юникод', 'selector' => '*', 'setting' => 'dounicode', 'disabled' => true),

 	

 	);

 	

@@ -137,25 +137,25 @@ 
 	{

 		$arr['all'] = array();

 		$bygroup = array();

-		foreach($this->all_options as $opt => $op)

+		foreach ($this->all_options as $opt => $op)

 		{

 			$arr['all'][$opt] = $this->get_option_info($opt);

-			$x = explode(".",$opt);

+			$x = explode(".", $opt);

 			$bygroup[$x[0]][] = $opt;

 		}

 		$arr['group'] = array();

-		foreach($this->group_list as $group => $ginfo)

+		foreach ($this->group_list as $group => $ginfo)

 		{

-			if($ginfo === true)

+			if ($ginfo === true)

 			{

 				$tret = $this->get_tret($group);

-				if($tret) $info['title'] = $tret->title; else $info['title'] = "Не определено";

+				if ($tret) $info['title'] = $tret->title; else $info['title'] = "Не определено";

 			} else {

 				$info = $ginfo;

 			}

 			$info['name'] = $group;

 			$info['options'] = array();

-			if(is_array($bygroup[$group])) foreach($bygroup[$group] as $opt) $info['options'][] = $opt;

+			if (is_array($bygroup[$group])) foreach ($bygroup[$group] as $opt) $info['options'][] = $opt;

 			$arr['group'][] = $info;

 		}

 		return $arr;

@@ -170,16 +170,16 @@ 
 	 */

 	protected function get_option_info($key)

 	{

-		if(!isset($this->all_options[$key])) return false;

-		if(is_array($this->all_options[$key])) return $this->all_options[$key];

+		if (!isset($this->all_options[$key])) return false;

+		if (is_array($this->all_options[$key])) return $this->all_options[$key];

 		

-		if(($this->all_options[$key] == "direct") || ($this->all_options[$key] == "reverse"))

+		if (($this->all_options[$key] == "direct") || ($this->all_options[$key] == "reverse"))

 		{

 			$pa = explode(".", $key);

 			$tret_pattern = $pa[0];

 			$tret = $this->get_tret($tret_pattern);

-			if(!$tret) return false;		

-			if(!isset($tret->rules[$pa[1]])) return false;

+			if (!$tret) return false;		

+			if (!isset($tret->rules[$pa[1]])) return false;

 			$array = $tret->rules[$pa[1]];

 			$array['way'] = $this->all_options[$key];

 			return $array;

@@ -196,28 +196,28 @@ 
 	 */

 	public function do_setup($name, $value)

 	{

-		if(!isset($this->all_options[$name])) return;

+		if (!isset($this->all_options[$name])) return;

 		

 		// эта настрока связана с правилом ядра

-		if(is_string($this->all_options[$name]))

+		if (is_string($this->all_options[$name]))

 		{

-			$this->set($name, "active", $value );

-			return ;

+			$this->set($name, "active", $value);

+			return;

 		}

-		if(is_array($this->all_options[$name]))

+		if (is_array($this->all_options[$name]))

 		{

-			if(isset($this->all_options[$name]['selector']))

+			if (isset($this->all_options[$name]['selector']))

 			{

 				$settingname = "active";

-				if(isset($this->all_options[$name]['setting'])) $settingname = $this->all_options[$name]['setting'];

+				if (isset($this->all_options[$name]['setting'])) $settingname = $this->all_options[$name]['setting'];

 				$this->set($this->all_options[$name]['selector'], $settingname, $value);

 			}

 		}

 		

-		if($name == "OptAlign.layout")

+		if ($name == "OptAlign.layout")

 		{

-			if($value == "style") $this->set_tag_layout(EMTLib::LAYOUT_STYLE);

-			if($value == "class") $this->set_tag_layout(EMTLib::LAYOUT_CLASS);

+			if ($value == "style") $this->set_tag_layout(EMTLib::LAYOUT_STYLE);

+			if ($value == "class") $this->set_tag_layout(EMTLib::LAYOUT_CLASS);

 		}

 		

 	}

@@ -232,7 +232,7 @@ 
 	public static function fast_apply($text, $options = null)

 	{

 		$obj = new self();

-		if(is_array($options)) $obj->setup($options);

+		if (is_array($options)) $obj->setup($options);

 		$obj->set_text($text);

 		return $obj->apply();

 	}

EMT/EMTTretSpace.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 {

 	public $title = "Расстановка и удаление пробелов";

 	

-	public $domain_zones = array('ru','ру','ком','орг', 'уа', 'ua', 'uk', 'co', 'fr', 

+	public $domain_zones = array('ru', 'ру', 'ком', 'орг', 'уа', 'ua', 'uk', 'co', 'fr', 

 	                             'com', 'net', 'edu', 'gov', 'org', 'mil', 'int', 'info', 'biz', 'info', 'name', 'pro');

 	

 	public $classes = array(

EMT/EMTTretText.php

Spacing +16 added lines, -16 removed lines

@@ -65,15 +65,15 @@ 
 	 * @return  void

 	 */	

 	protected function do_paragraphs($text) {

-		$text = str_replace("\r\n","\n",$text);

-		$text = str_replace("\r","\n",$text);

-		$text = '<' . self::BASE64_PARAGRAPH_TAG . '>' . trim($text) . '</' . self::BASE64_PARAGRAPH_TAG . '>';

+		$text = str_replace("\r\n", "\n", $text);

+		$text = str_replace("\r", "\n", $text);

+		$text = '<'.self::BASE64_PARAGRAPH_TAG.'>'.trim($text).'</'.self::BASE64_PARAGRAPH_TAG.'>';

 		//$text = $this->preg_replace_e('/([\040\t]+)?(\n|\r){2,}/e', '"</" . self::BASE64_PARAGRAPH_TAG . "><" .self::BASE64_PARAGRAPH_TAG . ">"', $text);

 		//$text = $this->preg_replace_e('/([\040\t]+)?(\n){2,}/e', '"</" . self::BASE64_PARAGRAPH_TAG . "><" .self::BASE64_PARAGRAPH_TAG . ">"', $text);

 		$text = $this->preg_replace_e('/([\040\t]+)?(\n)+([\040\t]*)(\n)+/e', '$m[1]."</" . self::BASE64_PARAGRAPH_TAG . ">".\Fenrizbes\TypographBundle\EMT\EMTLib::iblock($m[2].$m[3])."<" .self::BASE64_PARAGRAPH_TAG . ">"', $text);

 		//$text = $this->preg_replace_e('/([\040\t]+)?(\n)+([\040\t]*)(\n)+/e', '"</" . self::BASE64_PARAGRAPH_TAG . ">"."<" .self::BASE64_PARAGRAPH_TAG . ">"', $text);

 		//может от открвающего до закрывающего ?!

-		$text = preg_replace('/\<' . self::BASE64_PARAGRAPH_TAG . '\>('.EMTLib::INTERNAL_BLOCK_OPEN.'[a-zA-Z0-9\/=]+?'.EMTLib::INTERNAL_BLOCK_CLOSE.')?\<\/' . self::BASE64_PARAGRAPH_TAG . '\>/s', "", $text);

+		$text = preg_replace('/\<'.self::BASE64_PARAGRAPH_TAG.'\>('.EMTLib::INTERNAL_BLOCK_OPEN.'[a-zA-Z0-9\/=]+?'.EMTLib::INTERNAL_BLOCK_CLOSE.')?\<\/'.self::BASE64_PARAGRAPH_TAG.'\>/s', "", $text);

 		return $text;

 	}

 		

@@ -84,16 +84,16 @@ 
 	 */	

 	protected function build_paragraphs()

 	{

-		$r = mb_strpos($this->_text, '<' . self::BASE64_PARAGRAPH_TAG . '>' );

-		$p = EMTLib::rstrpos($this->_text, '</' . self::BASE64_PARAGRAPH_TAG . '>' )	;

-		if(($r!== false) && ($p !== false)) {			

+		$r = mb_strpos($this->_text, '<'.self::BASE64_PARAGRAPH_TAG.'>');

+		$p = EMTLib::rstrpos($this->_text, '</'.self::BASE64_PARAGRAPH_TAG.'>');

+		if (($r !== false) && ($p !== false)) {			

 			

-			$beg = mb_substr($this->_text,0,$r);

-			$end = mb_substr($this->_text,$p+mb_strlen('</' . self::BASE64_PARAGRAPH_TAG . '>'));			

+			$beg = mb_substr($this->_text, 0, $r);

+			$end = mb_substr($this->_text, $p+mb_strlen('</'.self::BASE64_PARAGRAPH_TAG.'>'));			

 			$this->_text = 

-							(trim($beg) ? $this->do_paragraphs($beg). "\n":"") .'<' . self::BASE64_PARAGRAPH_TAG . '>'.

-							mb_substr($this->_text,$r + mb_strlen('<' . self::BASE64_PARAGRAPH_TAG . '>'),$p -($r + mb_strlen('<' . self::BASE64_PARAGRAPH_TAG . '>')) ).'</' . self::BASE64_PARAGRAPH_TAG . '>'.

-							(trim($end) ? "\n".$this->do_paragraphs($end) :"") ;

+							(trim($beg) ? $this->do_paragraphs($beg)."\n" : "").'<'.self::BASE64_PARAGRAPH_TAG.'>'.

+							mb_substr($this->_text, $r+mb_strlen('<'.self::BASE64_PARAGRAPH_TAG.'>'), $p-($r+mb_strlen('<'.self::BASE64_PARAGRAPH_TAG.'>'))).'</'.self::BASE64_PARAGRAPH_TAG.'>'.

+							(trim($end) ? "\n".$this->do_paragraphs($end) : "");

 		} else {

 			$this->_text = $this->do_paragraphs($this->_text);

 		}

@@ -106,11 +106,11 @@ 
 	 */

 	protected function build_brs()

 	{

-		$this->_text = $this->preg_replace_e('/(\<\/' . self::BASE64_PARAGRAPH_TAG . '\>)([\r\n \t]+)(\<' . self::BASE64_PARAGRAPH_TAG . '\>)/mse', '$m[1].\Fenrizbes\TypographBundle\EMT\EMTLib::iblock($m[2]).$m[3]', $this->_text);

+		$this->_text = $this->preg_replace_e('/(\<\/'.self::BASE64_PARAGRAPH_TAG.'\>)([\r\n \t]+)(\<'.self::BASE64_PARAGRAPH_TAG.'\>)/mse', '$m[1].\Fenrizbes\TypographBundle\EMT\EMTLib::iblock($m[2]).$m[3]', $this->_text);

 		

-		if (!preg_match('/\<' . self::BASE64_BREAKLINE_TAG . '\>/', $this->_text)) {

-			$this->_text = str_replace("\r\n","\n",$this->_text);

-			$this->_text = str_replace("\r","\n",$this->_text);

+		if (!preg_match('/\<'.self::BASE64_BREAKLINE_TAG.'\>/', $this->_text)) {

+			$this->_text = str_replace("\r\n", "\n", $this->_text);

+			$this->_text = str_replace("\r", "\n", $this->_text);

 			//$this->_text = $this->preg_replace_e('/(\n|\r)/e', '"<" . self::BASE64_BREAKLINE_TAG . ">"', $this->_text);

 			$this->_text = $this->preg_replace_e('/(\n)/e', '"<" . self::BASE64_BREAKLINE_TAG . ">\n"', $this->_text);

 		}