it-blaster / typograph-bundle

EMT/EMTypograph.php

Indentation +13 added lines, -13 removed lines

@@ -12,19 +12,19 @@
 class EMTypograph extends EMTBase

 {

 	public $trets = array(

-        '\Fenrizbes\TypographBundle\EMT\EMTTretQuote',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretDash',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretSymbol',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretPunctmark',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretNumber',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretSpace',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretAbbr',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretNobr',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretDate',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretOptAlign',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretEtc',

-        '\Fenrizbes\TypographBundle\EMT\EMTTretText'

-    );

+		'\Fenrizbes\TypographBundle\EMT\EMTTretQuote',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretDash',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretSymbol',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretPunctmark',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretNumber',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretSpace',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretAbbr',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretNobr',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretDate',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretOptAlign',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretEtc',

+		'\Fenrizbes\TypographBundle\EMT\EMTTretText'

+	);

 	

 	

 	protected $group_list  = array(

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();

 	}

Braces +35 added lines, -11 removed lines

@@ -149,13 +149,19 @@ 
 			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 +176,24 @@ 
 	 */

 	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"))

 		{

 			$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,7 +210,9 @@ 
 	 */

 	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]))

@@ -209,15 +225,21 @@ 
 			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($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 +254,9 @@ 
 	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

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 	public $title = "Расстановка и удаление пробелов";

 	

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

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

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

 	

 	public $classes = array(

 			'nowrap'           => 'word-spacing:nowrap;',

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/EMTTretQuote.php

Indentation +174 added lines, -174 removed lines

@@ -15,178 +15,178 @@
 

 class EMTTretQuote extends EMTTret

 {

-    /**

-     * Базовые параметры тофа

-     *

-     * @var array

-     */

-    public $title = "Кавычки";

-

-

-    public $rules = array(

-        'quotes_outside_a' => array(

-            'description'	=> 'Кавычки вне тэга <a>',

-            //'pattern' 		=> '/(\<%%\_\_.+?\>)\"(.+?)\"(\<\/%%\_\_.+?\>)/s',

-            'pattern' 		=> '/(\<%%\_\_[^\>]+\>)\"(.+?)\"(\<\/%%\_\_[^\>]+\>)/s',

-            'replacement' 	=> '"\1\2\3"'

-        ),

-

-        'open_quote' => array(

-            'description'	=> 'Открывающая кавычка',

-            'pattern' 		=> '/(^|\(|\s|\>|-)((\"|\\\")+)(\S+)/iue',

-            'replacement' 	=> '$m[1] . str_repeat(self::QUOTE_FIRS_OPEN, substr_count($m[2],"\"") ) . $m[4]'

-        ),

-        'close_quote' => array(

-            'description'	=> 'Закрывающая кавычка',

-            'pattern' 		=> '/([a-zа-яё0-9]|\.|\&hellip\;|\!|\?|\>|\)|\:|\+|\%|\@|\#|\$|\*)((\"|\\\")+)(\.|\&hellip\;|\;|\:|\?|\!|\,|\s|\)|\<\/|\<|$)/uie',

-            'replacement' 	=> '$m[1] . str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[2],"\"") ) . $m[4]'

-        ),

-        'close_quote_adv' => array(

-            'description'	=> 'Закрывающая кавычка особые случаи',

-            //'pattern' 		=> '/([a-zа-яё0-9]|\.|\&hellip\;|\!|\?|\>|\)|\:)((\"|\\\"|\&laquo\;)+)(\<.+?\>)(\.|\&hellip\;|\;|\:|\?|\!|\,|\s|\)|\<\/|$)/uie',

-            'pattern' 		=>

-            array(

-                '/([a-zа-яё0-9]|\.|\&hellip\;|\!|\?|\>|\)|\:|\+|\%|\@|\#|\$|\*)((\"|\\\"|\&laquo\;)+)(\<[^\>]+\>)(\.|\&hellip\;|\;|\:|\?|\!|\,|\)|\<\/|$| )/uie',

-                '/([a-zа-яё0-9]|\.|\&hellip\;|\!|\?|\>|\)|\:|\+|\%|\@|\#|\$|\*)(\s+)((\"|\\\")+)(\s+)(\.|\&hellip\;|\;|\:|\?|\!|\,|\)|\<\/|$| )/uie',

-                '/\>(\&laquo\;)\.($|\s|\<)/ui',

-                '/\>(\&laquo\;),($|\s|\<|\S)/ui',

-                '/\>(\&laquo\;):($|\s|\<|\S)/ui',

-                '/\>(\&laquo\;);($|\s|\<|\S)/ui',

-                '/\>(\&laquo\;)\)($|\s|\<|\S)/ui',

-                '/((\"|\\\")+)$/uie',

-            ),

-            'replacement' 	=>

-            array(

-                '$m[1] . str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[2],"\"")+substr_count($m[2],"&laquo;") ) . $m[4]. $m[5]',

-                '$m[1] .$m[2]. str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[3],"\"")+substr_count($m[3],"&laquo;") ) . $m[5]. $m[6]',

-                '>&raquo;.\2',

-                '>&raquo;,\2',

-                '>&raquo;:\2',

-                '>&raquo;;\2',

-                '>&raquo;)\2',

-                'str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[1],"\"") )',

-            ),

-        ),

-        'open_quote_adv' => array(

-            'description'	=> 'Открывающая кавычка особые случаи',

-            'pattern' 		=> '/(^|\(|\s|\>)(\"|\\\")(\s)(\S+)/iue',

-            'replacement' 	=> '$m[1] . self::QUOTE_FIRS_OPEN .$m[4]'

-        ),

-        'close_quote_adv_2' => array(

-            'description'	=> 'Закрывающая кавычка последний шанс',

-            'pattern' 		=> '/(\S)((\"|\\\")+)(\.|\&hellip\;|\;|\:|\?|\!|\,|\s|\)|\<\/|\<|$)/uie',

-            'replacement' 	=> '$m[1] . str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[2],"\"") ) . $m[4]'

-        ),

-        'quotation' => array(

-            'description'	=> 'Внутренние кавычки-лапки и дюймы',

-            'function' => 'build_sub_quotations'

-        ),

-    );

-

-    protected function inject_in($pos, $text, &$thetext)

-    {

-        for($i=0;$i<strlen($text);$i++) $thetext[$pos+$i] = $text[$i];

-    }

-

-    protected function build_sub_quotations()

-    {

-        global $__ax,$__ay;

-

-        $exp = strpos($this->_text, "</cA===>")!==false ? "</cA===>" : (strpos($this->_text,"\r\n")!==false ? "\r\n\r\n" :"\n\n");

-

-        $texts_in = explode($exp, $this->_text);

-        $texts_out = array();

-

-        foreach($texts_in as $textx) {

-

-            $okposstack = array('0');

-            $okpos = 0;

-            $level = 0;

-            $off = 0;

-            while(true)

-            {

-                $p = EMTLib::strpos_ex($textx, array("&laquo;", "&raquo;"), $off);

-                if($p===false) break;

-                if($p['str'] == "&laquo;")

-                {

-                    if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_OPEN, $textx);

-                    $level++;

-                }

-                if($p['str'] == "&raquo;")

-                {

-                    $level--;

-                    if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_CLOSE, $textx);

-                }

-                $off = $p['pos']+strlen($p['str']);

-                if($level == 0)

-                {

-                    $okpos = $off;

-                    array_push($okposstack, $okpos);

-                } elseif($level<0) // уровень стал меньше нуля

-                {

-                    if(!$this->is_on('no_inches'))

-                    {

-                        do{

-                            $lokpos = array_pop($okposstack);

-                            $k = substr($textx, $lokpos, $off-$lokpos);

-                            $k = str_replace(self::QUOTE_CRAWSE_OPEN, self::QUOTE_FIRS_OPEN, $k);

-                            $k = str_replace(self::QUOTE_CRAWSE_CLOSE, self::QUOTE_FIRS_CLOSE, $k);

-                            //$k = preg_replace("/(^|[^0-9])([0-9]+)\&raquo\;/ui", '\1\2&Prime;', $k, 1, $amount);

-

-                            $amount = 0;

-                            $__ax = preg_match_all("/(^|[^0-9])([0-9]+)\&raquo\;/ui", $k, $m);

-                            $__ay = 0;

-                            if($__ax)

-                            {

-                                $k = preg_replace_callback("/(^|[^0-9])([0-9]+)\&raquo\;/ui",

-                                    create_function('$m','global $__ax,$__ay; $__ay++; if($__ay==$__ax){ return $m[1].$m[2]."&Prime;";} return $m[0];'),

-                                    $k);

-                                $amount = 1;

-                            }

-

-

-

-                        } while(($amount==0) && count($okposstack));

-

-                        // успешно сделали замену

-                        if($amount == 1)

-                        {

-                            // заново просмотрим содержимое

-                            $textx = substr($textx, 0, $lokpos). $k . substr($textx, $off);

-                            $off = $lokpos;

-                            $level = 0;

-                            continue;

-                        }

-

-                        // иначе просто заменим последнюю явно на &quot; от отчаяния

-                        if($amount == 0)

-                        {

-                            // говорим, что всё в порядке

-                            $level = 0;

-                            $textx = substr($textx, 0, $p['pos']). '&quot;' . substr($textx, $off);

-                            $off = $p['pos'] + strlen('&quot;');

-                            $okposstack = array($off);

-                            continue;

-                        }

-                    }

-                }

-

-

-            }

-            // не совпало количество, отменяем все подкавычки

-            if($level != 0 ){

-

-                // закрывающих меньше, чем надо

-                if($level>0)

-                {

-                    $k = substr($textx, $okpos);

-                    $k = str_replace(self::QUOTE_CRAWSE_OPEN, self::QUOTE_FIRS_OPEN, $k);

-                    $k = str_replace(self::QUOTE_CRAWSE_CLOSE, self::QUOTE_FIRS_CLOSE, $k);

-                    $textx = substr($textx, 0, $okpos). $k;

-                }

-            }

-            $texts_out[] = $textx;

-        }

-        $this->_text = implode($exp, $texts_out);

-    }

+	/**

+	 * Базовые параметры тофа

+	 *

+	 * @var array

+	 */

+	public $title = "Кавычки";

+

+

+	public $rules = array(

+		'quotes_outside_a' => array(

+			'description'	=> 'Кавычки вне тэга <a>',

+			//'pattern' 		=> '/(\<%%\_\_.+?\>)\"(.+?)\"(\<\/%%\_\_.+?\>)/s',

+			'pattern' 		=> '/(\<%%\_\_[^\>]+\>)\"(.+?)\"(\<\/%%\_\_[^\>]+\>)/s',

+			'replacement' 	=> '"\1\2\3"'

+		),

+

+		'open_quote' => array(

+			'description'	=> 'Открывающая кавычка',

+			'pattern' 		=> '/(^|\(|\s|\>|-)((\"|\\\")+)(\S+)/iue',

+			'replacement' 	=> '$m[1] . str_repeat(self::QUOTE_FIRS_OPEN, substr_count($m[2],"\"") ) . $m[4]'

+		),

+		'close_quote' => array(

+			'description'	=> 'Закрывающая кавычка',

+			'pattern' 		=> '/([a-zа-яё0-9]|\.|\&hellip\;|\!|\?|\>|\)|\:|\+|\%|\@|\#|\$|\*)((\"|\\\")+)(\.|\&hellip\;|\;|\:|\?|\!|\,|\s|\)|\<\/|\<|$)/uie',

+			'replacement' 	=> '$m[1] . str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[2],"\"") ) . $m[4]'

+		),

+		'close_quote_adv' => array(

+			'description'	=> 'Закрывающая кавычка особые случаи',

+			//'pattern' 		=> '/([a-zа-яё0-9]|\.|\&hellip\;|\!|\?|\>|\)|\:)((\"|\\\"|\&laquo\;)+)(\<.+?\>)(\.|\&hellip\;|\;|\:|\?|\!|\,|\s|\)|\<\/|$)/uie',

+			'pattern' 		=>

+			array(

+				'/([a-zа-яё0-9]|\.|\&hellip\;|\!|\?|\>|\)|\:|\+|\%|\@|\#|\$|\*)((\"|\\\"|\&laquo\;)+)(\<[^\>]+\>)(\.|\&hellip\;|\;|\:|\?|\!|\,|\)|\<\/|$| )/uie',

+				'/([a-zа-яё0-9]|\.|\&hellip\;|\!|\?|\>|\)|\:|\+|\%|\@|\#|\$|\*)(\s+)((\"|\\\")+)(\s+)(\.|\&hellip\;|\;|\:|\?|\!|\,|\)|\<\/|$| )/uie',

+				'/\>(\&laquo\;)\.($|\s|\<)/ui',

+				'/\>(\&laquo\;),($|\s|\<|\S)/ui',

+				'/\>(\&laquo\;):($|\s|\<|\S)/ui',

+				'/\>(\&laquo\;);($|\s|\<|\S)/ui',

+				'/\>(\&laquo\;)\)($|\s|\<|\S)/ui',

+				'/((\"|\\\")+)$/uie',

+			),

+			'replacement' 	=>

+			array(

+				'$m[1] . str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[2],"\"")+substr_count($m[2],"&laquo;") ) . $m[4]. $m[5]',

+				'$m[1] .$m[2]. str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[3],"\"")+substr_count($m[3],"&laquo;") ) . $m[5]. $m[6]',

+				'>&raquo;.\2',

+				'>&raquo;,\2',

+				'>&raquo;:\2',

+				'>&raquo;;\2',

+				'>&raquo;)\2',

+				'str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[1],"\"") )',

+			),

+		),

+		'open_quote_adv' => array(

+			'description'	=> 'Открывающая кавычка особые случаи',

+			'pattern' 		=> '/(^|\(|\s|\>)(\"|\\\")(\s)(\S+)/iue',

+			'replacement' 	=> '$m[1] . self::QUOTE_FIRS_OPEN .$m[4]'

+		),

+		'close_quote_adv_2' => array(

+			'description'	=> 'Закрывающая кавычка последний шанс',

+			'pattern' 		=> '/(\S)((\"|\\\")+)(\.|\&hellip\;|\;|\:|\?|\!|\,|\s|\)|\<\/|\<|$)/uie',

+			'replacement' 	=> '$m[1] . str_repeat(self::QUOTE_FIRS_CLOSE, substr_count($m[2],"\"") ) . $m[4]'

+		),

+		'quotation' => array(

+			'description'	=> 'Внутренние кавычки-лапки и дюймы',

+			'function' => 'build_sub_quotations'

+		),

+	);

+

+	protected function inject_in($pos, $text, &$thetext)

+	{

+		for($i=0;$i<strlen($text);$i++) $thetext[$pos+$i] = $text[$i];

+	}

+

+	protected function build_sub_quotations()

+	{

+		global $__ax,$__ay;

+

+		$exp = strpos($this->_text, "</cA===>")!==false ? "</cA===>" : (strpos($this->_text,"\r\n")!==false ? "\r\n\r\n" :"\n\n");

+

+		$texts_in = explode($exp, $this->_text);

+		$texts_out = array();

+

+		foreach($texts_in as $textx) {

+

+			$okposstack = array('0');

+			$okpos = 0;

+			$level = 0;

+			$off = 0;

+			while(true)

+			{

+				$p = EMTLib::strpos_ex($textx, array("&laquo;", "&raquo;"), $off);

+				if($p===false) break;

+				if($p['str'] == "&laquo;")

+				{

+					if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_OPEN, $textx);

+					$level++;

+				}

+				if($p['str'] == "&raquo;")

+				{

+					$level--;

+					if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_CLOSE, $textx);

+				}

+				$off = $p['pos']+strlen($p['str']);

+				if($level == 0)

+				{

+					$okpos = $off;

+					array_push($okposstack, $okpos);

+				} elseif($level<0) // уровень стал меньше нуля

+				{

+					if(!$this->is_on('no_inches'))

+					{

+						do{

+							$lokpos = array_pop($okposstack);

+							$k = substr($textx, $lokpos, $off-$lokpos);

+							$k = str_replace(self::QUOTE_CRAWSE_OPEN, self::QUOTE_FIRS_OPEN, $k);

+							$k = str_replace(self::QUOTE_CRAWSE_CLOSE, self::QUOTE_FIRS_CLOSE, $k);

+							//$k = preg_replace("/(^|[^0-9])([0-9]+)\&raquo\;/ui", '\1\2&Prime;', $k, 1, $amount);

+

+							$amount = 0;

+							$__ax = preg_match_all("/(^|[^0-9])([0-9]+)\&raquo\;/ui", $k, $m);

+							$__ay = 0;

+							if($__ax)

+							{

+								$k = preg_replace_callback("/(^|[^0-9])([0-9]+)\&raquo\;/ui",

+									create_function('$m','global $__ax,$__ay; $__ay++; if($__ay==$__ax){ return $m[1].$m[2]."&Prime;";} return $m[0];'),

+									$k);

+								$amount = 1;

+							}

+

+

+

+						} while(($amount==0) && count($okposstack));

+

+						// успешно сделали замену

+						if($amount == 1)

+						{

+							// заново просмотрим содержимое

+							$textx = substr($textx, 0, $lokpos). $k . substr($textx, $off);

+							$off = $lokpos;

+							$level = 0;

+							continue;

+						}

+

+						// иначе просто заменим последнюю явно на &quot; от отчаяния

+						if($amount == 0)

+						{

+							// говорим, что всё в порядке

+							$level = 0;

+							$textx = substr($textx, 0, $p['pos']). '&quot;' . substr($textx, $off);

+							$off = $p['pos'] + strlen('&quot;');

+							$okposstack = array($off);

+							continue;

+						}

+					}

+				}

+

+

+			}

+			// не совпало количество, отменяем все подкавычки

+			if($level != 0 ){

+

+				// закрывающих меньше, чем надо

+				if($level>0)

+				{

+					$k = substr($textx, $okpos);

+					$k = str_replace(self::QUOTE_CRAWSE_OPEN, self::QUOTE_FIRS_OPEN, $k);

+					$k = str_replace(self::QUOTE_CRAWSE_CLOSE, self::QUOTE_FIRS_CLOSE, $k);

+					$textx = substr($textx, 0, $okpos). $k;

+				}

+			}

+			$texts_out[] = $textx;

+		}

+		$this->_text = implode($exp, $texts_out);

+	}

 }

Spacing +25 added lines, -25 removed lines

@@ -85,48 +85,48 @@ 
 

     protected function inject_in($pos, $text, &$thetext)

     {

-        for($i=0;$i<strlen($text);$i++) $thetext[$pos+$i] = $text[$i];

+        for ($i = 0; $i<strlen($text); $i++) $thetext[$pos+$i] = $text[$i];

     }

 

     protected function build_sub_quotations()

     {

-        global $__ax,$__ay;

+        global $__ax, $__ay;

 

-        $exp = strpos($this->_text, "</cA===>")!==false ? "</cA===>" : (strpos($this->_text,"\r\n")!==false ? "\r\n\r\n" :"\n\n");

+        $exp = strpos($this->_text, "</cA===>") !== false ? "</cA===>" : (strpos($this->_text, "\r\n") !== false ? "\r\n\r\n" : "\n\n");

 

         $texts_in = explode($exp, $this->_text);

         $texts_out = array();

 

-        foreach($texts_in as $textx) {

+        foreach ($texts_in as $textx) {

 

             $okposstack = array('0');

             $okpos = 0;

             $level = 0;

             $off = 0;

-            while(true)

+            while (true)

             {

                 $p = EMTLib::strpos_ex($textx, array("&laquo;", "&raquo;"), $off);

-                if($p===false) break;

-                if($p['str'] == "&laquo;")

+                if ($p === false) break;

+                if ($p['str'] == "&laquo;")

                 {

-                    if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_OPEN, $textx);

+                    if ($level>0) if (!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_OPEN, $textx);

                     $level++;

                 }

-                if($p['str'] == "&raquo;")

+                if ($p['str'] == "&raquo;")

                 {

                     $level--;

-                    if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_CLOSE, $textx);

+                    if ($level>0) if (!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_CLOSE, $textx);

                 }

                 $off = $p['pos']+strlen($p['str']);

-                if($level == 0)

+                if ($level == 0)

                 {

                     $okpos = $off;

                     array_push($okposstack, $okpos);

-                } elseif($level<0) // уровень стал меньше нуля

+                } elseif ($level<0) // уровень стал меньше нуля

                 {

-                    if(!$this->is_on('no_inches'))

+                    if (!$this->is_on('no_inches'))

                     {

-                        do{

+                        do {

                             $lokpos = array_pop($okposstack);

                             $k = substr($textx, $lokpos, $off-$lokpos);

                             $k = str_replace(self::QUOTE_CRAWSE_OPEN, self::QUOTE_FIRS_OPEN, $k);

@@ -136,35 +136,35 @@ 
                             $amount = 0;

                             $__ax = preg_match_all("/(^|[^0-9])([0-9]+)\&raquo\;/ui", $k, $m);

                             $__ay = 0;

-                            if($__ax)

+                            if ($__ax)

                             {

                                 $k = preg_replace_callback("/(^|[^0-9])([0-9]+)\&raquo\;/ui",

-                                    create_function('$m','global $__ax,$__ay; $__ay++; if($__ay==$__ax){ return $m[1].$m[2]."&Prime;";} return $m[0];'),

+                                    create_function('$m', 'global $__ax,$__ay; $__ay++; if($__ay==$__ax){ return $m[1].$m[2]."&Prime;";} return $m[0];'),

                                     $k);

                                 $amount = 1;

                             }

 

 

 

-                        } while(($amount==0) && count($okposstack));

+                        } while (($amount == 0) && count($okposstack));

 

                         // успешно сделали замену

-                        if($amount == 1)

+                        if ($amount == 1)

                         {

                             // заново просмотрим содержимое

-                            $textx = substr($textx, 0, $lokpos). $k . substr($textx, $off);

+                            $textx = substr($textx, 0, $lokpos).$k.substr($textx, $off);

                             $off = $lokpos;

                             $level = 0;

                             continue;

                         }

 

                         // иначе просто заменим последнюю явно на &quot; от отчаяния

-                        if($amount == 0)

+                        if ($amount == 0)

                         {

                             // говорим, что всё в порядке

                             $level = 0;

-                            $textx = substr($textx, 0, $p['pos']). '&quot;' . substr($textx, $off);

-                            $off = $p['pos'] + strlen('&quot;');

+                            $textx = substr($textx, 0, $p['pos']).'&quot;'.substr($textx, $off);

+                            $off = $p['pos']+strlen('&quot;');

                             $okposstack = array($off);

                             continue;

                         }

@@ -174,15 +174,15 @@ 
 

             }

             // не совпало количество, отменяем все подкавычки

-            if($level != 0 ){

+            if ($level != 0) {

 

                 // закрывающих меньше, чем надо

-                if($level>0)

+                if ($level>0)

                 {

                     $k = substr($textx, $okpos);

                     $k = str_replace(self::QUOTE_CRAWSE_OPEN, self::QUOTE_FIRS_OPEN, $k);

                     $k = str_replace(self::QUOTE_CRAWSE_CLOSE, self::QUOTE_FIRS_CLOSE, $k);

-                    $textx = substr($textx, 0, $okpos). $k;

+                    $textx = substr($textx, 0, $okpos).$k;

                 }

             }

             $texts_out[] = $textx;

Braces +15 added lines, -5 removed lines

@@ -85,7 +85,9 @@ 
 

     protected function inject_in($pos, $text, &$thetext)

     {

-        for($i=0;$i<strlen($text);$i++) $thetext[$pos+$i] = $text[$i];

+        for($i=0;$i<strlen($text);$i++) {

+        	$thetext[$pos+$i] = $text[$i];

+        }

     }

 

     protected function build_sub_quotations()

@@ -106,28 +108,36 @@ 
             while(true)

             {

                 $p = EMTLib::strpos_ex($textx, array("&laquo;", "&raquo;"), $off);

-                if($p===false) break;

+                if($p===false) {

+                	break;

+                }

                 if($p['str'] == "&laquo;")

                 {

-                    if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_OPEN, $textx);

+                    if($level>0) {

+                    	if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_OPEN, $textx);

+                    }

                     $level++;

                 }

                 if($p['str'] == "&raquo;")

                 {

                     $level--;

-                    if($level>0) if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_CLOSE, $textx);

+                    if($level>0) {

+                    	if(!$this->is_on('no_bdquotes')) $this->inject_in($p['pos'], self::QUOTE_CRAWSE_CLOSE, $textx);

+                    }

                 }

                 $off = $p['pos']+strlen($p['str']);

                 if($level == 0)

                 {

                     $okpos = $off;

                     array_push($okposstack, $okpos);

-                } elseif($level<0) // уровень стал меньше нуля

+                } elseif($level<0) {

+                	// уровень стал меньше нуля

                 {

                     if(!$this->is_on('no_inches'))

                     {

                         do{

                             $lokpos = array_pop($okposstack);

+                }

                             $k = substr($textx, $lokpos, $off-$lokpos);

                             $k = str_replace(self::QUOTE_CRAWSE_OPEN, self::QUOTE_FIRS_OPEN, $k);

                             $k = str_replace(self::QUOTE_CRAWSE_CLOSE, self::QUOTE_FIRS_CLOSE, $k);

EMT/EMTTretAbbr.php

Spacing +1 added lines, -1 removed lines

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

 	public $title = "Сокращения";

 	

-	public $domain_zones = array('ru','ру','com','ком','org','орг', 'уа', 'ua');

+	public $domain_zones = array('ru', 'ру', 'com', 'ком', 'org', 'орг', 'уа', 'ua');

 	

 	public $classes = array(

 			'nowrap'           => 'word-spacing:nowrap;',

Twig/TypographTwigExtension.php

Indentation +19 added lines, -19 removed lines

@@ -6,27 +6,27 @@
 
 class TypographTwigExtension extends \Twig_Extension
 {
-    protected $typograph;
+	protected $typograph;
 
-    public function __construct(TypographService $typograph)
-    {
-        $this->typograph = $typograph;
-    }
+	public function __construct(TypographService $typograph)
+	{
+		$this->typograph = $typograph;
+	}
 
-    public function getName()
-    {
-        return 'FenrizbesTypograph';
-    }
+	public function getName()
+	{
+		return 'FenrizbesTypograph';
+	}
 
-    public function getFilters()
-    {
-        return array(
-            new \Twig_SimpleFilter('typograph', array($this, 'applyTypograph'), array('is_safe' => array('html')))
-        );
-    }
+	public function getFilters()
+	{
+		return array(
+			new \Twig_SimpleFilter('typograph', array($this, 'applyTypograph'), array('is_safe' => array('html')))
+		);
+	}
 
-    public function applyTypograph($string, $config = null)
-    {
-        return $this->typograph->apply($string, $config);
-    }
+	public function applyTypograph($string, $config = null)
+	{
+		return $this->typograph->apply($string, $config);
+	}
 }
\ No newline at end of file

DependencyInjection/FenrizbesTypographExtension.php

Indentation +8 added lines, -8 removed lines

@@ -9,14 +9,14 @@
 
 class FenrizbesTypographExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
+	public function load(array $configs, ContainerBuilder $container)
+	{
+		$configuration = new Configuration();
+		$config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
+		$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+		$loader->load('services.yml');
 
-        $container->setParameter('fenrizbes_typograph.configs', $config['configs']);
-    }
+		$container->setParameter('fenrizbes_typograph.configs', $config['configs']);
+	}
 }

DependencyInjection/Configuration.php

Indentation +27 added lines, -27 removed lines

@@ -7,35 +7,35 @@
 
 class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('fenrizbes_typograph');
+	public function getConfigTreeBuilder()
+	{
+		$treeBuilder = new TreeBuilder();
+		$rootNode = $treeBuilder->root('fenrizbes_typograph');
 
-        $rootNode
-            ->children()
-                ->arrayNode('configs')
-                    ->useAttributeAsKey('name')
+		$rootNode
+			->children()
+				->arrayNode('configs')
+					->useAttributeAsKey('name')
 
-                    ->prototype('array')
-                        ->useAttributeAsKey('name')
-                        ->prototype('variable')->end()
-                    ->end()
+					->prototype('array')
+						->useAttributeAsKey('name')
+						->prototype('variable')->end()
+					->end()
 
-                    ->defaultValue(array(
-                        'default' => array(
-                            'Text.paragraphs'           => 'off',
-                            'Text.breakline'            => 'off',
-                            'Text.auto_links'           => 'off',
-                            'Text.email'                => 'off',
-                            'OptAlign.oa_oquote'        => 'off',
-                            'OptAlign.oa_obracket_coma' => 'off'
-                        )
-                    ))
-                ->end()
-            ->end()
-        ;
+					->defaultValue(array(
+						'default' => array(
+							'Text.paragraphs'           => 'off',
+							'Text.breakline'            => 'off',
+							'Text.auto_links'           => 'off',
+							'Text.email'                => 'off',
+							'OptAlign.oa_oquote'        => 'off',
+							'OptAlign.oa_obracket_coma' => 'off'
+						)
+					))
+				->end()
+			->end()
+		;
 
-        return $treeBuilder;
-    }
+		return $treeBuilder;
+	}
 }