Changeset 81332 in spip-zone

Timestamp:

Mar 13, 2014, 11:27:57 AM (6 years ago)

Author:

cedric@…

Message:

Upgrade de la librairie CSSTidy en v1.5.2

Location:

_core_/branches/spip-3.0/plugins/compresseur

Files:

• lib/csstidy/Docs (deleted)
• lib/csstidy/README (modified) (2 diffs)
• lib/csstidy/class.csstidy.php (modified) (83 diffs)
• lib/csstidy/class.csstidy_ctype.php (deleted)
• lib/csstidy/class.csstidy_optimise.php (modified) (46 diffs)
• lib/csstidy/class.csstidy_print.php (modified) (20 diffs)
• lib/csstidy/cssparse.css (deleted)
• lib/csstidy/cssparsed.css (deleted)
• lib/csstidy/data.inc.php (modified) (7 diffs)
• lib/csstidy/template.tpl (deleted)
• lib/csstidy/template1.tpl (deleted)
• lib/csstidy/template2.tpl (deleted)
• lib/csstidy/template3.tpl (deleted)
• paquet.xml (modified) (1 diff)

_core_/branches/spip-3.0/plugins/compresseur/lib/csstidy/README

@@ -3 +3 @@
 
 CSSTidy is a CSS minifier 
-Since the original project (http://csstidy.sourceforge.net/index.php) has been suspended
-here is the import of https://csstidy.svn.sourceforge.net/svnroot/csstidy on 2010-11-14
+
+v1.5.2
+  is PHP 5.4+ compliant, removes use of GLOBALS, fixes some bugs, integrates CSS3 units
+  and now available on https://packagist.org/packages/cerdic/css-tidy
 
 v1.4 is the new version coming from master branch (corresponds to the initial trunk of svn repository) after beeing stabilized
@@ -10 +12 @@
 v1.3 branch corresponds to the last stable relase published by the author.
 It integrates some bugfixes and a 1.3.1 version has been taged
+Since the original project (http://csstidy.sourceforge.net/index.php) has been suspended
+here is the import of https://csstidy.svn.sourceforge.net/svnroot/csstidy on 2010-11-14
 
 Only PHP version is here maintained

_core_/branches/spip-3.0/plugins/compresseur/lib/csstidy/class.csstidy.php

@@ -30 +30 @@
  * @author Cedric Morin (cedric at yterium dot com) 2010-2012
  * @author Christopher Finke (cfinke at gmail.com) 2012
+ * @author Mark Scherer (remove $GLOBALS once and for all + PHP5.4 comp) 2012
  */
+
 /**
  * Defines ctype functions if required
- *
+ * @todo make them methods of csstidy class
  * @version 1.0
  */
-require_once('class.csstidy_ctype.php');
+if (!function_exists('ctype_space')) {
+        /* ctype_space  Check for whitespace character(s) */
+        function ctype_space($text) {
+                return!preg_match("/[^\s\r\n\t\f]/", $text);
+        }
+
+}
+if (!function_exists('ctype_alpha')) {
+        /* ctype_alpha  Check for alphabetic character(s) */
+        function ctype_alpha($text) {
+                return preg_match("/[a-zA-Z]/", $text);
+        }
+
+}
 
 /**
- * Various CSS data needed for correct optimisations etc.
- *
- * @version 1.3
+ * Defines constants
+ * @todo //TODO: make them class constants of csstidy
  */
-require('data.inc.php');
+define('AT_START',    1);
+define('AT_END',      2);
+define('SEL_START',   3);
+define('SEL_END',     4);
+define('PROPERTY',    5);
+define('VALUE',       6);
+define('COMMENT',     7);
+define('DEFAULT_AT', 41);
 
 /**
@@ -62 +83 @@
  * CSS Parser class
  *
-
  * This class represents a CSS parser which reads CSS code and saves it in an array.
  * In opposite to most other CSS parsers, it does not use regular expressions and
@@ -70 +90 @@
  * @package csstidy
  * @author Florian Schmitz (floele at gmail dot com) 2005-2006
- * @version 1.4.0
+ * @version 1.5.2
  */
 class csstidy {
@@ -79 +99 @@
          * @access public
          */
-        var $css = array();
+        public $css = array();
         /**
          * Saves the parsed CSS (raw)
@@ -85 +105 @@
          * @access private
          */
-        var $tokens = array();
+        public $tokens = array();
         /**
          * Printer class
@@ -92 +112 @@
          * @access public
          */
-        var $print;
+        public $print;
         /**
          * Optimiser class
@@ -99 +119 @@
          * @access private
          */
-        var $optimise;
+        public $optimise;
         /**
          * Saves the CSS charset (@charset)
@@ -105 +125 @@
          * @access private
          */
-        var $charset = '';
+        public $charset = '';
         /**
          * Saves all @import URLs
@@ -111 +131 @@
          * @access private
          */
-        var $import = array();
+        public $import = array();
         /**
          * Saves the namespace
@@ -117 +137 @@
          * @access private
          */
-        var $namespace = '';
+        public $namespace = '';
         /**
          * Contains the version of csstidy
@@ -123 +143 @@
          * @access private
          */
-        var $version = '1.3';
+        public $version = '1.5.2';
         /**
          * Stores the settings
@@ -129 +149 @@
          * @access private
          */
-        var $settings = array();
+        public $settings = array();
         /**
          * Saves the parser-status.
@@ -144 +164 @@
          * @access private
          */
-        var $status = 'is';
+        public $status = 'is';
         /**
          * Saves the current at rule (@media)
@@ -150 +170 @@
          * @access private
          */
-        var $at = '';
+        public $at = '';
         /**
          * Saves the at rule for next selector (during @font-face or other @)
@@ -156 +176 @@
          * @access private
          */
-        var $next_selector_at = '';
+        public $next_selector_at = '';
 
         /**
@@ -163 +183 @@
          * @access private
          */
-        var $selector = '';
+        public $selector = '';
         /**
          * Saves the current property
@@ -169 +189 @@
          * @access private
          */
-        var $property = '';
+        public $property = '';
         /**
          * Saves the position of , in selectors
@@ -175 +195 @@
          * @access private
          */
-        var $sel_separate = array();
+        public $sel_separate = array();
         /**
          * Saves the current value
@@ -181 +201 @@
          * @access private
          */
-        var $value = '';
+        public $value = '';
         /**
          * Saves the current sub-value
@@ -192 +212 @@
          * @access private
          */
-        var $sub_value = '';
+        public $sub_value = '';
         /**
          * Array which saves all subvalues for a property.
@@ -199 +219 @@
          * @access private
          */
-        var $sub_value_arr = array();
+        public $sub_value_arr = array();
         /**
          * Saves the stack of characters that opened the current strings
@@ -205 +225 @@
          * @access private
          */
-        var $str_char = array();
-        var $cur_string = array();
+        public $str_char = array();
+        public $cur_string = array();
         /**
          * Status from which the parser switched to ic or instr
@@ -212 +232 @@
          * @access private
          */
-        var $from = array();
+        public $from = array();
         /**
         /**
@@ -219 +239 @@
          * @access private
          */
-        var $invalid_at = false;
+        public $invalid_at = false;
         /**
          * =true if something has been added to the current selector
@@ -225 +245 @@
          * @access private
          */
-        var $added = false;
+        public $added = false;
         /**
          * Array which saves the message log
@@ -231 +251 @@
          * @access private
          */
-        var $log = array();
+        public $log = array();
         /**
          * Saves the line number
@@ -237 +257 @@
          * @access private
          */
-        var $line = 1;
+        public $line = 1;
         /**
          * Marks if we need to leave quotes for a string
@@ -243 +263 @@
          * @access private
          */
-        var $quoted_string = array();
+        public $quoted_string = array();
 
         /**
@@ -249 +269 @@
          * @var string
          */
-        var $tokens_list = "";
+        public $tokens_list = "";
+
+        /**
+         * Various CSS Data for CSSTidy
+         * @var array
+         */
+        public $data = array();
+
         /**
          * Loads standard template and sets default settings
@@ -255 +282 @@
          * @version 1.3
          */
-        function csstidy() {
+        public function __construct() {
+                $data = array();
+                include('data.inc.php');
+                $this->data = $data;
+
                 $this->settings['remove_bslash'] = true;
                 $this->settings['compress_colors'] = true;
@@ -261 +292 @@
                 $this->settings['lowercase_s'] = false;
                 /*
-                  1 common shorthands optimization
-                  2 + font property optimization
-                  3 + background property optimization
+                        1 common shorthands optimization
+                        2 + font property optimization
+                        3 + background property optimization
                  */
                 $this->settings['optimise_shorthands'] = 1;
@@ -274 +305 @@
                 $this->settings['sort_properties'] = false;
                 /*
-                  1, 3, 5, etc -- enable sorting selectors inside @media: a{}b{}c{}
-                  2, 5, 8, etc -- enable sorting selectors inside one CSS declaration: a,b,c{}
-                  preserve order by default cause it can break functionnality
+                        1, 3, 5, etc -- enable sorting selectors inside @media: a{}b{}c{}
+                        2, 5, 8, etc -- enable sorting selectors inside one CSS declaration: a,b,c{}
+                        preserve order by default cause it can break functionnality
                  */
                 $this->settings['sort_selectors'] = 0;
@@ -291 +322 @@
                 $this->optimise = new csstidy_optimise($this);
 
-                $this->tokens_list = & $GLOBALS['csstidy']['tokens'];
+                $this->tokens_list = & $this->data['csstidy']['tokens'];
         }
 
@@ -301 +332 @@
          * @version 1.0
          */
-        function get_cfg($setting) {
+        public function get_cfg($setting) {
                 if (isset($this->settings[$setting])) {
                         return $this->settings[$setting];
@@ -314 +345 @@
          * @version 1.4
          */
-        function _load_template($template) {
+        public function _load_template($template) {
                 switch ($template) {
                         case 'default':
@@ -346 +377 @@
          * @version 1.0
          */
-        function set_cfg($setting, $value=null) {
+        public function set_cfg($setting, $value=null) {
                 if (is_array($setting) && $value === null) {
                         foreach ($setting as $setprop => $setval) {
@@ -355 +386 @@
                         }
                         return true;
-                } else if (isset($this->settings[$setting]) && $value !== '') {
+                } elseif (isset($this->settings[$setting]) && $value !== '') {
                         $this->settings[$setting] = $value;
                         if ($setting === 'template') {
@@ -373 +404 @@
          * @version 1.0
          */
-        function _add_token($type, $data, $do = false) {
+        public function _add_token($type, $data, $do = false) {
                 if ($this->get_cfg('preserve_css') || $do) {
                         $this->tokens[] = array($type, ($type == COMMENT) ? $data : trim($data));
@@ -387 +418 @@
          * @version 1.0
          */
-        function log($message, $type, $line = -1) {
+        public function log($message, $type, $line = -1) {
                 if ($line === -1) {
                         $line = $this->line;
@@ -406 +437 @@
          * @version 1.2
          */
-        function _unicode(&$string, &$i) {
+        public function _unicode(&$string, &$i) {
                 ++$i;
                 $add = '';
@@ -453 +484 @@
          * @version 1.4
          */
-        function write_page($filename, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
+        public function write_page($filename, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
                 $this->write($filename, true);
         }
@@ -469 +500 @@
          * @version 1.4
          */
-        function write($filename, $formatted=false, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en', $pre_code=true) {
+        public function write($filename, $formatted=false, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en', $pre_code=true) {
                 $filename .= ( $formatted) ? '.xhtml' : '.css';
 
@@ -498 +529 @@
          * @see http://csstidy.sourceforge.net/templates.php
          */
-        function load_template($content, $from_file=true) {
-                $predefined_templates = & $GLOBALS['csstidy']['predefined_templates'];
+        public function load_template($content, $from_file=true) {
+                $predefined_templates = & $this->data['csstidy']['predefined_templates'];
                 if ($content === 'high_compression' || $content === 'default' || $content === 'highest_compression' || $content === 'low_compression') {
                         $this->template = $predefined_templates[$content];
@@ -523 +554 @@
          * @version 1.0
          */
-        function parse_from_url($url) {
+        public function parse_from_url($url) {
                 return $this->parse(@file_get_contents($url));
         }
@@ -534 +565 @@
          * @version 1.11
          */
-        function is_token(&$string, $i) {
-                return (strpos($this->tokens_list, $string{$i}) !== false && !csstidy::escaped($string, $i));
+        public function is_token(&$string, $i) {
+                return (strpos($this->tokens_list, $string{$i}) !== false && !$this->escaped($string, $i));
         }
 
@@ -545 +576 @@
          * @version 1.1
          */
-        function parse($string) {
+        public function parse($string) {
                 // Temporarily set locale to en_US in order to handle floats properly
                 $old = @setlocale(LC_ALL, 0);
@@ -554 +585 @@
                 $this->optimise = new csstidy_optimise($this);
 
-                $all_properties = & $GLOBALS['csstidy']['all_properties'];
-                $at_rules = & $GLOBALS['csstidy']['at_rules'];
-                $quoted_string_properties = & $GLOBALS['csstidy']['quoted_string_properties'];
+                $all_properties = & $this->data['csstidy']['all_properties'];
+                $at_rules = & $this->data['csstidy']['at_rules'];
+                $quoted_string_properties = & $this->data['csstidy']['quoted_string_properties'];
 
                 $this->css = array();
@@ -571 +602 @@
                                 /* Case in at-block */
                                 case 'at':
-                                        if (csstidy::is_token($string, $i)) {
+                                        if ($this->is_token($string, $i)) {
                                                 if ($string{$i} === '/' && @$string{$i + 1} === '*') {
                                                         $this->status = 'ic';
@@ -591 +622 @@
                                         } else {
                                                 $lastpos = strlen($this->at) - 1;
-                                                if (!( (ctype_space($this->at{$lastpos}) || csstidy::is_token($this->at, $lastpos) && $this->at{$lastpos} === ',') && ctype_space($string{$i}))) {
+                                                if (!( (ctype_space($this->at{$lastpos}) || $this->is_token($this->at, $lastpos) && $this->at{$lastpos} === ',') && ctype_space($string{$i}))) {
                                                         $this->at .= $string{$i};
                                                 }
@@ -599 +630 @@
                                 /* Case in-selector */
                                 case 'is':
-                                        if (csstidy::is_token($string, $i)) {
+                                        if ($this->is_token($string, $i)) {
                                                 if ($string{$i} === '/' && @$string{$i + 1} === '*' && trim($this->selector) == '') {
                                                         $this->status = 'ic';
@@ -610 +641 @@
                                                                 if (!strcasecmp(substr($string, $i + 1, strlen($name)), $name)) {
                                                                         ($type === 'at') ? $this->at = '@' . $name : $this->selector = '@' . $name;
-                                                                        if ($type === "atis"){
+                                                                        if ($type === 'atis') {
                                                                                 $this->next_selector_at = ($this->next_selector_at?$this->next_selector_at:($this->at?$this->at:DEFAULT_AT));
                                                                                 $this->at = $this->css_new_media_section(' ');
-                                                                                $type = "is";
+                                                                                $type = 'is';
                                                                         }
                                                                         $this->status = $type;
@@ -638 +669 @@
                                                         $this->from[] = 'is';
                                                         /* fixing CSS3 attribute selectors, i.e. a[href$=".mp3" */
-                                                        $this->quoted_string[] = ($string{$i - 1} == '=' );
+                                                        $this->quoted_string[] = ($string{$i - 1} === '=' );
                                                 } elseif ($this->invalid_at && $string{$i} === ';') {
                                                         $this->invalid_at = false;
                                                         $this->status = 'is';
-                                                        if($this->next_selector_at){
+                                                        if ($this->next_selector_at) {
                                                                 $this->at = $this->css_new_media_section($this->next_selector_at);
                                                                 $this->next_selector_at = '';
@@ -648 +679 @@
                                                 } elseif ($string{$i} === '{') {
                                                         $this->status = 'ip';
-                                                        if($this->at == '') {
+                                                        if ($this->at == '') {
                                                                 $this->at = $this->css_new_media_section(DEFAULT_AT);
                                                         }
@@ -671 +702 @@
                                         } else {
                                                 $lastpos = strlen($this->selector) - 1;
-                                                if ($lastpos == -1 || !( (ctype_space($this->selector{$lastpos}) || csstidy::is_token($this->selector, $lastpos) && $this->selector{$lastpos} === ',') && ctype_space($string{$i}))) {
+                                                if ($lastpos == -1 || !( (ctype_space($this->selector{$lastpos}) || $this->is_token($this->selector, $lastpos) && $this->selector{$lastpos} === ',') && ctype_space($string{$i}))) {
                                                         $this->selector .= $string{$i};
                                                 }
@@ -679 +710 @@
                                 /* Case in-property */
                                 case 'ip':
-                                        if (csstidy::is_token($string, $i)) {
+                                        if ($this->is_token($string, $i)) {
                                                 if (($string{$i} === ':' || $string{$i} === '=') && $this->property != '') {
                                                         $this->status = 'iv';
-                                                        if (!$this->get_cfg('discard_invalid_properties') || csstidy::property_is_valid($this->property)) {
+                                                        if (!$this->get_cfg('discard_invalid_properties') || $this->property_is_valid($this->property)) {
                                                                 $this->property = $this->css_new_property($this->at,$this->selector,$this->property);
                                                                 $this->_add_token(PROPERTY, $this->property);
@@ -697 +728 @@
                                                         $this->selector = '';
                                                         $this->property = '';
-                                                        if($this->next_selector_at){
+                                                        if ($this->next_selector_at) {
                                                                 $this->at = $this->css_new_media_section($this->next_selector_at);
                                                                 $this->next_selector_at = '';
@@ -708 +739 @@
                                                 // else this is dumb IE a hack, keep it
                                                 // including //
-                                                elseif (($this->property=='' AND !ctype_space($string{$i}))
-                                                  OR ($this->property=='/' OR $string{$i}=="/")) {
+                                                elseif (($this->property === '' && !ctype_space($string{$i}))
+                                                        || ($this->property === '/' || $string{$i} === '/')) {
                                                         $this->property .= $string{$i};
                                                 }
-                                        }
-                                        elseif (!ctype_space($string{$i})) {
+                                        } elseif (!ctype_space($string{$i})) {
                                                 $this->property .= $string{$i};
                                         }
@@ -721 +751 @@
                                 case 'iv':
                                         $pn = (($string{$i} === "\n" || $string{$i} === "\r") && $this->property_is_next($string, $i + 1) || $i == strlen($string) - 1);
-                                        if (csstidy::is_token($string, $i) || $pn) {
+                                        if ($this->is_token($string, $i) || $pn) {
                                                 if ($string{$i} === '/' && @$string{$i + 1} === '*') {
                                                         $this->status = 'ic';
@@ -763 +793 @@
                                                 }
                                                 if (($string{$i} === '}' || $string{$i} === ';' || $pn) && !empty($this->selector)) {
-                                                        if($this->at == ''){
+                                                        if ($this->at == '') {
                                                                 $this->at = $this->css_new_media_section(DEFAULT_AT);
                                                         }
@@ -780 +810 @@
 
                                                         $this->value = '';
-                                                        while(count($this->sub_value_arr)){
+                                                        while (count($this->sub_value_arr)) {
                                                                 $sub = array_shift($this->sub_value_arr);
-                                                                if (strstr($this->selector, "font-face")){
+                                                                if (strstr($this->selector, 'font-face')) {
                                                                         $sub = $this->quote_font_format($sub);
                                                                 }
 
                                                                 if ($sub != '')
-                                                                        $this->value .= ((!strlen($this->value) OR substr($this->value,-1,1)==',')?'':' ').$sub;
+                                                                        $this->value .= ((!strlen($this->value) || substr($this->value,-1,1) === ',')?'':' ').$sub;
                                                         }
 
                                                         $this->optimise->value();
 
-                                                        $valid = csstidy::property_is_valid($this->property);
+                                                        $valid = $this->property_is_valid($this->property);
                                                         if ((!$this->invalid_at || $this->get_cfg('preserve_css')) && (!$this->get_cfg('discard_invalid_properties') || $valid)) {
                                                                 $this->css_add_property($this->at, $this->selector, $this->property, $this->value);
@@ -816 +846 @@
                                                         $this->invalid_at = false;
                                                         $this->selector = '';
-                                                        if($this->next_selector_at){
+                                                        if ($this->next_selector_at) {
                                                                 $this->at = $this->css_new_media_section($this->next_selector_at);
                                                                 $this->next_selector_at = '';
@@ -841 +871 @@
                                         $temp_add = $string{$i};
 
-                                        // Add another string to the stack. Strings can't be nested inside of quotes, only parentheses, but 
+                                        // Add another string to the stack. Strings can't be nested inside of quotes, only parentheses, but
                                         // parentheticals can be nested more than once.
-                                        if ($_str_char === ")" && ($string{$i} === "(" || $string{$i} === '"' || $string{$i} === '\'') && !csstidy::escaped($string, $i)) {
+                                        if ($_str_char === ")" && ($string{$i} === "(" || $string{$i} === '"' || $string{$i} === '\'') && !$this->escaped($string, $i)) {
                                                 $this->cur_string[] = $string{$i};
-                                                $this->str_char[] = $string{$i} == "(" ? ")" : $string{$i};
+                                                $this->str_char[] = $string{$i} === '(' ? ')' : $string{$i};
                                                 $this->from[] = 'instr';
-                                                $this->quoted_string[] = ($_str_char === ")" AND $string{$i} !== "(" AND trim($_cur_string)=="(")?$_quoted_string:!($string{$i} === "(");
+                                                $this->quoted_string[] = ($_str_char === ')' && $string{$i} !== '(' && trim($_cur_string)==='(')?$_quoted_string:!($string{$i} === '(');
                                                 continue;
                                         }
 
-                                        if ($_str_char !== ")" && ($string{$i} === "\n" || $string{$i} === "\r") && !($string{$i - 1} === '\\' && !csstidy::escaped($string, $i - 1))) {
+                                        if ($_str_char !== ")" && ($string{$i} === "\n" || $string{$i} === "\r") && !($string{$i - 1} === '\\' && !$this->escaped($string, $i - 1))) {
                                                 $temp_add = "\\A";
                                                 $this->log('Fixed incorrect newline in string', 'Warning');
@@ -858 +888 @@
                                         $_cur_string .= $temp_add;
 
-                                        if ($string{$i} === $_str_char && !csstidy::escaped($string, $i)) {
+                                        if ($string{$i} === $_str_char && !$this->escaped($string, $i)) {
                                                 $this->status = array_pop($this->from);
 
-                                                if (!preg_match('|[' . implode('', $GLOBALS['csstidy']['whitespace']) . ']|uis', $_cur_string) && $this->property !== 'content') {
+                                                if (!preg_match('|[' . implode('', $this->data['csstidy']['whitespace']) . ']|uis', $_cur_string) && $this->property !== 'content') {
                                                         if (!$_quoted_string) {
                                                                 if ($_str_char !== ')') {
@@ -883 +913 @@
                                                 array_pop($this->str_char);
 
-                                                if ($_str_char === ")") {
-                                                        $_cur_string = "(" . trim(substr($_cur_string, 1, -1)) . ")";
+                                                if ($_str_char === ')') {
+                                                        $_cur_string = '(' . trim(substr($_cur_string, 1, -1)) . ')';
                                                 }
 
                                                 if ($this->status === 'iv') {
-                                                        if (!$_quoted_string){
-                                                                if (strpos($_cur_string,',')!==false)
+                                                        if (!$_quoted_string) {
+                                                                if (strpos($_cur_string,',') !== false)
                                                                         // we can on only remove space next to ','
-                                                                        $_cur_string = implode(',',array_map('trim',explode(',',$_cur_string)));
+                                                                        $_cur_string = implode(',', array_map('trim', explode(',',$_cur_string)));
                                                                 // and multiple spaces (too expensive)
-                                                                if (strpos($_cur_string,'  ')!==false)
-                                                                        $_cur_string = preg_replace(",\s+,"," ",$_cur_string);
+                                                                if (strpos($_cur_string, '  ') !== false)
+                                                                        $_cur_string = preg_replace(",\s+,", ' ', $_cur_string);
                                                         }
                                                         $this->sub_value .= $_cur_string;
@@ -902 +932 @@
                                                         $this->cur_string[count($this->cur_string)-1] .= $_cur_string;
                                                 }
-                                        }
-                                        else {
+                                        } else {
                                                 $this->cur_string[count($this->cur_string)-1] = $_cur_string;
                                         }
@@ -938 +967 @@
          * @return string
          */
-        function quote_font_format($value){
-                if (strncmp($value,'format',6)==0) {
-                        $p = strrpos($value,")");
+        public function quote_font_format($value) {
+                if (strncmp($value,'format',6) == 0) {
+                        $p = strpos($value,')',7);
                         $end = substr($value,$p);
-                        $format_strings = csstidy::parse_string_list(substr($value, 7, $p-7));
+                        $format_strings = $this->parse_string_list(substr($value, 7, $p-7));
                         if (!$format_strings) {
-                                $value = "";
-                        }
-                        else {
-                                $value = "format(";
+                                $value = '';
+                        } else {
+                                $value = 'format(';
 
                                 foreach ($format_strings as $format_string) {
@@ -964 +992 @@
          * @version 1.0
          */
-        function explode_selectors() {
+        public function explode_selectors() {
                 // Explode multiple selectors
                 if ($this->get_cfg('merge_selectors') === 1) {
@@ -1012 +1040 @@
          * @version 1.2
          */
-        function css_add_property($media, $selector, $property, $new_val) {
+        public function css_add_property($media, $selector, $property, $new_val) {
                 if ($this->get_cfg('preserve_css') || trim($new_val) == '') {
                         return;
@@ -1019 +1047 @@
                 $this->added = true;
                 if (isset($this->css[$media][$selector][$property])) {
-                        if ((csstidy::is_important($this->css[$media][$selector][$property]) && csstidy::is_important($new_val)) || !csstidy::is_important($this->css[$media][$selector][$property])) {
+                        if (($this->is_important($this->css[$media][$selector][$property]) && $this->is_important($new_val)) || !$this->is_important($this->css[$media][$selector][$property])) {
                                 $this->css[$media][$selector][$property] = trim($new_val);
                         }
@@ -1036 +1064 @@
          * @return string
          */
-        function css_new_media_section($media){
-                if($this->get_cfg('preserve_css')) {
+        public function css_new_media_section($media) {
+                if ($this->get_cfg('preserve_css')) {
                         return $media;
                 }
@@ -1043 +1071 @@
                 // if the last @media is the same as this
                 // keep it
-                if (!$this->css OR !is_array($this->css) OR empty($this->css)){
+                if (!$this->css || !is_array($this->css) || empty($this->css)) {
                         return $media;
                 }
                 end($this->css);
                 list($at,) = each($this->css);
-                if ($at == $media){
+                if ($at == $media) {
                         return $media;
                 }
@@ -1055 +1083 @@
                                 $media++;
                         else
-                                $media .= " ";
+                                $media .= ' ';
                 return $media;
         }
@@ -1072 +1100 @@
          * @return string
          */
-        function css_new_selector($media,$selector){
-                if($this->get_cfg('preserve_css')) {
+        public function css_new_selector($media,$selector) {
+                if ($this->get_cfg('preserve_css')) {
                         return $selector;
                 }
                 $selector = trim($selector);
-                if (strncmp($selector,"@font-face",10)!=0){
+                if (strncmp($selector,'@font-face',10)!=0) {
                         if ($this->settings['merge_selectors'] != false)
                                 return $selector;
 
-                        if (!$this->css OR !isset($this->css[$media]) OR !$this->css[$media])
+                        if (!$this->css || !isset($this->css[$media]) || !$this->css[$media])
                                 return $selector;
 
@@ -1087 +1115 @@
                         end($this->css[$media]);
                         list($sel,) = each($this->css[$media]);
-                        if ($sel == $selector){
+                        if ($sel == $selector) {
                                 return $selector;
                         }
@@ -1093 +1121 @@
 
                 while (isset($this->css[$media][$selector]))
-                        $selector .= " ";
+                        $selector .= ' ';
                 return $selector;
         }
@@ -1107 +1135 @@
          * @return string
          */
-        function css_new_property($media, $selector, $property){
-                if($this->get_cfg('preserve_css')) {
+        public function css_new_property($media, $selector, $property) {
+                if ($this->get_cfg('preserve_css')) {
                         return $property;
                 }
-                if (!$this->css OR !isset($this->css[$media][$selector]) OR !$this->css[$media][$selector])
+                if (!$this->css || !isset($this->css[$media][$selector]) || !$this->css[$media][$selector])
                         return $property;
 
                 while (isset($this->css[$media][$selector][$property]))
-                        $property .= " ";
+                        $property .= ' ';
 
                 return $property;
@@ -1128 +1156 @@
          * @version 1.1
          */
-        function merge_css_blocks($media, $selector, $css_add) {
+        public function merge_css_blocks($media, $selector, $css_add) {
                 foreach ($css_add as $property => $value) {
                         $this->css_add_property($media, $selector, $property, $value, false);
@@ -1141 +1169 @@
          * @version 1.0
          */
-        static function is_important(&$value) {
+        public function is_important(&$value) {
                 return (
-                        strpos($value,"!")!==false // quick test
-                  AND !strcasecmp(substr(str_replace($GLOBALS['csstidy']['whitespace'], '', $value), -10, 10), '!important'));
+                        strpos($value, '!') !== false // quick test
+                        AND !strcasecmp(substr(str_replace($this->data['csstidy']['whitespace'], '', $value), -10, 10), '!important'));
         }
 
@@ -1154 +1182 @@
          * @version 1.0
          */
-        static function gvw_important($value) {
-                if (csstidy::is_important($value)) {
+        public function gvw_important($value) {
+                if ($this->is_important($value)) {
                         $value = trim($value);
                         $value = substr($value, 0, -9);
@@ -1174 +1202 @@
          * @version 1.2
          */
-        function property_is_next($istring, $pos) {
-                $all_properties = & $GLOBALS['csstidy']['all_properties'];
+        public function property_is_next($istring, $pos) {
+                $all_properties = & $this->data['csstidy']['all_properties'];
                 $istring = substr($istring, $pos, strlen($istring) - $pos);
                 $pos = strpos($istring, ':');
@@ -1196 +1224 @@
          * @version 1.0
          */
-        function property_is_valid($property) {
-                if (in_array(trim($property), $GLOBALS['csstidy']['multiple_properties'])) $property = trim($property);
-                $all_properties = & $GLOBALS['csstidy']['all_properties'];
+        public function property_is_valid($property) {
+                if (in_array(trim($property), $this->data['csstidy']['multiple_properties'])) $property = trim($property);
+                $all_properties = & $this->data['csstidy']['all_properties'];
                 return (isset($all_properties[$property]) && strpos($all_properties[$property], strtoupper($this->get_cfg('css_level'))) !== false );
         }
@@ -1217 +1245 @@
          */
 
-        function parse_string_list($value) {
+        public function parse_string_list($value) {
                 $value = trim($value);
 
@@ -1226 +1254 @@
 
                 $in_str = false;
-                $current_string = "";
+                $current_string = '';
 
                 for ($i = 0, $_len = strlen($value); $i < $_len; $i++) {
-                        if (($value{$i} == "," || $value{$i} === " ") && $in_str === true) {
+                        if (($value{$i} === ',' || $value{$i} === ' ') && $in_str === true) {
                                 $in_str = false;
                                 $strings[] = $current_string;
-                                $current_string = "";
-                        }
-                        else if ($value{$i} == '"' || $value{$i} == "'"){
+                                $current_string = '';
+                        } elseif ($value{$i} === '"' || $value{$i} === "'") {
                                 if ($in_str === $value{$i}) {
                                         $strings[] = $current_string;
                                         $in_str = false;
-                                        $current_string = "";
+                                        $current_string = '';
                                         continue;
-                                }
-                                else if (!$in_str) {
+                                } elseif (!$in_str) {
                                         $in_str = $value{$i};
                                 }
-                        }
-                        else {
-                                if ($in_str){
+                        } else {
+                                if ($in_str) {
                                         $current_string .= $value{$i};
-                                }
-                                else {
+                                } else {
                                         if (!preg_match("/[\s,]/", $value{$i})) {
                                                 $in_str = true;

_core_/branches/spip-3.0/plugins/compresseur/lib/csstidy/class.csstidy_optimise.php

@@ -20 +20 @@
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Lesser General Public License for more details.
- * 
+ *
  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -44 +44 @@
 
         /**
+         * csstidy object
+         * @var object
+         */
+        public $parser;
+
+        /**
          * Constructor
          * @param array $css contains the class csstidy
@@ -49 +55 @@
          * @version 1.0
          */
-        function csstidy_optimise(&$css) {
-                $this->parser = & $css;
+        public function __construct($css) {
+                $this->parser = $css;
                 $this->css = & $css->css;
                 $this->sub_value = & $css->sub_value;
@@ -64 +70 @@
          * @version 1.0
          */
-        function postparse() {
+        public function postparse() {
                 if ($this->parser->get_cfg('preserve_css')) {
                         return;
@@ -84 +90 @@
                         foreach ($this->css as $medium => $value) {
                                 foreach ($value as $selector => $value1) {
-                                        $this->css[$medium][$selector] = csstidy_optimise::merge_4value_shorthands($this->css[$medium][$selector]);
+                                        $this->css[$medium][$selector] = $this->merge_4value_shorthands($this->css[$medium][$selector]);
 
                                         if ($this->parser->get_cfg('optimise_shorthands') < 2) {
@@ -90 +96 @@
                                         }
 
-                                        $this->css[$medium][$selector] = csstidy_optimise::merge_font($this->css[$medium][$selector]);
+                                        $this->css[$medium][$selector] = $this->merge_font($this->css[$medium][$selector]);
 
                                         if ($this->parser->get_cfg('optimise_shorthands') < 3) {
@@ -96 +102 @@
                                         }
 
-                                        $this->css[$medium][$selector] = csstidy_optimise::merge_bg($this->css[$medium][$selector]);
+                                        $this->css[$medium][$selector] = $this->merge_bg($this->css[$medium][$selector]);
                                         if (empty($this->css[$medium][$selector])) {
                                                 unset($this->css[$medium][$selector]);
@@ -110 +116 @@
          * @version 1.0
          */
-        function value() {
-                $shorthands = & $GLOBALS['csstidy']['shorthands'];
+        public function value() {
+                $shorthands = & $this->parser->data['csstidy']['shorthands'];
 
                 // optimise shorthand properties
                 if (isset($shorthands[$this->property])) {
-                        $temp = csstidy_optimise::shorthand($this->value); // FIXME - move
+                        $temp = $this->shorthand($this->value); // FIXME - move
                         if ($temp != $this->value) {
                                 $this->parser->log('Optimised shorthand notation (' . $this->property . '): Changed "' . $this->value . '" to "' . $temp . '"', 'Information');
@@ -133 +139 @@
          * @version 1.0
          */
-        function shorthands() {
-                $shorthands = & $GLOBALS['csstidy']['shorthands'];
+        public function shorthands() {
+                $shorthands = & $this->parser->data['csstidy']['shorthands'];
 
                 if (!$this->parser->get_cfg('optimise_shorthands') || $this->parser->get_cfg('preserve_css')) {
@@ -142 +148 @@
                 if ($this->property === 'font' && $this->parser->get_cfg('optimise_shorthands') > 1) {
                         $this->css[$this->at][$this->selector]['font']='';
-                        $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_short_font($this->value));
+                        $this->parser->merge_css_blocks($this->at, $this->selector, $this->dissolve_short_font($this->value));
                 }
                 if ($this->property === 'background' && $this->parser->get_cfg('optimise_shorthands') > 2) {
                         $this->css[$this->at][$this->selector]['background']='';
-                        $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_short_bg($this->value));
+                        $this->parser->merge_css_blocks($this->at, $this->selector, $this->dissolve_short_bg($this->value));
                 }
                 if (isset($shorthands[$this->property])) {
-                        $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_4value_shorthands($this->property, $this->value));
+                        $this->parser->merge_css_blocks($this->at, $this->selector, $this->dissolve_4value_shorthands($this->property, $this->value));
                         if (is_array($shorthands[$this->property])) {
                                 $this->css[$this->at][$this->selector][$this->property] = '';
@@ -161 +167 @@
          * @version 1.0
          */
-        function subvalue() {
-                $replace_colors = & $GLOBALS['csstidy']['replace_colors'];
+        public function subvalue() {
+                $replace_colors = & $this->parser->data['csstidy']['replace_colors'];
 
                 $this->sub_value = trim($this->sub_value);
@@ -170 +176 @@
 
                 $important = '';
-                if (csstidy::is_important($this->sub_value)) {
+                if ($this->parser->is_important($this->sub_value)) {
                         $important = '!important';
                 }
-                $this->sub_value = csstidy::gvw_important($this->sub_value);
+                $this->sub_value = $this->parser->gvw_important($this->sub_value);
 
                 // Compress font-weight
@@ -180 +186 @@
                                 $this->sub_value = '700';
                                 $this->parser->log('Optimised font-weight: Changed "bold" to "700"', 'Information');
-                        } else if ($this->sub_value === 'normal') {
+                        } elseif ($this->sub_value === 'normal') {
                                 $this->sub_value = '400';
                                 $this->parser->log('Optimised font-weight: Changed "normal" to "400"', 'Information');
@@ -216 +222 @@
          * @version 1.0
          */
-        function shorthand($value) {
+        public function shorthand($value) {
                 $important = '';
-                if (csstidy::is_important($value)) {
-                        $values = csstidy::gvw_important($value);
+                if ($this->parser->is_important($value)) {
+                        $values = $this->parser->gvw_important($value);
                         $important = '!important';
                 }
@@ -262 +268 @@
          * @version 1.1
          */
-        function compress_important(&$string) {
-                if (csstidy::is_important($string)) {
-                        $string = csstidy::gvw_important($string) . '!important';
+        public function compress_important(&$string) {
+                if ($this->parser->is_important($string)) {
+                        $string = $this->parser->gvw_important($string) . '!important';
                 }
                 return $string;
@@ -275 +281 @@
          * @version 1.1
          */
-        function cut_color($color) {
-                $replace_colors = & $GLOBALS['csstidy']['replace_colors'];
+        public function cut_color($color) {
+                $replace_colors = & $this->parser->data['csstidy']['replace_colors'];
 
                 // if it's a string, don't touch !
-                if (strncmp($color,"'",1)==0 OR strncmp($color,'"',1)==0)
+                if (strncmp($color, "'", 1) == 0 || strncmp($color, '"', 1) == 0)
                         return $color;
 
                 /* expressions complexes de type gradient */
-                if (strpos($color,"(")!==false AND strncmp($color,'rgb(',4)!=0){
+                if (strpos($color, '(') !== false && strncmp($color, 'rgb(' ,4) != 0) {
                         // on ne touche pas aux couleurs dans les expression ms, c'est trop sensible
-                        if (stripos($color,"progid:")!==false)
+                        if (stripos($color, 'progid:') !== false)
                                 return $color;
-                        preg_match_all(",rgb\([^)]+\),i",$color,$matches,PREG_SET_ORDER);
-                        if (count($matches)){
-                                foreach ($matches as $m){
-                                        $color = str_replace($m[0],$this->cut_color($m[0]),$color);
-                                }
-                        }
-                        preg_match_all(",#[0-9a-f]{6}(?=[^0-9a-f]),i",$color,$matches,PREG_SET_ORDER);
-                        if (count($matches)){
-                                foreach ($matches as $m){
-                                        $color = str_replace($m[0],$this->cut_color($m[0]),$color);
+                        preg_match_all(",rgb\([^)]+\),i", $color, $matches, PREG_SET_ORDER);
+                        if (count($matches)) {
+                                foreach ($matches as $m) {
+                                        $color = str_replace($m[0], $this->cut_color($m[0]), $color);
+                                }
+                        }
+                        preg_match_all(",#[0-9a-f]{6}(?=[^0-9a-f]),i", $color, $matches, PREG_SET_ORDER);
+                        if (count($matches)) {
+                                foreach ($matches as $m) {
+                                        $color = str_replace($m[0],$this->cut_color($m[0]), $color);
                                 }
                         }
@@ -366 +372 @@
          * @version 1.2
          */
-        function compress_numbers($subvalue) {
-                $unit_values = & $GLOBALS['csstidy']['unit_values'];
-                $color_values = & $GLOBALS['csstidy']['color_values'];
+        public function compress_numbers($subvalue) {
+                $unit_values = & $this->parser->data['csstidy']['unit_values'];
+                $color_values = & $this->parser->data['csstidy']['color_values'];
 
                 // for font:1em/1em sans-serif...;
@@ -376 +382 @@
                         $temp = array($subvalue);
                 }
+
                 for ($l = 0; $l < count($temp); $l++) {
                         // if we are not dealing with a number at this point, do not optimise anything
@@ -409 +416 @@
          * @return array ('unit' if unit is found or '' if no unit exists, number value) or false if no number
          */
-        function AnalyseCssNumber($string) {
+        public function AnalyseCssNumber($string) {
                 // most simple checks first
                 if (strlen($string) == 0 || ctype_alpha($string{0})) {
@@ -415 +422 @@
                 }
 
-                $units = & $GLOBALS['csstidy']['units'];
+                $units = & $this->parser->data['csstidy']['units'];
                 $return = array(0, '');
 
@@ -454 +461 @@
          * @version 1.2
          */
-        function merge_selectors(&$array) {
+        public function merge_selectors(&$array) {
                 $css = $array;
                 foreach ($css as $key => $value) {
@@ -495 +502 @@
          * @version 1.4
          */
-        function discard_invalid_selectors(&$array) {
+        public function discard_invalid_selectors(&$array) {
                 $invalid = array('+' => true, '~' => true, ',' => true, '>' => true);
                 foreach ($array as $selector => $decls) {
@@ -522 +529 @@
          * @see merge_4value_shorthands()
          */
-        function dissolve_4value_shorthands($property, $value) {
-                $shorthands = & $GLOBALS['csstidy']['shorthands'];
+        public function dissolve_4value_shorthands($property, $value) {
+                $shorthands = & $this->parser->data['csstidy']['shorthands'];
                 if (!is_array($shorthands[$property])) {
                         $return[$property] = $value;
@@ -530 +537 @@
 
                 $important = '';
-                if (csstidy::is_important($value)) {
-                        $value = csstidy::gvw_important($value);
+                if ($this->parser->is_important($value)) {
+                        $value = $this->parser->gvw_important($value);
                         $important = '!important';
                 }
@@ -567 +574 @@
          * @version 1.0
          */
-        function explode_ws($sep, $string) {
+        public function explode_ws($sep, $string) {
                 $status = 'st';
                 $to = '';
@@ -576 +583 @@
                         switch ($status) {
                                 case 'st':
-                                        if ($string{$i} == $sep && !csstidy::escaped($string, $i)) {
+                                        if ($string{$i} == $sep && !$this->parser->escaped($string, $i)) {
                                                 ++$num;
-                                        } elseif ($string{$i} === '"' || $string{$i} === '\'' || $string{$i} === '(' && !csstidy::escaped($string, $i)) {
+                                        } elseif ($string{$i} === '"' || $string{$i} === '\'' || $string{$i} === '(' && !$this->parser->escaped($string, $i)) {
                                                 $status = 'str';
                                                 $to = ($string{$i} === '(') ? ')' : $string{$i};
@@ -588 +595 @@
 
                                 case 'str':
-                                        if ($string{$i} == $to && !csstidy::escaped($string, $i)) {
+                                        if ($string{$i} == $to && !$this->parser->escaped($string, $i)) {
                                                 $status = 'st';
                                         }
@@ -610 +617 @@
          * @see dissolve_4value_shorthands()
          */
-        function merge_4value_shorthands($array) {
+        public function merge_4value_shorthands($array) {
                 $return = $array;
-                $shorthands = & $GLOBALS['csstidy']['shorthands'];
+                $shorthands = & $this->parser->data['csstidy']['shorthands'];
 
                 foreach ($shorthands as $key => $value) {
@@ -622 +629 @@
                                 for ($i = 0; $i < 4; $i++) {
                                         $val = $array[$value[$i]];
-                                        if (csstidy::is_important($val)) {
+                                        if ($this->parser->is_important($val)) {
                                                 $important = '!important';
-                                                $return[$key] .= csstidy::gvw_important($val) . ' ';
+                                                $return[$key] .= $this->parser->gvw_important($val) . ' ';
                                         } else {
                                                 $return[$key] .= $val . ' ';
@@ -630 +637 @@
                                         unset($return[$value[$i]]);
                                 }
-                                $return[$key] = csstidy_optimise::shorthand(trim($return[$key] . $important));
+                                $return[$key] = $this->shorthand(trim($return[$key] . $important));
                         }
                 }
@@ -644 +651 @@
          * @todo full CSS 3 compliance
          */
-        function dissolve_short_bg($str_value) {
+        public function dissolve_short_bg($str_value) {
                 // don't try to explose background gradient !
-                if (stripos($str_value, "gradient(")!==FALSE)
+                if (stripos($str_value, 'gradient(')!== false)
                         return array('background'=>$str_value);
-                
-                $background_prop_default = & $GLOBALS['csstidy']['background_prop_default'];
+
+                $background_prop_default = & $this->parser->data['csstidy']['background_prop_default'];
                 $repeat = array('repeat', 'repeat-x', 'repeat-y', 'no-repeat', 'space');
                 $attachment = array('scroll', 'fixed', 'local');
@@ -658 +665 @@
                 $return = array('background-image' => null, 'background-size' => null, 'background-repeat' => null, 'background-position' => null, 'background-attachment' => null, 'background-clip' => null, 'background-origin' => null, 'background-color' => null);
 
-                if (csstidy::is_important($str_value)) {
+                if ($this->parser->is_important($str_value)) {
                         $important = ' !important';
-                        $str_value = csstidy::gvw_important($str_value);
-                }
-
-                $str_value = csstidy_optimise::explode_ws(',', $str_value);
+                        $str_value = $this->parser->gvw_important($str_value);
+                }
+
+                $str_value = $this->explode_ws(',', $str_value);
                 for ($i = 0; $i < count($str_value); $i++) {
                         $have['clip'] = false;
@@ -673 +680 @@
                                 $str_value[$i] = $str_value[$i][0];
                         }
-                        $str_value[$i] = csstidy_optimise::explode_ws(' ', trim($str_value[$i]));
+                        $str_value[$i] = $this->explode_ws(' ', trim($str_value[$i]));
 
                         for ($j = 0; $j < count($str_value[$i]); $j++) {
@@ -696 +703 @@
                                                 $return['background-position'].= ',';
                                         $have['pos'] = true;
-                                }
-                                elseif (!$have['color']) {
+                                } elseif (!$have['color']) {
                                         $return['background-color'] .= $str_value[$i][$j] . ',';
                                         $have['color'] = true;
@@ -722 +728 @@
          * @todo full CSS 3 compliance
          */
-        function merge_bg($input_css) {
-                $background_prop_default = & $GLOBALS['csstidy']['background_prop_default'];
+        public function merge_bg($input_css) {
+                $background_prop_default = & $this->parser->data['csstidy']['background_prop_default'];
                 // Max number of background images. CSS3 not yet fully implemented
-                $number_of_values = @max(count(csstidy_optimise::explode_ws(',', $input_css['background-image'])), count(csstidy_optimise::explode_ws(',', $input_css['background-color'])), 1);
+                $number_of_values = @max(count($this->explode_ws(',', $input_css['background-image'])), count($this->explode_ws(',', $input_css['background-color'])), 1);
                 // Array with background images to check if BG image exists
-                $bg_img_array = @csstidy_optimise::explode_ws(',', csstidy::gvw_important($input_css['background-image']));
+                $bg_img_array = @$this->explode_ws(',', $this->parser->gvw_important($input_css['background-image']));
                 $new_bg_value = '';
                 $important = '';
 
                 // if background properties is here and not empty, don't try anything
-                if (isset($input_css['background']) AND $input_css['background'])
+                if (isset($input_css['background']) && $input_css['background'])
                         return $input_css;
-                
+
                 for ($i = 0; $i < $number_of_values; $i++) {
                         foreach ($background_prop_default as $bg_property => $default_value) {
@@ -744 +750 @@
                                 $cur_value = $input_css[$bg_property];
                                 // skip all optimisation if gradient() somewhere
-                                if (stripos($cur_value, "gradient(")!==FALSE)
+                                if (stripos($cur_value, 'gradient(') !== false)
                                         return $input_css;
 
@@ -755 +761 @@
 
                                 // Remove !important
-                                if (csstidy::is_important($cur_value)) {
+                                if ($this->parser->is_important($cur_value)) {
                                         $important = ' !important';
-                                        $cur_value = csstidy::gvw_important($cur_value);
+                                        $cur_value = $this->parser->gvw_important($cur_value);
                                 }
 
@@ -765 +771 @@
                                 }
 
-                                $temp = csstidy_optimise::explode_ws(',', $cur_value);
+                                $temp = $this->explode_ws(',', $cur_value);
 
                                 if (isset($temp[$i])) {
@@ -802 +808 @@
          * @see merge_font()
          */
-        function dissolve_short_font($str_value) {
-                $font_prop_default = & $GLOBALS['csstidy']['font_prop_default'];
+        public function dissolve_short_font($str_value) {
+                $font_prop_default = & $this->parser->data['csstidy']['font_prop_default'];
                 $font_weight = array('normal', 'bold', 'bolder', 'lighter', 100, 200, 300, 400, 500, 600, 700, 800, 900);
                 $font_variant = array('normal', 'small-caps');
@@ -810 +816 @@
                 $return = array('font-style' => null, 'font-variant' => null, 'font-weight' => null, 'font-size' => null, 'line-height' => null, 'font-family' => null);
 
-                if (csstidy::is_important($str_value)) {
+                if ($this->parser->is_important($str_value)) {
                         $important = '!important';
-                        $str_value = csstidy::gvw_important($str_value);
+                        $str_value = $this->parser->gvw_important($str_value);
                 }
 
@@ -823 +829 @@
 
                 // Workaround with multiple font-family
-                $str_value = csstidy_optimise::explode_ws(',', trim($str_value));
-
-                $str_value[0] = csstidy_optimise::explode_ws(' ', trim($str_value[0]));
+                $str_value = $this->explode_ws(',', trim($str_value));
+
+                $str_value[0] = $this->explode_ws(' ', trim($str_value[0]));
 
                 for ($j = 0; $j < count($str_value[0]); $j++) {
@@ -838 +844 @@
                                 $have['style'] = true;
                         } elseif ($have['size'] === false && (is_numeric($str_value[0][$j]{0}) || $str_value[0][$j]{0} === null || $str_value[0][$j]{0} === '.')) {
-                                $size = csstidy_optimise::explode_ws('/', trim($str_value[0][$j]));
+                                $size = $this->explode_ws('/', trim($str_value[0][$j]));
                                 $return['font-size'] = $size[0];
                                 if (isset($size[1])) {
@@ -889 +895 @@
          * @see dissolve_short_font()
          */
-        function merge_font($input_css) {
-                $font_prop_default = & $GLOBALS['csstidy']['font_prop_default'];
+        public function merge_font($input_css) {
+                $font_prop_default = & $this->parser->data['csstidy']['font_prop_default'];
                 $new_font_value = '';
                 $important = '';
@@ -897 +903 @@
                         // fix several words in font-family - add quotes
                         if (isset($input_css['font-family'])) {
-                                $families = explode(",", $input_css['font-family']);
+                                $families = explode(',', $input_css['font-family']);
                                 $result_families = array();
                                 foreach ($families as $family) {
                                         $family = trim($family);
                                         $len = strlen($family);
-                                        if (strpos($family, " ") &&
-                                                                        !(($family{0} == '"' && $family{$len - 1} == '"') ||
-                                                                        ($family{0} == "'" && $family{$len - 1} == "'"))) {
+                                        if (strpos($family, ' ') &&
+                                                                        !(($family{0} === '"' && $family{$len - 1} === '"') ||
+                                                                        ($family{0} === "'" && $family{$len - 1} === "'"))) {
                                                 $family = '"' . $family . '"';
                                         }
                                         $result_families[] = $family;
                                 }
-                                $input_css['font-family'] = implode(",", $result_families);
+                                $input_css['font-family'] = implode(',', $result_families);
                         }
                         foreach ($font_prop_default as $font_property => $default_value) {
@@ -926 +932 @@
 
                                 // Remove !important
-                                if (csstidy::is_important($cur_value)) {
+                                if ($this->parser->is_important($cur_value)) {
                                         $important = '!important';
-                                        $cur_value = csstidy::gvw_important($cur_value);
+                                        $cur_value = $this->parser->gvw_important($cur_value);
                                 }
 
@@ -941 +947 @@
                         // Delete all font-properties
                         foreach ($font_prop_default as $font_property => $default_value) {
-                                if ($font_property!=='font' OR !$new_font_value)
+                                if ($font_property !== 'font' || !$new_font_value)
                                         unset($input_css[$font_property]);
                         }

_core_/branches/spip-3.0/plugins/compresseur/lib/csstidy/class.csstidy_print.php

@@ -20 +20 @@
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Lesser General Public License for more details.
- * 
+ *
  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -43 +43 @@
 
         /**
+         * csstidy object
+         * @var object
+         */
+        public $parser;
+
+        /**
          * Saves the input CSS string
          * @var string
          * @access private
          */
-        var $input_css = '';
+        public $input_css = '';
         /**
          * Saves the formatted CSS string
@@ -53 +59 @@
          * @access public
          */
-        var $output_css = '';
+        public $output_css = '';
         /**
          * Saves the formatted CSS string (plain text)
@@ -59 +65 @@
          * @access public
          */
-        var $output_css_plain = '';
+        public $output_css_plain = '';
 
         /**
@@ -67 +73 @@
          * @version 1.0
          */
-        function csstidy_print(&$css) {
-                $this->parser = & $css;
+        public function __construct($css) {
+                $this->parser = $css;
                 $this->css = & $css->css;
                 $this->template = & $css->template;
@@ -82 +88 @@
          * @version 1.0
          */
-        function _reset() {
+        public function _reset() {
                 $this->output_css = '';
                 $this->output_css_plain = '';
@@ -94 +100 @@
          * @version 1.0
          */
-        function plain($default_media='') {
+        public function plain($default_media='') {
                 $this->_print(true, $default_media);
                 return $this->output_css_plain;
@@ -106 +112 @@
          * @version 1.0
          */
-        function formatted($default_media='') {
+        public function formatted($default_media='') {
                 $this->_print(false, $default_media);
                 return $this->output_css;
@@ -121 +127 @@
          * @version 1.4
          */
-        function formatted_page($doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
+        public function formatted_page($doctype='html5', $externalcss=true, $title='', $lang='en') {
                 switch ($doctype) {
-                        case 'xhtml1.0strict':
+                        case 'html5':
+                                $doctype_output = '<!DOCTYPE html>';
+                                break;
+                                case 'xhtml1.0strict':
                                 $doctype_output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
@@ -148 +157 @@
                 } else {
                         $output .= "\n" . '    <link rel="stylesheet" type="text/css" href="cssparsed.css" />';
-//                      }
                 }
                 $output .= "\n</head>\n<body><code id=\"copytext\">";
@@ -163 +171 @@
          * @version 2.0
          */
-        function _print($plain = false, $default_media='') {
+        public function _print($plain = false, $default_media='') {
                 if ($this->output_css && $this->output_css_plain) {
                         return;
@@ -279 +287 @@
          * @version 1.0
          */
-        function _seeknocomment($key, $move) {
+        public function _seeknocomment($key, $move) {
                 $go = ($move > 0) ? 1 : -1;
                 for ($i = $key + 1; abs($key - $i) - 1 < abs($move); $i += $go) {
@@ -299 +307 @@
          * @version 1.0
          */
-        function _convert_raw_css($default_media='') {
+        public function _convert_raw_css($default_media='') {
                 $this->tokens = array();
                 $sort_selectors = $this->parser->get_cfg('sort_selectors');
@@ -309 +317 @@
                         if (intval($medium) < DEFAULT_AT) {
                                 // un medium vide (contenant @font-face ou autre @) ne produit aucun conteneur
-                                if (strlen(trim($medium))){
+                                if (strlen(trim($medium))) {
                                         $this->parser->_add_token(AT_START, $medium, true);
                                 }
-                        }
-                        elseif ($default_media) {
+                        } elseif ($default_media) {
                                 $this->parser->_add_token(AT_START, $default_media, true);
                         }
-                        
+
                         foreach ($val as $selector => $vali) {
                                 if ($sort_properties)
@@ -329 +336 @@
                                 );
                                 foreach ($vali as $property => $valj) {
-                                        if (strncmp($property,"//",2)!==0){
+                                        if (strncmp($property,"//",2)!==0) {
                                                 $matches = array();
                                                 if ($sort_properties && preg_match('/^(\*|_|\/|-)(?!(ms|moz|o\b|xv|atsc|wap|khtml|webkit|ah|hp|ro|rim|tc)-)/', $property, $matches)) {
@@ -350 +357 @@
                         if (intval($medium) < DEFAULT_AT) {
                                 // un medium vide (contenant @font-face ou autre @) ne produit aucun conteneur
-                                if (strlen(trim($medium))){
+                                if (strlen(trim($medium))) {
                                         $this->parser->_add_token(AT_END, $medium, true);
                                 }
-                        }
-                        elseif ($default_media) {
+                        } elseif ($default_media) {
                                 $this->parser->_add_token(AT_END, $default_media, true);
                         }
@@ -369 +375 @@
          * @version 1.0
          */
-        function _htmlsp($string, $plain) {
+        public function _htmlsp($string, $plain) {
                 if (!$plain) {
                         return htmlspecialchars($string, ENT_QUOTES, 'utf-8');
@@ -382 +388 @@
          * @version 1.2
          */
-        function get_ratio() {
+        public function get_ratio() {
                 if (!$this->output_css_plain) {
                         $this->formatted();
@@ -395 +401 @@
          * @version 1.1
          */
-        function get_diff() {
+        public function get_diff() {
                 if (!$this->output_css_plain) {
                         $this->formatted();
@@ -418 +424 @@
          * @version 1.0
          */
-        function size($loc = 'output') {
+        public function size($loc = 'output') {
                 if ($loc === 'output' && !$this->output_css) {
                         $this->formatted();

_core_/branches/spip-3.0/plugins/compresseur/lib/csstidy/data.inc.php

@@ -1 +1 @@
 <?php
-
 /**
  * Various CSS Data for CSSTidy
@@ -26 +25 @@
  */
 
-define('AT_START',    1);
-define('AT_END',      2);
-define('SEL_START',   3);
-define('SEL_END',     4);
-define('PROPERTY',    5);
-define('VALUE',       6);
-define('COMMENT',     7);
-define('DEFAULT_AT', 41);
-
 /**
  * All whitespace allowed in CSS
  *
- * @global array $GLOBALS['csstidy']['whitespace']
- * @version 1.0
- */
-$GLOBALS['csstidy']['whitespace'] = array(' ',"\n","\t","\r","\x0B");
+ * @global array $data['csstidy']['whitespace']
+ * @version 1.0
+ */
+$data['csstidy']['whitespace'] = array(' ',"\n","\t","\r","\x0B");
 
 /**
  * All CSS tokens used by csstidy
  *
- * @global string $GLOBALS['csstidy']['tokens']
- * @version 1.0
- */
-$GLOBALS['csstidy']['tokens'] = '/@}{;:=\'"(,\\!$%&)*+.<>?[]^`|~';
+ * @global string $data['csstidy']['tokens']
+ * @version 1.0
+ */
+$data['csstidy']['tokens'] = '/@}{;:=\'"(,\\!$%&)*+.<>?[]^`|~';
 
 /**
@@ -55 +45 @@
  *
  * @see compress_numbers()
- * @global array $GLOBALS['csstidy']['units']
- * @version 1.0
- */
-$GLOBALS['csstidy']['units'] = array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','deg','grad','rad','ms','s','khz','hz');
+ * @global array $data['csstidy']['units']
+ * @version 1.0
+ */
+$data['csstidy']['units'] = array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','deg','grad','rad','turn','ms','s','khz','hz','ch','vmin','vmax','dpi','dpcm','dppx');
 
 /**
  * Available at-rules
  *
- * @global array $GLOBALS['csstidy']['at_rules']
+ * @global array $data['csstidy']['at_rules']
  * @version 1.1
  */
-$GLOBALS['csstidy']['at_rules'] = array('page' => 'is','font-face' => 'atis','charset' => 'iv', 'import' => 'iv','namespace' => 'iv','media' => 'at','keyframes' => 'at');
+$data['csstidy']['at_rules'] = array('page' => 'is','font-face' => 'atis','charset' => 'iv', 'import' => 'iv','namespace' => 'iv','media' => 'at','keyframes' => 'at','-moz-keyframes' => 'at','-o-keyframes' => 'at','-webkit-keyframes' => 'at','-ms-keyframes' => 'at');
 
  /**
@@ -73 +63 @@
  * @todo CSS3 properties
  * @see compress_numbers();
- * @global array $GLOBALS['csstidy']['unit_values']
+ * @global array $data['csstidy']['unit_values']
  * @version 1.2
  */
-$GLOBALS['csstidy']['unit_values'] = array ('background', 'background-position', 'background-size', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-width',
-                                            'border-top-width', 'border-right-width', 'border-left-width', 'border-bottom-width', 'bottom', 'border-spacing', 'column-gap', 'column-width',
+$data['csstidy']['unit_values'] = array ('background', 'background-position', 'background-size', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-width',
+                                                                                        'border-top-width', 'border-right-width', 'border-left-width', 'border-bottom-width', 'bottom', 'border-spacing', 'column-gap', 'column-width',
                                                                                         'font-size', 'height', 'left', 'margin', 'margin-top', 'margin-right', 'margin-bottom', 'margin-left', 'max-height',
-                                                                                        'max-width', 'min-height', 'min-width', 'outline', 'outline-width', 'padding', 'padding-top', 'padding-right', 
+                                                                                        'max-width', 'min-height', 'min-width', 'outline', 'outline-width', 'padding', 'padding-top', 'padding-right',
                                                                                         'padding-bottom', 'padding-left', 'perspective', 'right', 'top', 'text-indent', 'letter-spacing', 'word-spacing', 'width');
 
@@ -87 +77 @@
  * @todo CSS3 properties
  * @see compress_numbers();
- * @global array $GLOBALS['csstidy']['color_values']
- * @version 1.0
- */
-$GLOBALS['csstidy']['color_values'] = array();
-$GLOBALS['csstidy']['color_values'][] = 'background-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-top-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-right-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-bottom-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-left-color';
-$GLOBALS['csstidy']['color_values'][] = 'color';
-$GLOBALS['csstidy']['color_values'][] = 'outline-color';
-$GLOBALS['csstidy']['color_values'][] = 'column-rule-color';
+ * @global array $data['csstidy']['color_values']
+ * @version 1.0
+ */
+$data['csstidy']['color_values'] = array();
+$data['csstidy']['color_values'][] = 'background-color';
+$data['csstidy']['color_values'][] = 'border-color';
+$data['csstidy']['color_values'][] = 'border-top-color';
+$data['csstidy']['color_values'][] = 'border-right-color';
+$data['csstidy']['color_values'][] = 'border-bottom-color';
+$data['csstidy']['color_values'][] = 'border-left-color';
+$data['csstidy']['color_values'][] = 'color';
+$data['csstidy']['color_values'][] = 'outline-color';
+$data['csstidy']['color_values'][] = 'column-rule-color';
 
 /**
@@ -105 +95 @@
  *
  * @todo Possibly property names will change during CSS3 development
- * @global array $GLOBALS['csstidy']['background_prop_default']
+ * @global array $data['csstidy']['background_prop_default']
  * @see dissolve_short_bg()
  * @see merge_bg()
  * @version 1.0
  */
-$GLOBALS['csstidy']['background_prop_default'] = array();
-$GLOBALS['csstidy']['background_prop_default']['background-image'] = 'none';
-$GLOBALS['csstidy']['background_prop_default']['background-size'] = 'auto';
-$GLOBALS['csstidy']['background_prop_default']['background-repeat'] = 'repeat';
-$GLOBALS['csstidy']['background_prop_default']['background-position'] = '0 0';
-$GLOBALS['csstidy']['background_prop_default']['background-attachment'] = 'scroll';
-$GLOBALS['csstidy']['background_prop_default']['background-clip'] = 'border';
-$GLOBALS['csstidy']['background_prop_default']['background-origin'] = 'padding';
-$GLOBALS['csstidy']['background_prop_default']['background-color'] = 'transparent';
+$data['csstidy']['background_prop_default'] = array();
+$data['csstidy']['background_prop_default']['background-image'] = 'none';
+$data['csstidy']['background_prop_default']['background-size'] = 'auto';
+$data['csstidy']['background_prop_default']['background-repeat'] = 'repeat';
+$data['csstidy']['background_prop_default']['background-position'] = '0 0';
+$data['csstidy']['background_prop_default']['background-attachment'] = 'scroll';
+$data['csstidy']['background_prop_default']['background-clip'] = 'border';
+$data['csstidy']['background_prop_default']['background-origin'] = 'padding';
+$data['csstidy']['background_prop_default']['background-color'] = 'transparent';
 
 /**
  * Default values for the font properties
  *
- * @global array $GLOBALS['csstidy']['font_prop_default']
+ * @global array $data['csstidy']['font_prop_default']
  * @see merge_fonts()
  * @version 1.3
  */
-$GLOBALS['csstidy']['font_prop_default'] = array();
-$GLOBALS['csstidy']['font_prop_default']['font-style'] = 'normal';
-$GLOBALS['csstidy']['font_prop_default']['font-variant'] = 'normal';
-$GLOBALS['csstidy']['font_prop_default']['font-weight'] = 'normal';
-$GLOBALS['csstidy']['font_prop_default']['font-size'] = '';
-$GLOBALS['csstidy']['font_prop_default']['line-height'] = '';
-$GLOBALS['csstidy']['font_prop_default']['font-family'] = '';
+$data['csstidy']['font_prop_default'] = array();
+$data['csstidy']['font_prop_default']['font-style'] = 'normal';
+$data['csstidy']['font_prop_default']['font-variant'] = 'normal';
+$data['csstidy']['font_prop_default']['font-weight'] = 'normal';
+$data['csstidy']['font_prop_default']['font-size'] = '';
+$data['csstidy']['font_prop_default']['line-height'] = '';
+$data['csstidy']['font_prop_default']['font-family'] = '';
 
 /**
  * A list of non-W3C color names which get replaced by their hex-codes
  *
- * @global array $GLOBALS['csstidy']['replace_colors']
+ * @global array $data['csstidy']['replace_colors']
  * @see cut_color()
  * @version 1.0
  */
-$GLOBALS['csstidy']['replace_colors'] = array();
-$GLOBALS['csstidy']['replace_colors']['aliceblue'] = '#f0f8ff';
-$GLOBALS['csstidy']['replace_colors']['antiquewhite'] = '#faebd7';
-$GLOBALS['csstidy']['replace_colors']['aquamarine'] = '#7fffd4';
-$GLOBALS['csstidy']['replace_colors']['azure'] = '#f0ffff';
-$GLOBALS['csstidy']['replace_colors']['beige'] = '#f5f5dc';
-$GLOBALS['csstidy']['replace_colors']['bisque'] = '#ffe4c4';
-$GLOBALS['csstidy']['replace_colors']['blanchedalmond'] = '#ffebcd';
-$GLOBALS['csstidy']['replace_colors']['blueviolet'] = '#8a2be2';
-$GLOBALS['csstidy']['replace_colors']['brown'] = '#a52a2a';
-$GLOBALS['csstidy']['replace_colors']['burlywood'] = '#deb887';
-$GLOBALS['csstidy']['replace_colors']['cadetblue'] = '#5f9ea0';
-$GLOBALS['csstidy']['replace_colors']['chartreuse'] = '#7fff00';
-$GLOBALS['csstidy']['replace_colors']['chocolate'] = '#d2691e';
-$GLOBALS['csstidy']['replace_colors']['coral'] = '#ff7f50';
-$GLOBALS['csstidy']['replace_colors']['cornflowerblue'] = '#6495ed';
-$GLOBALS['csstidy']['replace_colors']['cornsilk'] = '#fff8dc';
-$GLOBALS['csstidy']['replace_colors']['crimson'] = '#dc143c';
-$GLOBALS['csstidy']['replace_colors']['cyan'] = '#00ffff';
-$GLOBALS['csstidy']['replace_colors']['darkblue'] = '#00008b';
-$GLOBALS['csstidy']['replace_colors']['darkcyan'] = '#008b8b';
-$GLOBALS['csstidy']['replace_colors']['darkgoldenrod'] = '#b8860b';
-$GLOBALS['csstidy']['replace_colors']['darkgray'] = '#a9a9a9';
-$GLOBALS['csstidy']['replace_colors']['darkgreen'] = '#006400';
-$GLOBALS['csstidy']['replace_colors']['darkkhaki'] = '#bdb76b';
-$GLOBALS['csstidy']['replace_colors']['darkmagenta'] = '#8b008b';
-$GLOBALS['csstidy']['replace_colors']['darkolivegreen'] = '#556b2f';
-$GLOBALS['csstidy']['replace_colors']['darkorange'] = '#ff8c00';
-$GLOBALS['csstidy']['replace_colors']['darkorchid'] = '#9932cc';
-$GLOBALS['csstidy']['replace_colors']['darkred'] = '#8b0000';
-$GLOBALS['csstidy']['replace_colors']['darksalmon'] = '#e9967a';
-$GLOBALS['csstidy']['replace_colors']['darkseagreen'] = '#8fbc8f';
-$GLOBALS['csstidy']['replace_colors']['darkslateblue'] = '#483d8b';
-$GLOBALS['csstidy']['replace_colors']['darkslategray'] = '#2f4f4f';
-$GLOBALS['csstidy']['replace_colors']['darkturquoise'] = '#00ced1';
-$GLOBALS['csstidy']['replace_colors']['darkviolet'] = '#9400d3';
-$GLOBALS['csstidy']['replace_colors']['deeppink'] = '#ff1493';
-$GLOBALS['csstidy']['replace_colors']['deepskyblue'] = '#00bfff';
-$GLOBALS['csstidy']['replace_colors']['dimgray'] = '#696969';
-$GLOBALS['csstidy']['replace_colors']['dodgerblue'] = '#1e90ff';
-$GLOBALS['csstidy']['replace_colors']['feldspar'] = '#d19275';
-$GLOBALS['csstidy']['replace_colors']['firebrick'] = '#b22222';
-$GLOBALS['csstidy']['replace_colors']['floralwhite'] = '#fffaf0';
-$GLOBALS['csstidy']['replace_colors']['forestgreen'] = '#228b22';
-$GLOBALS['csstidy']['replace_colors']['gainsboro'] = '#dcdcdc';
-$GLOBALS['csstidy']['replace_colors']['ghostwhite'] = '#f8f8ff';
-$GLOBALS['csstidy']['replace_colors']['gold'] = '#ffd700';
-$GLOBALS['csstidy']['replace_colors']['goldenrod'] = '#daa520';
-$GLOBALS['csstidy']['replace_colors']['greenyellow'] = '#adff2f';
-$GLOBALS['csstidy']['replace_colors']['honeydew'] = '#f0fff0';
-$GLOBALS['csstidy']['replace_colors']['hotpink'] = '#ff69b4';
-$GLOBALS['csstidy']['replace_colors']['indianred'] = '#cd5c5c';
-$GLOBALS['csstidy']['replace_colors']['indigo'] = '#4b0082';
-$GLOBALS['csstidy']['replace_colors']['ivory'] = '#fffff0';
-$GLOBALS['csstidy']['replace_colors']['khaki'] = '#f0e68c';
-$GLOBALS['csstidy']['replace_colors']['lavender'] = '#e6e6fa';
-$GLOBALS['csstidy']['replace_colors']['lavenderblush'] = '#fff0f5';
-$GLOBALS['csstidy']['replace_colors']['lawngreen'] = '#7cfc00';
-$GLOBALS['csstidy']['replace_colors']['lemonchiffon'] = '#fffacd';
-$GLOBALS['csstidy']['replace_colors']['lightblue'] = '#add8e6';
-$GLOBALS['csstidy']['replace_colors']['lightcoral'] = '#f08080';
-$GLOBALS['csstidy']['replace_colors']['lightcyan'] = '#e0ffff';
-$GLOBALS['csstidy']['replace_colors']['lightgoldenrodyellow'] = '#fafad2';
-$GLOBALS['csstidy']['replace_colors']['lightgrey'] = '#d3d3d3';
-$GLOBALS['csstidy']['replace_colors']['lightgreen'] = '#90ee90';
-$GLOBALS['csstidy']['replace_colors']['lightpink'] = '#ffb6c1';
-$GLOBALS['csstidy']['replace_colors']['lightsalmon'] = '#ffa07a';
-$GLOBALS['csstidy']['replace_colors']['lightseagreen'] = '#20b2aa';
-$GLOBALS['csstidy']['replace_colors']['lightskyblue'] = '#87cefa';
-$GLOBALS['csstidy']['replace_colors']['lightslateblue'] = '#8470ff';
-$GLOBALS['csstidy']['replace_colors']['lightslategray'] = '#778899';
-$GLOBALS['csstidy']['replace_colors']['lightsteelblue'] = '#b0c4de';
-$GLOBALS['csstidy']['replace_colors']['lightyellow'] = '#ffffe0';
-$GLOBALS['csstidy']['replace_colors']['limegreen'] = '#32cd32';
-$GLOBALS['csstidy']['replace_colors']['linen'] = '#faf0e6';
-$GLOBALS['csstidy']['replace_colors']['magenta'] = '#ff00ff';
-$GLOBALS['csstidy']['replace_colors']['mediumaquamarine'] = '#66cdaa';
-$GLOBALS['csstidy']['replace_colors']['mediumblue'] = '#0000cd';
-$GLOBALS['csstidy']['replace_colors']['mediumorchid'] = '#ba55d3';
-$GLOBALS['csstidy']['replace_colors']['mediumpurple'] = '#9370d8';
-$GLOBALS['csstidy']['replace_colors']['mediumseagreen'] = '#3cb371';
-$GLOBALS['csstidy']['replace_colors']['mediumslateblue'] = '#7b68ee';
-$GLOBALS['csstidy']['replace_colors']['mediumspringgreen'] = '#00fa9a';
-$GLOBALS['csstidy']['replace_colors']['mediumturquoise'] = '#48d1cc';
-$GLOBALS['csstidy']['replace_colors']['mediumvioletred'] = '#c71585';
-$GLOBALS['csstidy']['replace_colors']['midnightblue'] = '#191970';
-$GLOBALS['csstidy']['replace_colors']['mintcream'] = '#f5fffa';
-$GLOBALS['csstidy']['replace_colors']['mistyrose'] = '#ffe4e1';
-$GLOBALS['csstidy']['replace_colors']['moccasin'] = '#ffe4b5';
-$GLOBALS['csstidy']['replace_colors']['navajowhite'] = '#ffdead';
-$GLOBALS['csstidy']['replace_colors']['oldlace'] = '#fdf5e6';
-$GLOBALS['csstidy']['replace_colors']['olivedrab'] = '#6b8e23';
-$GLOBALS['csstidy']['replace_colors']['orangered'] = '#ff4500';
-$GLOBALS['csstidy']['replace_colors']['orchid'] = '#da70d6';
-$GLOBALS['csstidy']['replace_colors']['palegoldenrod'] = '#eee8aa';
-$GLOBALS['csstidy']['replace_colors']['palegreen'] = '#98fb98';
-$GLOBALS['csstidy']['replace_colors']['paleturquoise'] = '#afeeee';
-$GLOBALS['csstidy']['replace_colors']['palevioletred'] = '#d87093';
-$GLOBALS['csstidy']['replace_colors']['papayawhip'] = '#ffefd5';
-$GLOBALS['csstidy']['replace_colors']['peachpuff'] = '#ffdab9';
-$GLOBALS['csstidy']['replace_colors']['peru'] = '#cd853f';
-$GLOBALS['csstidy']['replace_colors']['pink'] = '#ffc0cb';
-$GLOBALS['csstidy']['replace_colors']['plum'] = '#dda0dd';
-$GLOBALS['csstidy']['replace_colors']['powderblue'] = '#b0e0e6';
-$GLOBALS['csstidy']['replace_colors']['rosybrown'] = '#bc8f8f';
-$GLOBALS['csstidy']['replace_colors']['royalblue'] = '#4169e1';
-$GLOBALS['csstidy']['replace_colors']['saddlebrown'] = '#8b4513';
-$GLOBALS['csstidy']['replace_colors']['salmon'] = '#fa8072';
-$GLOBALS['csstidy']['replace_colors']['sandybrown'] = '#f4a460';
-$GLOBALS['csstidy']['replace_colors']['seagreen'] = '#2e8b57';
-$GLOBALS['csstidy']['replace_colors']['seashell'] = '#fff5ee';
-$GLOBALS['csstidy']['replace_colors']['sienna'] = '#a0522d';
-$GLOBALS['csstidy']['replace_colors']['skyblue'] = '#87ceeb';
-$GLOBALS['csstidy']['replace_colors']['slateblue'] = '#6a5acd';
-$GLOBALS['csstidy']['replace_colors']['slategray'] = '#708090';
-$GLOBALS['csstidy']['replace_colors']['snow'] = '#fffafa';
-$GLOBALS['csstidy']['replace_colors']['springgreen'] = '#00ff7f';
-$GLOBALS['csstidy']['replace_colors']['steelblue'] = '#4682b4';
-$GLOBALS['csstidy']['replace_colors']['tan'] = '#d2b48c';
-$GLOBALS['csstidy']['replace_colors']['thistle'] = '#d8bfd8';
-$GLOBALS['csstidy']['replace_colors']['tomato'] = '#ff6347';
-$GLOBALS['csstidy']['replace_colors']['turquoise'] = '#40e0d0';
-$GLOBALS['csstidy']['replace_colors']['violet'] = '#ee82ee';
-$GLOBALS['csstidy']['replace_colors']['violetred'] = '#d02090';
-$GLOBALS['csstidy']['replace_colors']['wheat'] = '#f5deb3';
-$GLOBALS['csstidy']['replace_colors']['whitesmoke'] = '#f5f5f5';
-$GLOBALS['csstidy']['replace_colors']['yellowgreen'] = '#9acd32';
+$data['csstidy']['replace_colors'] = array();
+$data['csstidy']['replace_colors']['aliceblue'] = '#f0f8ff';
+$data['csstidy']['replace_colors']['antiquewhite'] = '#faebd7';
+$data['csstidy']['replace_colors']['aquamarine'] = '#7fffd4';
+$data['csstidy']['replace_colors']['azure'] = '#f0ffff';
+$data['csstidy']['replace_colors']['beige'] = '#f5f5dc';
+$data['csstidy']['replace_colors']['bisque'] = '#ffe4c4';
+$data['csstidy']['replace_colors']['blanchedalmond'] = '#ffebcd';
+$data['csstidy']['replace_colors']['blueviolet'] = '#8a2be2';
+$data['csstidy']['replace_colors']['brown'] = '#a52a2a';
+$data['csstidy']['replace_colors']['burlywood'] = '#deb887';
+$data['csstidy']['replace_colors']['cadetblue'] = '#5f9ea0';
+$data['csstidy']['replace_colors']['chartreuse'] = '#7fff00';
+$data['csstidy']['replace_colors']['chocolate'] = '#d2691e';
+$data['csstidy']['replace_colors']['coral'] = '#ff7f50';
+$data['csstidy']['replace_colors']['cornflowerblue'] = '#6495ed';
+$data['csstidy']['replace_colors']['cornsilk'] = '#fff8dc';
+$data['csstidy']['replace_colors']['crimson'] = '#dc143c';
+$data['csstidy']['replace_colors']['cyan'] = '#00ffff';
+$data['csstidy']['replace_colors']['darkblue'] = '#00008b';
+$data['csstidy']['replace_colors']['darkcyan'] = '#008b8b';
+$data['csstidy']['replace_colors']['darkgoldenrod'] = '#b8860b';
+$data['csstidy']['replace_colors']['darkgray'] = '#a9a9a9';
+$data['csstidy']['replace_colors']['darkgreen'] = '#006400';
+$data['csstidy']['replace_colors']['darkkhaki'] = '#bdb76b';
+$data['csstidy']['replace_colors']['darkmagenta'] = '#8b008b';
+$data['csstidy']['replace_colors']['darkolivegreen'] = '#556b2f';
+$data['csstidy']['replace_colors']['darkorange'] = '#ff8c00';
+$data['csstidy']['replace_colors']['darkorchid'] = '#9932cc';
+$data['csstidy']['replace_colors']['darkred'] = '#8b0000';
+$data['csstidy']['replace_colors']['darksalmon'] = '#e9967a';
+$data['csstidy']['replace_colors']['darkseagreen'] = '#8fbc8f';
+$data['csstidy']['replace_colors']['darkslateblue'] = '#483d8b';
+$data['csstidy']['replace_colors']['darkslategray'] = '#2f4f4f';
+$data['csstidy']['replace_colors']['darkturquoise'] = '#00ced1';
+$data['csstidy']['replace_colors']['darkviolet'] = '#9400d3';
+$data['csstidy']['replace_colors']['deeppink'] = '#ff1493';
+$data['csstidy']['replace_colors']['deepskyblue'] = '#00bfff';
+$data['csstidy']['replace_colors']['dimgray'] = '#696969';
+$data['csstidy']['replace_colors']['dodgerblue'] = '#1e90ff';
+$data['csstidy']['replace_colors']['feldspar'] = '#d19275';
+$data['csstidy']['replace_colors']['firebrick'] = '#b22222';
+$data['csstidy']['replace_colors']['floralwhite'] = '#fffaf0';
+$data['csstidy']['replace_colors']['forestgreen'] = '#228b22';
+$data['csstidy']['replace_colors']['gainsboro'] = '#dcdcdc';
+$data['csstidy']['replace_colors']['ghostwhite'] = '#f8f8ff';
+$data['csstidy']['replace_colors']['gold'] = '#ffd700';
+$data['csstidy']['replace_colors']['goldenrod'] = '#daa520';
+$data['csstidy']['replace_colors']['greenyellow'] = '#adff2f';
+$data['csstidy']['replace_colors']['honeydew'] = '#f0fff0';
+$data['csstidy']['replace_colors']['hotpink'] = '#ff69b4';
+$data['csstidy']['replace_colors']['indianred'] = '#cd5c5c';
+$data['csstidy']['replace_colors']['indigo'] = '#4b0082';
+$data['csstidy']['replace_colors']['ivory'] = '#fffff0';
+$data['csstidy']['replace_colors']['khaki'] = '#f0e68c';
+$data['csstidy']['replace_colors']['lavender'] = '#e6e6fa';
+$data['csstidy']['replace_colors']['lavenderblush'] = '#fff0f5';
+$data['csstidy']['replace_colors']['lawngreen'] = '#7cfc00';
+$data['csstidy']['replace_colors']['lemonchiffon'] = '#fffacd';
+$data['csstidy']['replace_colors']['lightblue'] = '#add8e6';
+$data['csstidy']['replace_colors']['lightcoral'] = '#f08080';
+$data['csstidy']['replace_colors']['lightcyan'] = '#e0ffff';
+$data['csstidy']['replace_colors']['lightgoldenrodyellow'] = '#fafad2';
+$data['csstidy']['replace_colors']['lightgrey'] = '#d3d3d3';
+$data['csstidy']['replace_colors']['lightgreen'] = '#90ee90';
+$data['csstidy']['replace_colors']['lightpink'] = '#ffb6c1';
+$data['csstidy']['replace_colors']['lightsalmon'] = '#ffa07a';
+$data['csstidy']['replace_colors']['lightseagreen'] = '#20b2aa';
+$data['csstidy']['replace_colors']['lightskyblue'] = '#87cefa';
+$data['csstidy']['replace_colors']['lightslateblue'] = '#8470ff';
+$data['csstidy']['replace_colors']['lightslategray'] = '#778899';
+$data['csstidy']['replace_colors']['lightsteelblue'] = '#b0c4de';
+$data['csstidy']['replace_colors']['lightyellow'] = '#ffffe0';
+$data['csstidy']['replace_colors']['limegreen'] = '#32cd32';
+$data['csstidy']['replace_colors']['linen'] = '#faf0e6';
+$data['csstidy']['replace_colors']['magenta'] = '#ff00ff';
+$data['csstidy']['replace_colors']['mediumaquamarine'] = '#66cdaa';
+$data['csstidy']['replace_colors']['mediumblue'] = '#0000cd';
+$data['csstidy']['replace_colors']['mediumorchid'] = '#ba55d3';
+$data['csstidy']['replace_colors']['mediumpurple'] = '#9370d8';
+$data['csstidy']['replace_colors']['mediumseagreen'] = '#3cb371';
+$data['csstidy']['replace_colors']['mediumslateblue'] = '#7b68ee';
+$data['csstidy']['replace_colors']['mediumspringgreen'] = '#00fa9a';
+$data['csstidy']['replace_colors']['mediumturquoise'] = '#48d1cc';
+$data['csstidy']['replace_colors']['mediumvioletred'] = '#c71585';
+$data['csstidy']['replace_colors']['midnightblue'] = '#191970';
+$data['csstidy']['replace_colors']['mintcream'] = '#f5fffa';
+$data['csstidy']['replace_colors']['mistyrose'] = '#ffe4e1';
+$data['csstidy']['replace_colors']['moccasin'] = '#ffe4b5';
+$data['csstidy']['replace_colors']['navajowhite'] = '#ffdead';
+$data['csstidy']['replace_colors']['oldlace'] = '#fdf5e6';
+$data['csstidy']['replace_colors']['olivedrab'] = '#6b8e23';
+$data['csstidy']['replace_colors']['orangered'] = '#ff4500';
+$data['csstidy']['replace_colors']['orchid'] = '#da70d6';
+$data['csstidy']['replace_colors']['palegoldenrod'] = '#eee8aa';
+$data['csstidy']['replace_colors']['palegreen'] = '#98fb98';
+$data['csstidy']['replace_colors']['paleturquoise'] = '#afeeee';
+$data['csstidy']['replace_colors']['palevioletred'] = '#d87093';
+$data['csstidy']['replace_colors']['papayawhip'] = '#ffefd5';
+$data['csstidy']['replace_colors']['peachpuff'] = '#ffdab9';
+$data['csstidy']['replace_colors']['peru'] = '#cd853f';
+$data['csstidy']['replace_colors']['pink'] = '#ffc0cb';
+$data['csstidy']['replace_colors']['plum'] = '#dda0dd';
+$data['csstidy']['replace_colors']['powderblue'] = '#b0e0e6';
+$data['csstidy']['replace_colors']['rosybrown'] = '#bc8f8f';
+$data['csstidy']['replace_colors']['royalblue'] = '#4169e1';
+$data['csstidy']['replace_colors']['saddlebrown'] = '#8b4513';
+$data['csstidy']['replace_colors']['salmon'] = '#fa8072';
+$data['csstidy']['replace_colors']['sandybrown'] = '#f4a460';
+$data['csstidy']['replace_colors']['seagreen'] = '#2e8b57';
+$data['csstidy']['replace_colors']['seashell'] = '#fff5ee';
+$data['csstidy']['replace_colors']['sienna'] = '#a0522d';
+$data['csstidy']['replace_colors']['skyblue'] = '#87ceeb';
+$data['csstidy']['replace_colors']['slateblue'] = '#6a5acd';
+$data['csstidy']['replace_colors']['slategray'] = '#708090';
+$data['csstidy']['replace_colors']['snow'] = '#fffafa';
+$data['csstidy']['replace_colors']['springgreen'] = '#00ff7f';
+$data['csstidy']['replace_colors']['steelblue'] = '#4682b4';
+$data['csstidy']['replace_colors']['tan'] = '#d2b48c';
+$data['csstidy']['replace_colors']['thistle'] = '#d8bfd8';
+$data['csstidy']['replace_colors']['tomato'] = '#ff6347';
+$data['csstidy']['replace_colors']['turquoise'] = '#40e0d0';
+$data['csstidy']['replace_colors']['violet'] = '#ee82ee';
+$data['csstidy']['replace_colors']['violetred'] = '#d02090';
+$data['csstidy']['replace_colors']['wheat'] = '#f5deb3';
+$data['csstidy']['replace_colors']['whitesmoke'] = '#f5f5f5';
+$data['csstidy']['replace_colors']['yellowgreen'] = '#9acd32';
 
 /**
  * A list of all shorthand properties that are devided into four properties and/or have four subvalues
  *
- * @global array $GLOBALS['csstidy']['shorthands']
+ * @global array $data['csstidy']['shorthands']
  * @todo Are there new ones in CSS3?
  * @see dissolve_4value_shorthands()
@@ -279 +269 @@
  * @version 1.0
  */
-$GLOBALS['csstidy']['shorthands'] = array();
-$GLOBALS['csstidy']['shorthands']['border-color'] = array('border-top-color','border-right-color','border-bottom-color','border-left-color');
-$GLOBALS['csstidy']['shorthands']['border-style'] = array('border-top-style','border-right-style','border-bottom-style','border-left-style');
-$GLOBALS['csstidy']['shorthands']['border-width'] = array('border-top-width','border-right-width','border-bottom-width','border-left-width');
-$GLOBALS['csstidy']['shorthands']['margin'] = array('margin-top','margin-right','margin-bottom','margin-left');
-$GLOBALS['csstidy']['shorthands']['padding'] = array('padding-top','padding-right','padding-bottom','padding-left');
-$GLOBALS['csstidy']['shorthands']['-moz-border-radius'] = 0;
+$data['csstidy']['shorthands'] = array();
+$data['csstidy']['shorthands']['border-color'] = array('border-top-color','border-right-color','border-bottom-color','border-left-color');
+$data['csstidy']['shorthands']['border-style'] = array('border-top-style','border-right-style','border-bottom-style','border-left-style');
+$data['csstidy']['shorthands']['border-width'] = array('border-top-width','border-right-width','border-bottom-width','border-left-width');
+$data['csstidy']['shorthands']['margin'] = array('margin-top','margin-right','margin-bottom','margin-left');
+$data['csstidy']['shorthands']['padding'] = array('padding-top','padding-right','padding-bottom','padding-left');
+$data['csstidy']['shorthands']['-moz-border-radius'] = 0;
 
 /**
  * All CSS Properties. Needed for csstidy::property_is_next()
  *
- * @global array $GLOBALS['csstidy']['all_properties']
+ * @global array $data['csstidy']['all_properties']
  * @version 1.1
  * @see csstidy::property_is_next()
  */
-$GLOBALS['csstidy']['all_properties']['alignment-adjust'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['alignment-baseline'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-delay'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-direction'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-duration'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-iteration-count'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-name'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-play-state'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-timing-function'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['appearance'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['azimuth'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['backface-visibility'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-attachment'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-clip'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-image'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-origin'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-position'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-repeat'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-size'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['baseline-shift'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['binding'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bleed'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bookmark-label'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bookmark-level'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bookmark-state'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bookmark-target'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-left-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-right-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-collapse'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-outset'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-repeat'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-slice'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-source'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-width'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-left-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-left-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-left-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-right-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-right-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-right-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-spacing'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-left-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-right-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bottom'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['box-decoration-break'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['box-shadow'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['box-sizing'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['break-after'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['break-before'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['break-inside'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['caption-side'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['clear'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['clip'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['color-profile'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-count'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-fill'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-gap'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-rule'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-rule-color'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-rule-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-rule-width'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-span'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-width'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['columns'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['content'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['counter-increment'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['counter-reset'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['crop'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['cue'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['cue-after'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['cue-before'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['cursor'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['direction'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['display'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['dominant-baseline'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-after-adjust'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-after-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-before-adjust'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-before-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-size'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-value'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['elevation'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['empty-cells'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['fit'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['fit-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-flow'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-line-pack'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-order'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-pack'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['float'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['float-offset'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-family'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-size'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-size-adjust'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-stretch'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-variant'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-weight'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['grid-columns'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['grid-rows'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hanging-punctuation'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['height'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-after'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-before'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-character'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-lines'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-resource'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphens'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['icon'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['image-orientation'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['image-rendering'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['image-resolution'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['inline-box-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['left'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['letter-spacing'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-break'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-height'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-stacking'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-stacking-ruby'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-stacking-shift'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-stacking-strategy'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['list-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['list-style-image'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['list-style-position'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['list-style-type'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marker-offset'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marks'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-direction'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-loop'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-play-count'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-speed'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['max-height'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['max-width'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['min-height'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['min-width'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['move-to'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-down'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-index'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-left'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-right'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-up'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['opacity'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['orphans'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline-offset'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline-width'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow-wrap'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow-x'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow-y'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page-break-after'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page-break-before'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page-break-inside'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page-policy'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pause'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pause-after'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pause-before'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['perspective'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['perspective-origin'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['phonemes'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pitch'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pitch-range'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['play-during'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['position'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['presentation-level'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['punctuation-trim'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['quotes'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rendering-intent'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['resize'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rest'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rest-after'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rest-before'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['richness'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['right'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rotation'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rotation-point'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['ruby-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['ruby-overhang'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['ruby-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['ruby-span'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['size'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speak'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speak-header'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speak-numeral'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speak-punctuation'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speech-rate'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['src'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['stress'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['string-set'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['tab-size'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['table-layout'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['target'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['target-name'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['target-new'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['target-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-align'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-align-last'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration-color'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration-line'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration-skip'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-emphasis'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-emphasis-color'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-emphasis-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-emphasis-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-height'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-indent'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-justify'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-outline'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-shadow'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-space-collapse'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-transform'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-underline-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-wrap'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['top'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transform'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transform-origin'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transform-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition-delay'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition-duration'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition-property'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition-timing-function'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['unicode-bidi'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['vertical-align'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['visibility'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-balance'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-duration'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-family'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-pitch'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-pitch-range'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-rate'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-stress'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-volume'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['volume'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['white-space'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['widows'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['word-break'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['word-spacing'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['word-wrap'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['z-index'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['alignment-adjust'] = 'CSS3.0';
+$data['csstidy']['all_properties']['alignment-baseline'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-delay'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-direction'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-duration'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-iteration-count'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-name'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-play-state'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-timing-function'] = 'CSS3.0';
+$data['csstidy']['all_properties']['appearance'] = 'CSS3.0';
+$data['csstidy']['all_properties']['azimuth'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['backface-visibility'] = 'CSS3.0';
+$data['csstidy']['all_properties']['background'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-attachment'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-clip'] = 'CSS3.0';
+$data['csstidy']['all_properties']['background-color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-image'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-origin'] = 'CSS3.0';
+$data['csstidy']['all_properties']['background-position'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-repeat'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-size'] = 'CSS3.0';
+$data['csstidy']['all_properties']['baseline-shift'] = 'CSS3.0';
+$data['csstidy']['all_properties']['binding'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bleed'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bookmark-label'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bookmark-level'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bookmark-state'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bookmark-target'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-left-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-right-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-collapse'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-image'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-outset'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-repeat'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-slice'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-source'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-width'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-left-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-left-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-left-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-right-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-right-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-right-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-spacing'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-top-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-top-left-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-top-right-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-top-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-top-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['bottom'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['box-decoration-break'] = 'CSS3.0';
+$data['csstidy']['all_properties']['box-shadow'] = 'CSS3.0';
+$data['csstidy']['all_properties']['box-sizing'] = 'CSS3.0';
+$data['csstidy']['all_properties']['break-after'] = 'CSS3.0';
+$data['csstidy']['all_properties']['break-before'] = 'CSS3.0';
+$data['csstidy']['all_properties']['break-inside'] = 'CSS3.0';
+$data['csstidy']['all_properties']['caption-side'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['clear'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['clip'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['color-profile'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-count'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-fill'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-gap'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-rule'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-rule-color'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-rule-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-rule-width'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-span'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-width'] = 'CSS3.0';
+$data['csstidy']['all_properties']['columns'] = 'CSS3.0';
+$data['csstidy']['all_properties']['content'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['counter-increment'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['counter-reset'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['crop'] = 'CSS3.0';
+$data['csstidy']['all_properties']['cue'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['cue-after'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['cue-before'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['cursor'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['direction'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['display'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['dominant-baseline'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-after-adjust'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-after-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-before-adjust'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-before-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-size'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-value'] = 'CSS3.0';
+$data['csstidy']['all_properties']['elevation'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['empty-cells'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['fit'] = 'CSS3.0';
+$data['csstidy']['all_properties']['fit-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-flow'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-line-pack'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-order'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-pack'] = 'CSS3.0';
+$data['csstidy']['all_properties']['float'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['float-offset'] = 'CSS3.0';
+$data['csstidy']['all_properties']['font'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-family'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-size'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-size-adjust'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['font-stretch'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['font-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-variant'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-weight'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['grid-columns'] = 'CSS3.0';
+$data['csstidy']['all_properties']['grid-rows'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hanging-punctuation'] = 'CSS3.0';
+$data['csstidy']['all_properties']['height'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-after'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-before'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-character'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-lines'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-resource'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphens'] = 'CSS3.0';
+$data['csstidy']['all_properties']['icon'] = 'CSS3.0';
+$data['csstidy']['all_properties']['image-orientation'] = 'CSS3.0';
+$data['csstidy']['all_properties']['image-rendering'] = 'CSS3.0';
+$data['csstidy']['all_properties']['image-resolution'] = 'CSS3.0';
+$data['csstidy']['all_properties']['inline-box-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['left'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['letter-spacing'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['line-break'] = 'CSS3.0';
+$data['csstidy']['all_properties']['line-height'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['line-stacking'] = 'CSS3.0';
+$data['csstidy']['all_properties']['line-stacking-ruby'] = 'CSS3.0';
+$data['csstidy']['all_properties']['line-stacking-shift'] = 'CSS3.0';
+$data['csstidy']['all_properties']['line-stacking-strategy'] = 'CSS3.0';
+$data['csstidy']['all_properties']['list-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['list-style-image'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['list-style-position'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['list-style-type'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['marker-offset'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['marks'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['marquee-direction'] = 'CSS3.0';
+$data['csstidy']['all_properties']['marquee-loop'] = 'CSS3.0';
+$data['csstidy']['all_properties']['marquee-play-count'] = 'CSS3.0';
+$data['csstidy']['all_properties']['marquee-speed'] = 'CSS3.0';
+$data['csstidy']['all_properties']['marquee-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['max-height'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['max-width'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['min-height'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['min-width'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['move-to'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-down'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-index'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-left'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-right'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-up'] = 'CSS3.0';
+$data['csstidy']['all_properties']['opacity'] = 'CSS3.0';
+$data['csstidy']['all_properties']['orphans'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['outline'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['outline-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['outline-offset'] = 'CSS3.0';
+$data['csstidy']['all_properties']['outline-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['outline-width'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['overflow'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['overflow-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['overflow-wrap'] = 'CSS3.0';
+$data['csstidy']['all_properties']['overflow-x'] = 'CSS3.0';
+$data['csstidy']['all_properties']['overflow-y'] = 'CSS3.0';
+$data['csstidy']['all_properties']['padding'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['padding-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['padding-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['padding-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['padding-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['page'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['page-break-after'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['page-break-before'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['page-break-inside'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['page-policy'] = 'CSS3.0';
+$data['csstidy']['all_properties']['pause'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['pause-after'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['pause-before'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['perspective'] = 'CSS3.0';
+$data['csstidy']['all_properties']['perspective-origin'] = 'CSS3.0';
+$data['csstidy']['all_properties']['phonemes'] = 'CSS3.0';
+$data['csstidy']['all_properties']['pitch'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['pitch-range'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['play-during'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['position'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['presentation-level'] = 'CSS3.0';
+$data['csstidy']['all_properties']['punctuation-trim'] = 'CSS3.0';
+$data['csstidy']['all_properties']['quotes'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['rendering-intent'] = 'CSS3.0';
+$data['csstidy']['all_properties']['resize'] = 'CSS3.0';
+$data['csstidy']['all_properties']['rest'] = 'CSS3.0';
+$data['csstidy']['all_properties']['rest-after'] = 'CSS3.0';
+$data['csstidy']['all_properties']['rest-before'] = 'CSS3.0';
+$data['csstidy']['all_properties']['richness'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['right'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['rotation'] = 'CSS3.0';
+$data['csstidy']['all_properties']['rotation-point'] = 'CSS3.0';
+$data['csstidy']['all_properties']['ruby-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['ruby-overhang'] = 'CSS3.0';
+$data['csstidy']['all_properties']['ruby-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['ruby-span'] = 'CSS3.0';
+$data['csstidy']['all_properties']['size'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['speak'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['speak-header'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['speak-numeral'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['speak-punctuation'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['speech-rate'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['src'] = 'CSS3.0';
+$data['csstidy']['all_properties']['stress'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['string-set'] = 'CSS3.0';
+$data['csstidy']['all_properties']['tab-size'] = 'CSS3.0';
+$data['csstidy']['all_properties']['table-layout'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['target'] = 'CSS3.0';
+$data['csstidy']['all_properties']['target-name'] = 'CSS3.0';
+$data['csstidy']['all_properties']['target-new'] = 'CSS3.0';
+$data['csstidy']['all_properties']['target-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-align'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['text-align-last'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-decoration'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['text-decoration-color'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-decoration-line'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-decoration-skip'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-decoration-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-emphasis'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-emphasis-color'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-emphasis-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-emphasis-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-height'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-indent'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['text-justify'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-outline'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-shadow'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['text-space-collapse'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-transform'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['text-underline-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-wrap'] = 'CSS3.0';
+$data['csstidy']['all_properties']['top'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['transform'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transform-origin'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transform-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition-delay'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition-duration'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition-property'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition-timing-function'] = 'CSS3.0';
+$data['csstidy']['all_properties']['unicode-bidi'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['vertical-align'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['visibility'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['voice-balance'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-duration'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-family'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['voice-pitch'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-pitch-range'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-rate'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-stress'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-volume'] = 'CSS3.0';
+$data['csstidy']['all_properties']['volume'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['white-space'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['widows'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['word-break'] = 'CSS3.0';
+$data['csstidy']['all_properties']['word-spacing'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['word-wrap'] = 'CSS3.0';
+$data['csstidy']['all_properties']['z-index'] = 'CSS2.0,CSS2.1,CSS3.0';
 
 /**
  * An array containing all properties that can accept a quoted string as a value.
  *
- * @global array $GLOBALS['csstidy']['quoted_string_properties']
- */
-$GLOBALS['csstidy']['quoted_string_properties'] = array('content', 'font-family', 'quotes');
+ * @global array $data['csstidy']['quoted_string_properties']
+ */
+$data['csstidy']['quoted_string_properties'] = array('content', 'font-family', 'quotes');
 
 /**
  * An array containing all properties that can be defined multiple times without being overwritten.
  *
- * @global array $GLOBALS['csstidy']['quoted_string_properties']
- */
-$GLOBALS['csstidy']['multiple_properties'] = array('background', 'background-image');
+ * @global array $data['csstidy']['quoted_string_properties']
+ */
+$data['csstidy']['multiple_properties'] = array('background', 'background-image');
 
 /**
  * An array containing all predefined templates.
  *
- * @global array $GLOBALS['csstidy']['predefined_templates']
+ * @global array $data['csstidy']['predefined_templates']
  * @version 1.0
  * @see csstidy::load_template()
  */
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="at">'; //string before @rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>'."\n"; //bracket after @-rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="selector">'; //string before selector
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>'."\n"; //bracket after selector
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="property">'; //string before property
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span><span class="value">'; //string after property+before value
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span><span class="format">;</span>'."\n"; //string after value
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="format">}</span>'; //closing bracket - selector
-$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n\n"; //space between blocks {...}
-$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n".'<span class="format">}</span>'. "\n\n"; //closing bracket @-rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ''; //indent in @-rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="comment">'; // before comment
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span>'."\n"; // after comment
-$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n"; // after each line @-rule
-
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="at">';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span> <span class="format">{</span>'."\n";
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="selector">';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="format">{</span>';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="property">';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="value">';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="format">;</span>';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="format">}</span>';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n";
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n". '<span class="format">}'."\n".'</span>';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="comment">'; // before comment
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span>'; // after comment
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n";
-
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="at">';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">{</span>';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="selector">';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">{</span>';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="property">';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="value">';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">;</span>';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="format">}</span>';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="format">}</span>';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="comment">'; // before comment
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span>'; // after comment
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="at">';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span> <span class="format">{</span>'."\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="selector">';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span>'."\n".'<span class="format">{</span>'."\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '    <span class="property">';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="value">';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="format">;</span>'."\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="format">}</span>';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n".'<span class="format">}</span>'."\n\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '    ';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="comment">'; // before comment
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span>'."\n"; // after comment
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n";
+$data['csstidy']['predefined_templates']['default'][] = '<span class="at">'; //string before @rule
+$data['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>'."\n"; //bracket after @-rule
+$data['csstidy']['predefined_templates']['default'][] = '<span class="selector">'; //string before selector
+$data['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>'."\n"; //bracket after selector
+$data['csstidy']['predefined_templates']['default'][] = '<span class="property">'; //string before property
+$data['csstidy']['predefined_templates']['default'][] = '</span><span class="value">'; //string after property+before value
+$data['csstidy']['predefined_templates']['default'][] = '</span><span class="format">;</span>'."\n"; //string after value
+$data['csstidy']['predefined_templates']['default'][] = '<span class="format">}</span>'; //closing bracket - selector
+$data['csstidy']['predefined_templates']['default'][] = "\n\n"; //space between blocks {...}
+$data['csstidy']['predefined_templates']['default'][] = "\n".'<span class="format">}</span>'. "\n\n"; //closing bracket @-rule
+$data['csstidy']['predefined_templates']['default'][] = ''; //indent in @-rule
+$data['csstidy']['predefined_templates']['default'][] = '<span class="comment">'; // before comment
+$data['csstidy']['predefined_templates']['default'][] = '</span>'."\n"; // after comment
+$data['csstidy']['predefined_templates']['default'][] = "\n"; // after each line @-rule
+
+$data['csstidy']['predefined_templates']['high_compression'][] = '<span class="at">';
+$data['csstidy']['predefined_templates']['high_compression'][] = '</span> <span class="format">{</span>'."\n";
+$data['csstidy']['predefined_templates']['high_compression'][] = '<span class="selector">';
+$data['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="format">{</span>';
+$data['csstidy']['predefined_templates']['high_compression'][] = '<span class="property">';
+$data['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="value">';
+$data['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="format">;</span>';
+$data['csstidy']['predefined_templates']['high_compression'][] = '<span class="format">}</span>';
+$data['csstidy']['predefined_templates']['high_compression'][] = "\n";
+$data['csstidy']['predefined_templates']['high_compression'][] = "\n". '<span class="format">}'."\n".'</span>';
+$data['csstidy']['predefined_templates']['high_compression'][] = '';
+$data['csstidy']['predefined_templates']['high_compression'][] = '<span class="comment">'; // before comment
+$data['csstidy']['predefined_templates']['high_compression'][] = '</span>'; // after comment
+$data['csstidy']['predefined_templates']['high_compression'][] = "\n";
+
+$data['csstidy']['predefined_templates']['highest_compression'][] = '<span class="at">';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">{</span>';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '<span class="selector">';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">{</span>';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '<span class="property">';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="value">';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">;</span>';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '<span class="format">}</span>';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '<span class="format">}</span>';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '<span class="comment">'; // before comment
+$data['csstidy']['predefined_templates']['highest_compression'][] = '</span>'; // after comment
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+
+$data['csstidy']['predefined_templates']['low_compression'][] = '<span class="at">';
+$data['csstidy']['predefined_templates']['low_compression'][] = '</span> <span class="format">{</span>'."\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '<span class="selector">';
+$data['csstidy']['predefined_templates']['low_compression'][] = '</span>'."\n".'<span class="format">{</span>'."\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '       <span class="property">';
+$data['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="value">';
+$data['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="format">;</span>'."\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '<span class="format">}</span>';
+$data['csstidy']['predefined_templates']['low_compression'][] = "\n\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = "\n".'<span class="format">}</span>'."\n\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '       ';
+$data['csstidy']['predefined_templates']['low_compression'][] = '<span class="comment">'; // before comment
+$data['csstidy']['predefined_templates']['low_compression'][] = '</span>'."\n"; // after comment
+$data['csstidy']['predefined_templates']['low_compression'][] = "\n";

_core_/branches/spip-3.0/plugins/compresseur/paquet.xml

@@ -2 +2 @@
         prefix="compresseur"
         categorie="performance"
-        version="1.8.7"
+        version="1.8.8"
         etat="stable"
         compatibilite="[3.0.0;3.1.*]"