Changeset 2787042

Timestamp:

09/19/2022 02:38:08 PM (4 years ago)

Author:

schweizersolutions

Message:

2.1

• Updated: readme.txt
• Updated: Support for WordPress 6.0.2
• Updated: CSStidy library to v2.0.0
• Updated: Integration of all supported GA tracking plugins

Location:

opt-out-for-google-analytics/trunk

Files:

• constants.php (modified) (1 diff)
• ga-opt-out.php (modified) (2 diffs)
• inc/admin.class.php (modified) (12 diffs)
• inc/promo.class.php (modified) (4 diffs)
• inc/public.class.php (modified) (3 diffs)
• lib/csstidy/class.csstidy.php (modified) (1 diff)
• lib/csstidy/class.csstidy_optimise.php (modified) (1 diff)
• lib/csstidy/class.csstidy_print.php (modified) (1 diff)
• lib/csstidy/data.inc.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• templates/promotion.php (modified) (1 diff)

opt-out-for-google-analytics/trunk/constants.php

@@ -8 +8 @@
     defined( 'GAOO_PLUGIN_URL' ) || define( 'GAOO_PLUGIN_URL', WP_PLUGIN_URL . DIRECTORY_SEPARATOR . GAOO_PLUGIN_NAME );
     defined( 'GAOO_PREFIX' ) || define( 'GAOO_PREFIX', '_gaoo_' );
-    defined( 'GAOO_VERSION' ) || define( 'GAOO_VERSION', '2.0' );
+    defined( 'GAOO_VERSION' ) || define( 'GAOO_VERSION', '2.1' );
     defined( 'GAOO_SHORTCODE' ) || define( 'GAOO_SHORTCODE', '[ga_optout]' );
     defined( 'GAOO_CAPABILITY' ) || define( 'GAOO_CAPABILITY', 'manage_options' );

opt-out-for-google-analytics/trunk/ga-opt-out.php

@@ -4 +4 @@
      * Plugin URI: https://www.schweizersolutions.com/?utm_source=wordpress&utm_medium=plugin&utm_campaign=plugin_uri
      * Description: Adds the possibility for the user to opt out from Google Analytics. The user will not be tracked by Google Analytics on this site until he allows it again, clears his cookies or uses a different browser.
-     * Version: 2.0
+     * Version: 2.1
      * Author: Schweizer Solutions GmbH
      * Author URI: https://www.schweizersolutions.com/?utm_source=wordpress&utm_medium=plugin&utm_campaign=author_uri
@@ -81 +81 @@
     add_action( 'init', array( $gaoo, 'init' ) );
     add_action( 'activated_plugin', array( $gaoo, 'activated_plugin' ) );
-
-    function gaoo_log( $data, $id = 0 ) {
-        $file   = GAOO_PLUGIN_DIR . "/log.txt";
-        $string = '##### ' . $id . ' - ' . date( 'd.m.Y H:i:s' ) . ' ####' . PHP_EOL . var_export( $data, true ) . PHP_EOL . PHP_EOL;
-
-        return ( file_put_contents( $file, $string, FILE_APPEND ) !== false );
-    }

opt-out-for-google-analytics/trunk/inc/admin.class.php

@@ -5 +5 @@
 
     class GAOO_Admin {
+
         private $messages;
         private $csstidy;
@@ -14 +15 @@
          */
         public function __construct() {
-            add_action( 'admin_menu', array( $this, 'menu' ) );
-            add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-            add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-            add_action( 'save_post_page', array( $this, 'save_page' ), 10, 1 );
-            add_action( 'gaoo_cronjob', array( $this, 'send_status_mail' ) );
-            add_action( 'wp_dashboard_setup', array( $this, 'add_dashboard_widget' ) );
-
-            add_filter( 'plugin_action_links', array( $this, 'plugin_action_links' ), 10, 2 );
-            add_action( 'plugin_row_meta', array( $this, 'plugin_row_meta' ), 10, 2 );
+            add_action( 'admin_menu', array(
+                $this,
+                'menu'
+            ) );
+
+            add_action( 'admin_notices', array(
+                $this,
+                'admin_notices'
+            ) );
+
+            add_action( 'admin_enqueue_scripts', array(
+                $this,
+                'enqueue_scripts'
+            ) );
+
+            add_action( 'save_post_page', array(
+                $this,
+                'save_page'
+            ), 10, 1 );
+
+            add_action( 'gaoo_cronjob', array(
+                $this,
+                'send_status_mail'
+            ) );
+
+            add_action( 'wp_dashboard_setup', array(
+                $this,
+                'add_dashboard_widget'
+            ) );
+
+            add_action( 'upgrader_process_complete', array(
+                $this,
+                'upgrader_process_complete'
+            ), 10, 2 );
+
+            add_action( 'admin_notices', array(
+                'GAOO_Promo',
+                'render_admin_notice'
+            ) );
+
+
+            add_filter( 'plugin_action_links', array(
+                $this,
+                'plugin_action_links'
+            ), 10, 2 );
+
+            add_action( 'plugin_row_meta', array(
+                $this,
+                'plugin_row_meta'
+            ), 10, 2 );
 
             $this->plugin    = GAOO_PLUGIN_NAME . DIRECTORY_SEPARATOR . 'ga-opt-out.php';
@@ -33 +75 @@
 
         /**
+         * Handling functions after the update completed for this plugin.
+         *
+         * @param WP_Upgrader $upgrader_object WP_Upgrader instance. In other contexts this might be a Theme_Upgrader, Plugin_Upgrader, Core_Upgrade, or Language_Pack_Upgrader instance.
+         * @param array $options Array of bulk item update data.
+         */
+        function upgrader_process_complete( $upgrader_object, $options ) {
+            if ( $options[ 'action' ] == 'update' && $options[ 'type' ] == 'plugin' && isset( $options[ 'plugins' ] ) && in_array( plugin_basename( __FILE__ ), $options[ 'plugins' ] ) ) {
+                GAOO_Promo::clearCache();
+            }
+        }
+
+        /**
          * Load TinyMCE filters and hooks
          */
@@ -45 +99 @@
             }
 
-            add_filter( "mce_external_plugins", array( $this, 'add_tinymce_plugin' ) );
-            add_filter( 'mce_buttons', array( $this, 'register_tinymce_button' ) );
+            add_filter( "mce_external_plugins", array(
+                $this,
+                'add_tinymce_plugin'
+            ) );
+            add_filter( 'mce_buttons', array(
+                $this,
+                'register_tinymce_button'
+            ) );
         }
 
@@ -64 +124 @@
 
             if ( ! empty( $promo ) && ! empty( $promo[ 'promo' ] ) ) {
-                $promo   = array_pop( $promo[ 'promo' ] );
-                $links[] = array(
-                    'link'   => $promo[ 'link' ],
-                    'text'   => $promo[ 'link_text' ],
-                    'target' => '_blank',
-                );
+                $promo = array_pop( $promo[ 'promo' ] );
+
+                if ( empty( $promo[ 'hide_if_active' ] ) || ! is_array( $promo[ 'hide_if_active' ] ) || ! GAOO_Promo::should_hide( $promo[ 'hide_if_active' ] ) ) {
+                    $links[] = array(
+                        'link'   => $promo[ 'link' ],
+                        'text'   => $promo[ 'link_text' ],
+                        'target' => '_blank',
+                    );
+                }
             }
 
@@ -86 +149 @@
         public function add_dashboard_widget() {
             if ( GAOO_Utils::get_option( 'disable_dashboard' ) != 'on' ) {
-                wp_add_dashboard_widget( 'ga-opt-out', esc_html__( 'Opt-Out for Google Analytics - Status Check', 'opt-out-for-google-analytics' ), array( $this, 'render_dashboard_widget' ) );
+                wp_add_dashboard_widget( 'ga-opt-out', esc_html__( 'Opt-Out for Google Analytics - Status Check', 'opt-out-for-google-analytics' ), array(
+                    $this,
+                    'render_dashboard_widget'
+                ) );
             }
         }
@@ -134 +200 @@
          */
         public function menu() {
-            add_options_page( 'Opt-Out for Google Analytics', 'GA Opt-Out', GAOO_CAPABILITY, 'gaoo', array( $this, 'menu_settings' ) );
+            add_options_page( 'Opt-Out for Google Analytics', 'GA Opt-Out', GAOO_CAPABILITY, 'gaoo', array(
+                $this,
+                'menu_settings'
+            ) );
         }
 
@@ -140 +209 @@
          * Customize the action links.
          *
-         * @param array  $links Actions links.
-         * @param string $file  Filename of the activated plugin.
+         * @param array $links Actions links.
+         * @param string $file Filename of the activated plugin.
          *
          * @return array Action links.
@@ -156 +225 @@
          * Plugin row meta links
          *
+         * @param array $links already defined meta links.
+         * @param string $file plugin file path and name being processed.
+         *
+         * @return array $input
          * @since 1.1
          *
-         * @param array  $links already defined meta links.
-         * @param string $file  plugin file path and name being processed.
-         *
-         * @return array $input
          */
         function plugin_row_meta( $links, $file ) {
             if ( $file == $this->plugin ) {
-                $links[] = "<a href='https://wordpress.org/support/plugin/opt-out-for-google-analytics/reviews/?rate=5#new-post' target='_blank'>" . esc_html__( 'Rate:', 'opt-out-for-google-analytics' ) . "<i class='gaoo-rate-stars'>"
-                    . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>"
-                    . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>"
-                    . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>"
-                    . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>"
-                    . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>"
-                    . "</i></a>";
+                $links[] = "<a href='https://wordpress.org/support/plugin/opt-out-for-google-analytics/reviews/?rate=5#new-post' target='_blank'>" . esc_html__( 'Rate:', 'opt-out-for-google-analytics' ) . "<i class='gaoo-rate-stars'>" . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>" . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>" . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>" . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>" . "<svg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='feather feather-star'><polygon points='12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2'/></svg>" . "</i></a>";
 
                 if ( ! empty( $this->promotion ) ) {
@@ -206 +269 @@
 
             if ( ! empty( $current_screen ) && method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
-                wp_enqueue_script( 'gaoo-block', GAOO_PLUGIN_URL . '/assets/optout-block.js', array( 'wp-blocks', 'wp-editor' ), GAOO_VERSION );
+                wp_enqueue_script( 'gaoo-block', GAOO_PLUGIN_URL . '/assets/optout-block.js', array(
+                    'wp-blocks',
+                    'wp-editor'
+                ), GAOO_VERSION );
             }
         }
@@ -244 +310 @@
             $ga_plugins = array(
                 'monsterinsights' => array(
-                    'label'        => 'Google Analytics for WordPress by MonsterInsights',
+                    'label'        => 'MonsterInsights – Google Analytics Dashboard for WordPress (Website Stats Made Easy)',
                     'url_install'  => admin_url( 'plugin-install.php?tab=search&s=Google+Analytics+MonsterInsights' ),
                     'url_activate' => admin_url( 'plugins.php?plugin_status=inactive&s=MonsterInsights' ),
@@ -274 +340 @@
                 ),
                 'sitekit'         => array(
-                    'label'        => 'Site Kit by Google',
+                    'label'        => 'Site Kit by Google – Analytics, Search Console, AdSense, Speed',
                     'url_install'  => admin_url( 'plugin-install.php?tab=search&s=Google+site+kit' ),
                     'url_activate' => admin_url( 'plugins.php?plugin_status=inactive&s=site+kit' ),

opt-out-for-google-analytics/trunk/inc/promo.class.php

@@ -8 +8 @@
      */
     class GAOO_Promo {
+
         /**
          * @var string $option_key_off Option name to store status
@@ -14 +15 @@
 
         /**
-         * @var string $transient_key_cache TRansient name for API cached data
+         * @var string $transient_key_cache Transient name for API cached data
          */
         private static $transient_key_cache = GAOO_PREFIX . 'data_cache';
+
+        /**
+         * @var string $transient_key_notices Transient name for showing admin notices or not
+         */
+        private static $transient_key_notices = GAOO_PREFIX . 'admin_notices_cache';
 
         /**
@@ -51 +57 @@
 
         /**
+         * Clear cache for API response data.
+         *
+         * @return bool
+         */
+        public static function clearCache() {
+            return delete_transient( self::$transient_key_cache ) && delete_transient( self::$transient_key_notices );
+        }
+
+        /**
+         * Render admin notices in WP admin.
+         */
+        public static function render_admin_notice() {
+            if ( get_transient( self::$transient_key_notices ) !== false ) {
+                return;
+            }
+
+            $data = self::get_data();
+
+            if ( ! empty( $data[ 'promo' ] ) ) {
+                foreach ( $data[ 'promo' ] as $promo ) {
+                    if ( ! empty( $promo[ 'hide_if_active' ] ) && is_array( $promo[ 'hide_if_active' ] ) && self::should_hide( $promo[ 'hide_if_active' ] ) ) {
+                        continue;
+                    }
+
+                    echo '<div class="notice notice-info is-dismissible">' . $promo[ 'notice' ] . '</div>';
+                }
+
+                set_transient( self::$transient_key_notices, time(), MONTH_IN_SECONDS * 3 );
+            }
+        }
+
+        /**
+         * Check if specific plugin is activated, to hide promo.
+         *
+         * @param array $plugins Array with plugins which should be checked.
+         *
+         * @return bool True if at least one plugin is active, otherwise false.
+         */
+        public static function should_hide( $plugins ) {
+            if ( empty( $plugins ) || ! is_array( $plugins ) ) {
+                return false;
+            }
+
+            $active_plugins = (array) get_option( 'active_plugins' );
+
+            return ! empty( array_intersect( $plugins, $active_plugins ) );
+        }
+
+        /**
          * Render the promotion box.
          *
          * @param bool $pinned_only Render only the promotion which is pinned. (Default: false)
-         * @param bool $echo        Echo or return the HTML code. (Default: false)
-         * @param bool $popup       Render the promotion in a popup box (Default: false)
+         * @param bool $echo Echo or return the HTML code. (Default: false)
+         * @param bool $popup Render the promotion in a popup box (Default: false)
          *
          * @return string HTML code on success, otherwise empty string.
@@ -151 +206 @@
             }
 
-            $data = GAOO_Utils::get_array_columns( $data[ 'promo' ], array( 'link', 'link_text' ) );
-            $data = array_filter( $data, function ( $arr ) {
-                return array_key_exists( 'link_text', $arr );
+            $data = array_filter( $data['promo'], function ( $arr ) {
+                if ( ! empty( $arr[ 'hide_if_active' ] ) && is_array( $arr[ 'hide_if_active' ] ) && GAOO_Promo::should_hide( $arr[ 'hide_if_active' ] ) ) {
+
+                    return false;
+                }
+
+                return isset( $arr[ 'link_text' ] );
             } );
 
+            $data = GAOO_Utils::get_array_columns( $data, array(
+                'link',
+                'link_text'
+            ) );
+
             return empty( $data ) ? null : $data;
         }
+
     }

opt-out-for-google-analytics/trunk/inc/public.class.php

@@ -5 +5 @@
 
     class GAOO_Public {
+
         private $csstidy;
 
@@ -11 +12 @@
          */
         public function __construct() {
-            add_action( 'wp_head', array( $this, 'head_script' ), -1 );
-            add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+            add_action( 'wp_head', array(
+                $this,
+                'head_script'
+            ), -1 );
 
-            add_shortcode( 'ga_optout', array( $this, 'shortcode' ) );
+            add_action( 'wp_enqueue_scripts', array(
+                $this,
+                'enqueue_scripts'
+            ) );
+
+            add_shortcode( 'ga_optout', array(
+                $this,
+                'shortcode'
+            ) );
 
             if ( has_filter( 'widget_text', 'do_shortcode' ) !== false ) {
@@ -84 +95 @@
 
             if ( ! empty( $form_data[ 'tracking_code' ] ) ) {
-                echo preg_replace( '/\s+/', ' ', stripslashes( $form_data['tracking_code'] ) );
+                echo preg_replace( '/\s+/', ' ', stripslashes( $form_data[ 'tracking_code' ] ) );
             }
 

opt-out-for-google-analytics/trunk/lib/csstidy/class.csstidy.php

@@ -1 +1 @@
 <?php
-    // If this file is called directly, abort.
-    defined( 'WPINC' ) || die;
-
-    /**
-     * CSSTidy - CSS Parser and Optimiser
-     *
-     * CSS Parser class
-     *
-     * Copyright 2005, 2006, 2007 Florian Schmitz
-     *
-     * This file is part of CSSTidy.
-     *
-     *   CSSTidy is free software; you can redistribute it and/or modify
-     *   it under the terms of the GNU Lesser General Public License as published by
-     *   the Free Software Foundation; either version 2.1 of the License, or
-     *   (at your option) any later version.
-     *
-     *   CSSTidy is distributed in the hope that it will be useful,
-     *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-     *   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/>.
-     *
-     * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
-     * @package csstidy
-     * @author  Florian Schmitz (floele at gmail dot com) 2005-2007
-     * @author  Brett Zamir (brettz9 at yahoo dot com) 2007
-     * @author  Nikolay Matsievsky (speed at webo dot name) 2009-2010
-     * @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 constants
-     * @todo //TODO: make them class constants of csstidy
-     */
-    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( 'IMPORTANT_COMMENT', 8 );
-    define( 'DEFAULT_AT', 41 );
-
-    /**
-     * Contains a class for printing CSS code
-     *
-     * @version 1.1.0
-     */
-    require( 'class.csstidy_print.php' );
-
-    /**
-     * Contains a class for optimising CSS code
-     *
-     * @version 1.0
-     */
-    require( 'class.csstidy_optimise.php' );
-
-    /**
-     * 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
-     * thus has full CSS2 support and a higher reliability.
-     * Additional to that it applies some optimisations and fixes to the CSS code.
-     * An online version should be available here: http://cdburnerxp.se/cssparse/css_optimiser.php
-     * @package csstidy
-     * @author  Florian Schmitz (floele at gmail dot com) 2005-2006
-     * @version 1.7.3
-     */
-    class csstidy {
-
-        /**
-         * Saves the parsed CSS. This array is empty if preserve_css is on.
-         * @var array
-         * @access public
-         */
-        public $css = array();
-        /**
-         * Saves the parsed CSS (raw)
-         * @var array
-         * @access private
-         */
-        public $tokens = array();
-        /**
-         * Printer class
-         * @see    csstidy_print
-         * @var object
-         * @access public
-         */
-        public $print;
-        /**
-         * Optimiser class
-         * @see    csstidy_optimise
-         * @var object
-         * @access private
-         */
-        public $optimise;
-        /**
-         * Saves the CSS charset (@charset)
-         * @var string
-         * @access private
-         */
-        public $charset = '';
-        /**
-         * Saves all @import URLs
-         * @var array
-         * @access private
-         */
-        public $import = array();
-        /**
-         * Saves the namespace
-         * @var string
-         * @access private
-         */
-        public $namespace = '';
-        /**
-         * Contains the version of csstidy
-         * @var string
-         * @access private
-         */
-        public $version = '1.7.3';
-        /**
-         * Stores the settings
-         * @var array
-         * @access private
-         */
-        public $settings = array();
-        /**
-         * Saves the parser-status.
-         *
-         * Possible values:
-         * - is = in selector
-         * - ip = in property
-         * - iv = in value
-         * - instr = in string (started at " or ' or ( )
-         * - ic = in comment (ignore everything)
-         * - at = in @-block
-         *
-         * @var string
-         * @access private
-         */
-        public $status = 'is';
-        /**
-         * Saves the current at rule (@media)
-         * @var string
-         * @access private
-         */
-        public $at = '';
-        /**
-         * Saves the at rule for next selector (during @font-face or other @)
-         * @var string
-         * @access private
-         */
-        public $next_selector_at = '';
-
-        /**
-         * Saves the current selector
-         * @var string
-         * @access private
-         */
-        public $selector = '';
-        /**
-         * Saves the current property
-         * @var string
-         * @access private
-         */
-        public $property = '';
-        /**
-         * Saves the position of , in selectors
-         * @var array
-         * @access private
-         */
-        public $sel_separate = array();
-        /**
-         * Saves the current value
-         * @var string
-         * @access private
-         */
-        public $value = '';
-        /**
-         * Saves the current sub-value
-         *
-         * Example for a subvalue:
-         * background:url(foo.png) red no-repeat;
-         * "url(foo.png)", "red", and  "no-repeat" are subvalues,
-         * seperated by whitespace
-         * @var string
-         * @access private
-         */
-        public $sub_value = '';
-        /**
-         * Array which saves all subvalues for a property.
-         * @var array
-         * @see    sub_value
-         * @access private
-         */
-        public $sub_value_arr = array();
-        /**
-         * Saves the stack of characters that opened the current strings
-         * @var array
-         * @access private
-         */
-        public $str_char = array();
-        public $cur_string = array();
-        /**
-         * Status from which the parser switched to ic or instr
-         * @var array
-         * @access private
-         */
-        public $from = array();
-        /**
-         * /**
-         * =true if in invalid at-rule
-         * @var bool
-         * @access private
-         */
-        public $invalid_at = false;
-        /**
-         * =true if something has been added to the current selector
-         * @var bool
-         * @access private
-         */
-        public $added = false;
-        /**
-         * Array which saves the message log
-         * @var array
-         * @access private
-         */
-        public $log = array();
-        /**
-         * Saves the line number
-         * @var integer
-         * @access private
-         */
-        public $line = 1;
-        /**
-         * Marks if we need to leave quotes for a string
-         * @var array
-         * @access private
-         */
-        public $quoted_string = array();
-
-        /**
-         * List of tokens
-         * @var string
-         */
-        public $tokens_list = "";
-
-        /**
-         * Various CSS Data for CSSTidy
-         * @var array
-         */
-        public $data = array();
-
-        /**
-         * Loads standard template and sets default settings
-         * @access  private
-         * @version 1.3
-         */
-        public function __construct() {
-            $data = array();
-            include( 'data.inc.php' );
-            $this->data = $data;
-
-            $this->settings[ 'remove_bslash' ]        = true;
-            $this->settings[ 'compress_colors' ]      = true;
-            $this->settings[ 'compress_font-weight' ] = true;
-            $this->settings[ 'lowercase_s' ]          = false;
-            /*
+
+/**
+ * CSSTidy - CSS Parser and Optimiser
+ *
+ * CSS Parser class
+ *
+ * Copyright 2005, 2006, 2007 Florian Schmitz
+ *
+ * This file is part of CSSTidy.
+ *
+ *   CSSTidy is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Lesser General Public License as published by
+ *   the Free Software Foundation; either version 2.1 of the License, or
+ *   (at your option) any later version.
+ *
+ *   CSSTidy is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   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/>.
+ *
+ * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
+ * @package csstidy
+ * @author Florian Schmitz (floele at gmail dot com) 2005-2007
+ * @author Brett Zamir (brettz9 at yahoo dot com) 2007
+ * @author Nikolay Matsievsky (speed at webo dot name) 2009-2010
+ * @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 constants
+ * @todo //TODO: make them class constants of csstidy
+ */
+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('IMPORTANT_COMMENT',8);
+define('DEFAULT_AT',      41);
+
+/**
+ * Contains a class for printing CSS code
+ *
+ * @version 1.1.0
+ */
+require('class.csstidy_print.php');
+
+/**
+ * Contains a class for optimising CSS code
+ *
+ * @version 1.0
+ */
+require('class.csstidy_optimise.php');
+
+/**
+ * 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
+ * thus has full CSS2 support and a higher reliability.
+ * Additional to that it applies some optimisations and fixes to the CSS code.
+ * An online version should be available here: http://cdburnerxp.se/cssparse/css_optimiser.php
+ * @package csstidy
+ * @author Florian Schmitz (floele at gmail dot com) 2005-2006
+ * @version 2.0.0
+ */
+class csstidy {
+
+    /**
+     * Saves the parsed CSS. This array is empty if preserve_css is on.
+     * @var array
+     * @access public
+     */
+    public $css = array();
+    /**
+     * Saves the parsed CSS (raw)
+     * @var array
+     * @access private
+     */
+    public $tokens = array();
+    /**
+     * Printer class
+     * @see csstidy_print
+     * @var object
+     * @access public
+     */
+    public $print;
+    /**
+     * Optimiser class
+     * @see csstidy_optimise
+     * @var object
+     * @access private
+     */
+    public $optimise;
+    /**
+     * Saves the CSS charset (@charset)
+     * @var string
+     * @access private
+     */
+    public $charset = '';
+    /**
+     * Saves all @import URLs
+     * @var array
+     * @access private
+     */
+    public $import = array();
+    /**
+     * Saves the namespace
+     * @var string
+     * @access private
+     */
+    public $namespace = '';
+    /**
+     * Contains the version of csstidy
+     * @var string
+     * @access private
+     */
+    public $version = '1.7.3';
+    /**
+     * Stores the settings
+     * @var array
+     * @access private
+     */
+    public $settings = array();
+    /**
+     * Saves the parser-status.
+     *
+     * Possible values:
+     * - is = in selector
+     * - ip = in property
+     * - iv = in value
+     * - instr = in string (started at " or ' or ( )
+     * - ic = in comment (ignore everything)
+     * - at = in @-block
+     *
+     * @var string
+     * @access private
+     */
+    public $status = 'is';
+    /**
+     * Saves the current at rule (@media)
+     * @var string
+     * @access private
+     */
+    public $at = '';
+    /**
+     * Saves the at rule for next selector (during @font-face or other @)
+     * @var string
+     * @access private
+     */
+    public $next_selector_at = '';
+
+    /**
+     * Saves the current selector
+     * @var string
+     * @access private
+     */
+    public $selector = '';
+    /**
+     * Saves the current property
+     * @var string
+     * @access private
+     */
+    public $property = '';
+    /**
+     * Saves the position of , in selectors
+     * @var array
+     * @access private
+     */
+    public $sel_separate = array();
+    /**
+     * Saves the current value
+     * @var string
+     * @access private
+     */
+    public $value = '';
+    /**
+     * Saves the current sub-value
+     *
+     * Example for a subvalue:
+     * background:url(foo.png) red no-repeat;
+     * "url(foo.png)", "red", and  "no-repeat" are subvalues,
+     * seperated by whitespace
+     * @var string
+     * @access private
+     */
+    public $sub_value = '';
+    /**
+     * Array which saves all subvalues for a property.
+     * @var array
+     * @see sub_value
+     * @access private
+     */
+    public $sub_value_arr = array();
+    /**
+     * Saves the stack of characters that opened the current strings
+     * @var array
+     * @access private
+     */
+    public $str_char = array();
+    public $cur_string = array();
+    /**
+     * Status from which the parser switched to ic or instr
+     * @var array
+     * @access private
+     */
+    public $from = array();
+    /**
+    /**
+     * =true if in invalid at-rule
+     * @var bool
+     * @access private
+     */
+    public $invalid_at = false;
+    /**
+     * =true if something has been added to the current selector
+     * @var bool
+     * @access private
+     */
+    public $added = false;
+    /**
+     * Array which saves the message log
+     * @var array
+     * @access private
+     */
+    public $log = array();
+    /**
+     * Saves the line number
+     * @var integer
+     * @access private
+     */
+    public $line = 1;
+    /**
+     * Marks if we need to leave quotes for a string
+     * @var array
+     * @access private
+     */
+    public $quoted_string = array();
+
+    /**
+     * List of tokens
+     * @var string
+     */
+    public $tokens_list = "";
+
+    /**
+     * Various CSS Data for CSSTidy
+     * @var array
+     */
+    public $data = array();
+
+    /**
+     * Loads standard template and sets default settings
+     * @access private
+     * @version 1.3
+     */
+    public function __construct() {
+        $data = array();
+        include('data.inc.php');
+        $this->data = $data;
+
+        $this->settings['remove_bslash'] = true;
+        $this->settings['compress_colors'] = true;
+        $this->settings['compress_font-weight'] = true;
+        $this->settings['lowercase_s'] = false;
+        /*
             1 common shorthands optimization
             2 + font property optimization
             3 + background property optimization
          */
-            $this->settings[ 'optimise_shorthands' ]    = 1;
-            $this->settings[ 'remove_last_;' ]          = true;
-            $this->settings[ 'space_before_important' ] = false;
-            /* rewrite all properties with low case, better for later gzip OK, safe*/
-            $this->settings[ 'case_properties' ] = 1;
-            /* sort properties in alpabetic order, better for later gzip
+        $this->settings['optimise_shorthands'] = 1;
+        $this->settings['remove_last_;'] = true;
+        $this->settings['space_before_important'] = false;
+        /* rewrite all properties with low case, better for later gzip OK, safe*/
+        $this->settings['case_properties'] = 1;
+        /* sort properties in alpabetic order, better for later gzip
          * but can cause trouble in case of overiding same propertie or using hack
          */
-            $this->settings[ 'sort_properties' ] = false;
-            /*
+        $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
          */
-            $this->settings[ 'sort_selectors' ] = 0;
-            /* is dangeroues to be used: CSS is broken sometimes */
-            $this->settings[ 'merge_selectors' ] = 0;
-            /* preserve or not browser hacks */
-
-            /* Useful to produce a rtl css from a ltr one (or the opposite) */
-            $this->settings[ 'reverse_left_and_right' ] = 0;
-
-            $this->settings[ 'discard_invalid_selectors' ]  = false;
-            $this->settings[ 'discard_invalid_properties' ] = false;
-            $this->settings[ 'css_level' ]                  = 'CSS3.0';
-            $this->settings[ 'preserve_css' ]               = false;
-            $this->settings[ 'timestamp' ]                  = false;
-            $this->settings[ 'template' ]                   = ''; // say that propertie exist
-            $this->set_cfg( 'template', 'default' ); // call load_template
-            $this->optimise = new csstidy_optimise( $this );
-
-            $this->tokens_list = &$this->data[ 'csstidy' ][ 'tokens' ];
-        }
-
-        /**
-         * Get the value of a setting.
-         *
-         * @param string $setting
-         *
-         * @access  public
-         * @return mixed
-         * @version 1.0
-         */
-        public function get_cfg( $setting ) {
-            if ( isset( $this->settings[ $setting ] ) ) {
-                return $this->settings[ $setting ];
-            }
-            return false;
-        }
-
-        /**
-         * Load a template
-         *
-         * @param string $template used by set_cfg to load a template via a configuration setting
-         *
-         * @access  private
-         * @version 1.4
-         */
-        public function _load_template( $template ) {
-            switch ( $template ) {
-                case 'default':
-                    $this->load_template( 'default' );
-                    break;
-
-                case 'highest':
-                    $this->load_template( 'highest_compression' );
-                    break;
-
-                case 'high':
-                    $this->load_template( 'high_compression' );
-                    break;
-
-                case 'low':
-                    $this->load_template( 'low_compression' );
-                    break;
-
-                default:
-                    $this->load_template( $template );
-                    break;
-            }
-        }
-
-        /**
-         * Set the value of a setting.
-         *
-         * @param string $setting
-         * @param mixed  $value
-         *
-         * @access  public
-         * @return bool
-         * @version 1.0
-         */
-        public function set_cfg( $setting, $value = null ) {
-            if ( is_array( $setting ) && $value === null ) {
-                foreach ( $setting as $setprop => $setval ) {
-                    $this->settings[ $setprop ] = $setval;
-                }
-                if ( array_key_exists( 'template', $setting ) ) {
-                    $this->_load_template( $this->settings[ 'template' ] );
-                }
-                return true;
-            }
-            elseif ( isset( $this->settings[ $setting ] ) && $value !== '' ) {
-                $this->settings[ $setting ] = $value;
-                if ( $setting === 'template' ) {
-                    $this->_load_template( $this->settings[ 'template' ] );
-                }
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Adds a token to $this->tokens
-         *
-         * @param mixed  $type
-         * @param string $data
-         * @param bool   $do add a token even if preserve_css is off
-         *
-         * @access  private
-         * @version 1.0
-         */
-        public function _add_token( $type, $data, $do = false ) {
-            if ( $this->get_cfg( 'preserve_css' ) || $do ) {
-                // nested @... : if opening a new part we just closed, remove the previous closing instead of adding opening
-                if ( $type === AT_START
-                    and count( $this->tokens )
-                    and $last = end( $this->tokens )
-                    and $last[ 0 ] === AT_END
-                    and $last[ 1 ] === trim( $data ) ) {
-                    array_pop( $this->tokens );
-                }
-                else {
-                    $this->tokens[] = array( $type, ( $type == COMMENT or $type == IMPORTANT_COMMENT ) ? $data : trim( $data ) );
-                }
-            }
-        }
-
-        /**
-         * Add a message to the message log
-         *
-         * @param string  $message
-         * @param string  $type
-         * @param integer $line
-         *
-         * @access  private
-         * @version 1.0
-         */
-        public function log( $message, $type, $line = -1 ) {
-            if ( $line === -1 ) {
-                $line = $this->line;
-            }
-            $line = intval( $line );
-            $add  = array( 'm' => $message, 't' => $type );
-            if ( ! isset( $this->log[ $line ] ) || ! in_array( $add, $this->log[ $line ] ) ) {
-                $this->log[ $line ][] = $add;
-            }
-        }
-
-        /**
-         * Parse unicode notations and find a replacement character
-         *
-         * @param string  $string
-         * @param integer $i
-         *
-         * @access  private
-         * @return string
-         * @version 1.2
-         */
-        public function _unicode( &$string, &$i ) {
-            ++$i;
-            $add      = '';
-            $replaced = false;
-
-            while ( $i < strlen( $string ) && ( ctype_xdigit( $string[ $i ] ) || ctype_space( $string[ $i ] ) ) && strlen( $add ) < 6 ) {
-                $add .= $string[ $i ];
-
-                if ( ctype_space( $string[ $i ] ) ) {
-                    break;
-                }
-                $i++;
-            }
-
-            if ( hexdec( $add ) > 47 && hexdec( $add ) < 58 || hexdec( $add ) > 64 && hexdec( $add ) < 91 || hexdec( $add ) > 96 && hexdec( $add ) < 123 ) {
-                $this->log( 'Replaced unicode notation: Changed \\' . $add . ' to ' . chr( hexdec( $add ) ), 'Information' );
-                $add      = chr( hexdec( $add ) );
-                $replaced = true;
-            }
-            else {
-                $add = trim( '\\' . $add );
-            }
-
-            if ( @ctype_xdigit( $string[ $i + 1 ] ) && ctype_space( $string[ $i ] )
-                && ! $replaced || ! ctype_space( $string[ $i ] ) ) {
-                $i--;
-            }
-
-            if ( $add !== '\\' || ! $this->get_cfg( 'remove_bslash' ) || strpos( $this->tokens_list, $string[ $i + 1 ] ) !== false ) {
-                return $add;
-            }
-
-            if ( $add === '\\' ) {
-                $this->log( 'Removed unnecessary backslash', 'Information' );
-            }
-            return '';
-        }
-
-        /**
-         * Write formatted output to a file
-         *
-         * @param string $filename
-         * @param string $doctype     when printing formatted, is a shorthand for the document type
-         * @param bool   $externalcss when printing formatted, indicates whether styles to be attached internally or as an external stylesheet
-         * @param string $title       when printing formatted, is the title to be added in the head of the document
-         * @param string $lang        when printing formatted, gives a two-letter language code to be added to the output
-         *
-         * @access  public
-         * @version 1.4
-         */
-        public function write_page( $filename, $doctype = 'xhtml1.1', $externalcss = true, $title = '', $lang = 'en' ) {
-            $this->write( $filename, true );
-        }
-
-        /**
-         * Write plain output to a file
-         *
-         * @param string $filename
-         * @param bool   $formatted   whether to print formatted or not
-         * @param string $doctype     when printing formatted, is a shorthand for the document type
-         * @param bool   $externalcss when printing formatted, indicates whether styles to be attached internally or as an external stylesheet
-         * @param string $title       when printing formatted, is the title to be added in the head of the document
-         * @param string $lang        when printing formatted, gives a two-letter language code to be added to the output
-         * @param bool   $pre_code    whether to add pre and code tags around the code (for light HTML formatted templates)
-         *
-         * @access  public
-         * @version 1.4
-         */
-        public function write( $filename, $formatted = false, $doctype = 'xhtml1.1', $externalcss = true, $title = '', $lang = 'en', $pre_code = true ) {
-            $filename .= ( $formatted ) ? '.xhtml' : '.css';
-
-            if ( ! is_dir( 'temp' ) ) {
-                $madedir = mkdir( 'temp' );
-                if ( ! $madedir ) {
-                    print 'Could not make directory "temp" in ' . dirname( __FILE__ );
-                    exit;
-                }
-            }
-            $handle = fopen( 'temp/' . $filename, 'w' );
-            if ( $handle ) {
-                if ( ! $formatted ) {
-                    fwrite( $handle, $this->print->plain() );
-                }
-                else {
-                    fwrite( $handle, $this->print->formatted_page( $doctype, $externalcss, $title, $lang, $pre_code ) );
-                }
-            }
-            fclose( $handle );
-        }
-
-        /**
-         * Loads a new template
-         *
-         * @param string $content   either filename (if $from_file == true), content of a template file, "high_compression", "highest_compression", "low_compression", or "default"
-         * @param bool   $from_file uses $content as filename if true
-         *
-         * @access  public
-         * @version 1.1
-         * @see     http://csstidy.sourceforge.net/templates.php
-         */
-        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 ];
-                return;
-            }
-
-
-            if ( $from_file ) {
-                $content = strip_tags( file_get_contents( $content ), '<span>' );
-            }
-            $content  = str_replace( "\r\n", "\n", $content ); // Unify newlines (because the output also only uses \n)
-            $template = explode( '|', $content );
-
-            for ( $i = 0; $i < count( $template ); $i++ ) {
-                $this->template[ $i ] = $template[ $i ];
-            }
-        }
-
-        /**
-         * Starts parsing from URL
-         *
-         * @param string $url
-         *
-         * @access  public
-         * @version 1.0
-         */
-        public function parse_from_url( $url ) {
-            return $this->parse( @file_get_contents( $url ) );
-        }
-
-        /**
-         * Checks if there is a token at the current position
-         *
-         * @param string  $string
-         * @param integer $i
-         *
-         * @access  public
-         * @version 1.11
-         */
-        public function is_token( &$string, $i ) {
-            return ( strpos( $this->tokens_list, $string[ $i ] ) !== false && ! $this->escaped( $string, $i ) );
-        }
-
-        /**
-         * Parses CSS in $string. The code is saved as array in $this->css
-         *
-         * @param string $string the CSS code
-         *
-         * @access  public
-         * @return bool
-         * @version 1.1
-         */
-        public function parse( $string ) {
-            // Temporarily set locale to en_US in order to handle floats properly
-            $old = @setlocale( LC_ALL, 0 );
-            @setlocale( LC_ALL, 'C' );
-
-            // PHP bug? Settings need to be refreshed in PHP4
-            $this->print    = new csstidy_print( $this );
-            $this->optimise = new csstidy_optimise( $this );
-
-            $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();
-            $this->print->input_css = $string;
-            $string                 = str_replace( "\r\n", "\n", $string ) . ' ';
-            $cur_comment            = '';
-            $cur_at                 = '';
-
-            for ( $i = 0, $size = strlen( $string ); $i < $size; $i++ ) {
-                if ( $string[ $i ] === "\n" || $string[ $i ] === "\r" ) {
-                    ++$this->line;
-                }
-
-                switch ( $this->status ) {
-                    /* Case in at-block */
-                    case 'at':
-                        if ( $this->is_token( $string, $i ) ) {
-                            if ( $string[ $i ] === '/' && @$string[ $i + 1 ] === '*' ) {
-                                $this->status = 'ic';
-                                ++$i;
-                                $this->from[] = 'at';
-                            }
-                            elseif ( $string[ $i ] === '{' ) {
-                                $this->status = 'is';
-                                $this->at     = $this->css_new_media_section( $this->at, $cur_at );
-                                $this->_add_token( AT_START, $this->at );
-                            }
-                            elseif ( $string[ $i ] === ',' ) {
-                                $cur_at = trim( $cur_at ) . ',';
-                            }
-                            elseif ( $string[ $i ] === '\\' ) {
-                                $cur_at .= $this->_unicode( $string, $i );
-                            }
-                            // fix for complicated media, i.e @media screen and (-webkit-min-device-pixel-ratio:1.5)
-                            elseif ( in_array( $string[ $i ], array( '(', ')', ':', '.', '/' ) ) ) {
-                                $cur_at .= $string[ $i ];
-                            }
-                        }
-                        else {
-                            $lastpos = strlen( $cur_at ) - 1;
-                            if ( ! ( ( ctype_space( $cur_at[ $lastpos ] ) || $this->is_token( $cur_at, $lastpos ) && $cur_at[ $lastpos ] === ',' ) && ctype_space( $string[ $i ] ) ) ) {
-                                $cur_at .= $string[ $i ];
-                            }
-                        }
-                        break;
-
-                    /* Case in-selector */
-                    case 'is':
-                        if ( $this->is_token( $string, $i ) ) {
-                            if ( $string[ $i ] === '/' && @$string[ $i + 1 ] === '*' && trim( $this->selector ) == '' ) {
-                                $this->status = 'ic';
-                                ++$i;
-                                $this->from[] = 'is';
-                            }
-                            elseif ( $string[ $i ] === '@' && trim( $this->selector ) == '' ) {
-                                // Check for at-rule
-                                $this->invalid_at = true;
-                                foreach ( $at_rules as $name => $type ) {
-                                    if ( ! strcasecmp( substr( $string, $i + 1, strlen( $name ) ), $name ) ) {
-                                        ( $type === 'at' ) ? $cur_at = '@' . $name : $this->selector = '@' . $name;
-                                        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( $this->at, ' ', true );
-                                            $type                   = 'is';
-                                        }
-                                        $this->status     = $type;
-                                        $i                += strlen( $name );
-                                        $this->invalid_at = false;
-                                        break;
-                                    }
-                                }
-
-                                if ( $this->invalid_at ) {
-                                    $this->selector  = '@';
-                                    $invalid_at_name = '';
-                                    for ( $j = $i + 1; $j < $size; ++$j ) {
-                                        if ( ! ctype_alpha( $string[ $j ] ) ) {
-                                            break;
-                                        }
-                                        $invalid_at_name .= $string[ $j ];
-                                    }
-                                    $this->log( 'Invalid @-rule: ' . $invalid_at_name . ' (removed)', 'Warning' );
-                                }
-                            }
-                            elseif ( ( $string[ $i ] === '"' || $string[ $i ] === "'" ) ) {
-                                $this->cur_string[] = $string[ $i ];
-                                $this->status       = 'instr';
-                                $this->str_char[]   = $string[ $i ];
-                                $this->from[]       = 'is';
-                                /* fixing CSS3 attribute selectors, i.e. a[href$=".mp3" */
-                                $this->quoted_string[] = ( $string[ $i - 1 ] === '=' );
-                            }
-                            elseif ( $this->invalid_at && $string[ $i ] === ';' ) {
-                                $this->invalid_at = false;
-                                $this->status     = 'is';
-                                if ( $this->next_selector_at ) {
-                                    $this->at               = $this->css_close_media_section( $this->at );
-                                    $this->at               = $this->css_new_media_section( $this->at, $this->next_selector_at );
-                                    $this->next_selector_at = '';
-                                }
-                            }
-                            elseif ( $string[ $i ] === '{' ) {
-                                $this->status = 'ip';
-                                if ( $this->at == '' ) {
-                                    $this->at = $this->css_new_media_section( $this->at, DEFAULT_AT );
-                                }
-                                $this->selector = $this->css_new_selector( $this->at, $this->selector );
-                                $this->_add_token( SEL_START, $this->selector );
-                                $this->added = false;
-                            }
-                            elseif ( $string[ $i ] === '}' ) {
-                                $this->_add_token( AT_END, $this->at );
-                                $this->at           = $this->css_close_media_section( $this->at );
-                                $this->selector     = '';
-                                $this->sel_separate = array();
-                            }
-                            elseif ( $string[ $i ] === ',' ) {
-                                $this->selector       = trim( $this->selector ) . ',';
-                                $this->sel_separate[] = strlen( $this->selector );
-                            }
-                            elseif ( $string[ $i ] === '\\' ) {
-                                $this->selector .= $this->_unicode( $string, $i );
-                            }
-                            elseif ( $string[ $i ] === '*' && @in_array( $string[ $i + 1 ], array( '.', '#', '[', ':' ) ) && ( $i == 0 OR $string[ $i - 1 ] !== '/' ) ) {
-                                // remove unnecessary universal selector, FS#147, but not comment in selector
-                            }
-                            else {
-                                $this->selector .= $string[ $i ];
-                            }
-                        }
-                        else {
-                            $lastpos = strlen( $this->selector ) - 1;
-                            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 ];
-                            }
-                        }
-                        break;
-
-                    /* Case in-property */
-                    case 'ip':
-                        if ( $this->is_token( $string, $i ) ) {
-                            if ( ( $string[ $i ] === ':' || $string[ $i ] === '=' ) && $this->property != '' ) {
-                                $this->status = 'iv';
-                                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 );
-                                }
-                            }
-                            elseif ( $string[ $i ] === '/' && @$string[ $i + 1 ] === '*' && $this->property == '' ) {
-                                $this->status = 'ic';
-                                ++$i;
-                                $this->from[] = 'ip';
-                            }
-                            elseif ( $string[ $i ] === '}' ) {
-                                $this->explode_selectors();
-                                $this->status     = 'is';
-                                $this->invalid_at = false;
-                                $this->_add_token( SEL_END, $this->selector );
-                                $this->selector = '';
-                                $this->property = '';
-                                if ( $this->next_selector_at ) {
-                                    $this->at               = $this->css_close_media_section( $this->at );
-                                    $this->at               = $this->css_new_media_section( $this->at, $this->next_selector_at );
-                                    $this->next_selector_at = '';
-                                }
-                            }
-                            elseif ( $string[ $i ] === ';' ) {
-                                $this->property = '';
-                            }
-                            elseif ( $string[ $i ] === '\\' ) {
-                                $this->property .= $this->_unicode( $string, $i );
-                            }
-                            // else this is dumb IE a hack, keep it
-                            // including //
-                            elseif ( ( $this->property === '' && ! ctype_space( $string[ $i ] ) )
-                                || ( $this->property === '/' || $string[ $i ] === '/' ) ) {
-                                $this->property .= $string[ $i ];
-                            }
-                        }
-                        elseif ( ! ctype_space( $string[ $i ] ) ) {
-                            $this->property .= $string[ $i ];
-                        }
-                        break;
-
-                    /* Case in-value */
-                    case 'iv':
-                        $pn = ( ( $string[ $i ] === "\n" || $string[ $i ] === "\r" ) && $this->property_is_next( $string, $i + 1 ) || $i == strlen( $string ) - 1 );
-                        if ( $this->is_token( $string, $i ) || $pn ) {
-                            if ( $string[ $i ] === '/' && @$string[ $i + 1 ] === '*' ) {
-                                $this->status = 'ic';
-                                ++$i;
-                                $this->from[] = 'iv';
-                            }
-                            elseif ( ( $string[ $i ] === '"' || $string[ $i ] === "'" || $string[ $i ] === '(' ) ) {
-                                $this->cur_string[]    = $string[ $i ];
-                                $this->str_char[]      = ( $string[ $i ] === '(' ) ? ')' : $string[ $i ];
-                                $this->status          = 'instr';
-                                $this->from[]          = 'iv';
-                                $this->quoted_string[] = in_array( strtolower( $this->property ), $quoted_string_properties );
-                            }
-                            elseif ( $string[ $i ] === ',' ) {
-                                $this->sub_value = trim( $this->sub_value ) . ',';
-                            }
-                            elseif ( $string[ $i ] === '\\' ) {
-                                $this->sub_value .= $this->_unicode( $string, $i );
-                            }
-                            elseif ( $string[ $i ] === ';' || $pn ) {
-                                if ( $this->selector[ 0 ] === '@' && isset( $at_rules[ substr( $this->selector, 1 ) ] ) && $at_rules[ substr( $this->selector, 1 ) ] === 'iv' ) {
-                                    /* Add quotes to charset, import, namespace */
-                                    $this->sub_value_arr[] = trim( $this->sub_value );
-
-                                    $this->status = 'is';
-
-                                    switch ( $this->selector ) {
-                                        case '@charset':
-                                            $this->charset = '"' . $this->sub_value_arr[ 0 ] . '"';
-                                            break;
-                                        case '@namespace':
-                                            $this->namespace = implode( ' ', $this->sub_value_arr );
-                                            break;
-                                        case '@import':
-                                            $this->import[] = implode( ' ', $this->sub_value_arr );
-                                            break;
-                                    }
-
-                                    $this->sub_value_arr = array();
-                                    $this->sub_value     = '';
-                                    $this->selector      = '';
-                                    $this->sel_separate  = array();
-                                }
-                                else {
-                                    $this->status = 'ip';
-                                }
-                            }
-                            elseif ( $string[ $i ] !== '}' ) {
-                                $this->sub_value .= $string[ $i ];
-                            }
-                            if ( ( $string[ $i ] === '}' || $string[ $i ] === ';' || $pn ) && ! empty( $this->selector ) ) {
-                                if ( $this->at == '' ) {
-                                    $this->at = $this->css_new_media_section( $this->at, DEFAULT_AT );
-                                }
-
-                                // case settings
-                                if ( $this->get_cfg( 'lowercase_s' ) ) {
-                                    $this->selector = strtolower( $this->selector );
-                                }
-                                $this->property = strtolower( $this->property );
-
-                                $this->optimise->subvalue();
-                                if ( $this->sub_value != '' ) {
-                                    $this->sub_value_arr[] = $this->sub_value;
-                                    $this->sub_value       = '';
-                                }
-
-                                $this->value = '';
-                                while ( count( $this->sub_value_arr ) ) {
-                                    $sub = array_shift( $this->sub_value_arr );
-                                    if ( strstr( $this->selector, 'font-face' ) ) {
-                                        $sub = $this->quote_font_format( $sub );
-                                    }
-
-                                    if ( $sub != '' ) {
-                                        $this->value .= ( ( ! strlen( $this->value ) || substr( $this->value, -1, 1 ) === ',' ) ? '' : ' ' ) . $sub;
-                                    }
-                                }
-
-                                $this->optimise->value();
-
-                                $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 );
-                                    $this->_add_token( VALUE, $this->value );
-                                    $this->optimise->shorthands();
-                                }
-                                if ( ! $valid ) {
-                                    if ( $this->get_cfg( 'discard_invalid_properties' ) ) {
-                                        $this->log( 'Removed invalid property: ' . $this->property, 'Warning' );
-                                    }
-                                    else {
-                                        $this->log( 'Invalid property in ' . strtoupper( $this->get_cfg( 'css_level' ) ) . ': ' . $this->property, 'Warning' );
-                                    }
-                                }
-
-                                $this->property      = '';
-                                $this->sub_value_arr = array();
-                                $this->value         = '';
-                            }
-                            if ( $string[ $i ] === '}' ) {
-                                $this->explode_selectors();
-                                $this->_add_token( SEL_END, $this->selector );
-                                $this->status     = 'is';
-                                $this->invalid_at = false;
-                                $this->selector   = '';
-                                if ( $this->next_selector_at ) {
-                                    $this->at               = $this->css_close_media_section( $this->at );
-                                    $this->at               = $this->css_new_media_section( $this->at, $this->next_selector_at );
-                                    $this->next_selector_at = '';
-                                }
-                            }
-                        }
-                        elseif ( ! $pn ) {
-                            $this->sub_value .= $string[ $i ];
-
-                            if ( ctype_space( $string[ $i ] ) ) {
-                                $this->optimise->subvalue();
-                                if ( $this->sub_value != '' ) {
-                                    $this->sub_value_arr[] = $this->sub_value;
-                                    $this->sub_value       = '';
-                                }
-                            }
-                        }
-                        break;
-
-                    /* Case in string */
-                    case 'instr':
-                        $_str_char      = $this->str_char[ count( $this->str_char ) - 1 ];
-                        $_cur_string    = $this->cur_string[ count( $this->cur_string ) - 1 ];
-                        $_quoted_string = $this->quoted_string[ count( $this->quoted_string ) - 1 ];
-                        $temp_add       = $string[ $i ];
-
-                        // 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 ] === '\'' ) && ! $this->escaped( $string, $i ) ) {
-                            $this->cur_string[]    = $string[ $i ];
-                            $this->str_char[]      = $string[ $i ] === '(' ? ')' : $string[ $i ];
-                            $this->from[]          = 'instr';
-                            $this->quoted_string[] = ( $_str_char === ')' && $string[ $i ] !== '(' && trim( $_cur_string ) === '(' ) ? $_quoted_string : ! ( $string[ $i ] === '(' );
-                            continue 2;
-                        }
-
-                        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' );
-                        }
-
-                        $_cur_string .= $temp_add;
-
-                        if ( $string[ $i ] === $_str_char && ! $this->escaped( $string, $i ) ) {
-                            $this->status = array_pop( $this->from );
-
-                            if ( ! preg_match( '|[' . implode( '', $this->data[ 'csstidy' ][ 'whitespace' ] ) . ']|uis', $_cur_string ) && $this->property !== 'content' ) {
-                                if ( ! $_quoted_string ) {
-                                    if ( $_str_char !== ')' ) {
-                                        // Convert properties like
-                                        // font-family: 'Arial';
-                                        // to
-                                        // font-family: Arial;
-                                        // or
-                                        // url("abc")
-                                        // to
-                                        // url(abc)
-                                        $_cur_string = substr( $_cur_string, 1, -1 );
-                                    }
-                                }
-                                else {
-                                    $_quoted_string = false;
-                                }
-                            }
-
-                            array_pop( $this->cur_string );
-                            array_pop( $this->quoted_string );
-                            array_pop( $this->str_char );
-
-                            if ( $_str_char === ')' ) {
-                                $_cur_string = '(' . trim( substr( $_cur_string, 1, -1 ) ) . ')';
-                            }
-
-                            if ( $this->status === 'iv' ) {
-                                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 ) ) );
-                                    }
-                                    // and multiple spaces (too expensive)
-                                    if ( strpos( $_cur_string, '  ' ) !== false ) {
-                                        $_cur_string = preg_replace( ",\s+,", ' ', $_cur_string );
-                                    }
-                                }
-                                $this->sub_value .= $_cur_string;
-                            }
-                            elseif ( $this->status === 'is' ) {
-                                $this->selector .= $_cur_string;
-                            }
-                            elseif ( $this->status === 'instr' ) {
-                                $this->cur_string[ count( $this->cur_string ) - 1 ] .= $_cur_string;
-                            }
-                        }
-                        else {
-                            $this->cur_string[ count( $this->cur_string ) - 1 ] = $_cur_string;
-                        }
-                        break;
-
-                    /* Case in-comment */
-                    case 'ic':
-                        if ( $string[ $i ] === '*' && $string[ $i + 1 ] === '/' ) {
-                            $this->status = array_pop( $this->from );
-                            $i++;
-                            if ( strlen( $cur_comment ) > 1 and strncmp( $cur_comment, '!', 1 ) === 0 ) {
-                                $this->_add_token( IMPORTANT_COMMENT, $cur_comment );
-                                $this->css_add_important_comment( $cur_comment );
-                            }
-                            else {
-                                $this->_add_token( COMMENT, $cur_comment );
-                            }
-                            $cur_comment = '';
-                        }
-                        else {
-                            $cur_comment .= $string[ $i ];
-                        }
-                        break;
-                }
-            }
-
-            $this->optimise->postparse();
-
-            $this->print->_reset();
-
-            @setlocale( LC_ALL, $old ); // Set locale back to original setting
-
-            return ! ( empty( $this->css ) && empty( $this->import ) && empty( $this->charset ) && empty( $this->tokens ) && empty( $this->namespace ) );
-        }
-
-
-        /**
-         * format() in font-face needs quoted values for somes browser (FF at least)
-         *
-         * @param $value
-         *
-         * @return string
-         */
-        public function quote_font_format( $value ) {
-            if ( strncmp( $value, 'format', 6 ) == 0 ) {
-                $p              = strpos( $value, ')', 7 );
-                $end            = substr( $value, $p );
-                $format_strings = $this->parse_string_list( substr( $value, 7, $p - 7 ) );
-                if ( ! $format_strings ) {
-                    $value = '';
-                }
-                else {
-                    $value = 'format(';
-
-                    foreach ( $format_strings as $format_string ) {
-                        $value .= '"' . str_replace( '"', '\\"', $format_string ) . '",';
-                    }
-
-                    $value = substr( $value, 0, -1 ) . $end;
-                }
-            }
-            return $value;
-        }
-
-        /**
-         * Explodes selectors
-         * @access  private
-         * @version 1.0
-         */
-        public function explode_selectors() {
-            // Explode multiple selectors
-            if ( $this->get_cfg( 'merge_selectors' ) === 1 ) {
-                $new_sels             = array();
-                $lastpos              = 0;
-                $this->sel_separate[] = strlen( $this->selector );
-                foreach ( $this->sel_separate as $num => $pos ) {
-                    if ( $num == count( $this->sel_separate ) - 1 ) {
-                        $pos += 1;
-                    }
-
-                    $new_sels[] = substr( $this->selector, $lastpos, $pos - $lastpos - 1 );
-                    $lastpos    = $pos;
-                }
-
-                if ( count( $new_sels ) > 1 ) {
-                    foreach ( $new_sels as $selector ) {
-                        if ( isset( $this->css[ $this->at ][ $this->selector ] ) ) {
-                            $this->merge_css_blocks( $this->at, $selector, $this->css[ $this->at ][ $this->selector ] );
-                        }
-                    }
-                    unset( $this->css[ $this->at ][ $this->selector ] );
-                }
-            }
-            $this->sel_separate = array();
-        }
-
-        /**
-         * Checks if a character is escaped (and returns true if it is)
-         *
-         * @param string  $string
-         * @param integer $pos
-         *
-         * @access  public
-         * @return bool
-         * @version 1.02
-         */
-        static function escaped( &$string, $pos ) {
-            return ! ( @( $string[ $pos - 1 ] !== '\\' ) || csstidy::escaped( $string, $pos - 1 ) );
-        }
-
-
-        /**
-         * Add an important comment to the css code
-         * (one we want to keep)
-         *
-         * @param $comment
-         */
-        public function css_add_important_comment( $comment ) {
-            if ( $this->get_cfg( 'preserve_css' ) || trim( $comment ) == '' ) {
-                return;
-            }
-            if ( ! isset( $this->css[ '!' ] ) ) {
-                $this->css[ '!' ] = '';
-            }
-            else {
-                $this->css[ '!' ] .= "\n";
-            }
-            $this->css[ '!' ] .= $comment;
-        }
-
-        /**
-         * Adds a property with value to the existing CSS code
-         *
-         * @param string $media
-         * @param string $selector
-         * @param string $property
-         * @param string $new_val
-         *
-         * @access  private
-         * @version 1.2
-         */
-        public function css_add_property( $media, $selector, $property, $new_val ) {
-            if ( $this->get_cfg( 'preserve_css' ) || trim( $new_val ) == '' ) {
-                return;
-            }
-
-            $this->added = true;
-            if ( isset( $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 );
-                }
-            }
-            else {
-                $this->css[ $media ][ $selector ][ $property ] = trim( $new_val );
-            }
-        }
-
-        /**
-         * Check if a current media section is the continuation of the last one
-         * if not inc the name of the media section to avoid a merging
-         *
-         * @param int|string $media
-         *
-         * @return int|string
-         */
-        public function css_check_last_media_section_or_inc( $media ) {
-            // are we starting?
-            if ( ! $this->css || ! is_array( $this->css ) || empty( $this->css ) ) {
-                return $media;
-            }
-
-            // if the last @media is the same as this
-            // keep it
-            end( $this->css );
-            $at = key( $this->css );
-            if ( $at == $media ) {
-                return $media;
-            }
-
-            // else inc the section in the array
-            while ( isset( $this->css[ $media ] ) )
-                if ( is_numeric( $media ) ) {
-                    $media++;
-                }
-                else {
-                    $media .= ' ';
-                }
-            return $media;
-        }
-
-        /**
-         * Start a new media section.
-         * Check if the media is not already known,
-         * else rename it with extra spaces
-         * to avoid merging
-         *
-         * @param string $current_media
-         * @param string $media
-         * @param bool   $at_root
-         *
-         * @return string
-         */
-        public function css_new_media_section( $current_media, $new_media, $at_root = false ) {
-            if ( $this->get_cfg( 'preserve_css' ) ) {
-                return $new_media;
-            }
-
-            // if we already are in a media and CSS level is 3, manage nested medias
-            if ( $current_media
-                && ! $at_root
-                // numeric $current_media means DEFAULT_AT or inc
-                && ! is_numeric( $current_media )
-                && strncmp( $this->get_cfg( 'css_level' ), 'CSS3', 4 ) == 0 ) {
-
-                $new_media = rtrim( $current_media ) . "{" . rtrim( $new_media );
-            }
-
-            return $this->css_check_last_media_section_or_inc( $new_media );
-        }
-
-        /**
-         * Close a media section
-         * Find the parent media we were in before or the root
-         *
-         * @param $current_media
-         *
-         * @return string
-         */
-        public function css_close_media_section( $current_media ) {
-            if ( $this->get_cfg( 'preserve_css' ) ) {
-                return '';
-            }
-
-            if ( strpos( $current_media, '{' ) !== false ) {
-                $current_media = explode( '{', $current_media );
-                array_pop( $current_media );
-                $current_media = implode( '{', $current_media );
-                return $current_media;
-            }
-
-            return '';
-        }
-
-        /**
-         * Start a new selector.
-         * If already referenced in this media section,
-         * rename it with extra space to avoid merging
-         * except if merging is required,
-         * or last selector is the same (merge siblings)
-         *
-         * never merge @font-face
-         *
-         * @param string $media
-         * @param string $selector
-         *
-         * @return string
-         */
-        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 ( $this->settings[ 'merge_selectors' ] != false ) {
-                    return $selector;
-                }
-
-                if ( ! $this->css || ! isset( $this->css[ $media ] ) || ! $this->css[ $media ] ) {
-                    return $selector;
-                }
-
-                // if last is the same, keep it
-                end( $this->css[ $media ] );
-                $sel = key( $this->css[ $media ] );
-                if ( $sel == $selector ) {
-                    return $selector;
-                }
-            }
-
-            while ( isset( $this->css[ $media ][ $selector ] ) )
-                $selector .= ' ';
-            return $selector;
-        }
-
-        /**
-         * Start a new propertie.
-         * If already references in this selector,
-         * rename it with extra space to avoid override
-         *
-         * @param string $media
-         * @param string $selector
-         * @param string $property
-         *
-         * @return string
-         */
-        public function css_new_property( $media, $selector, $property ) {
-            if ( $this->get_cfg( 'preserve_css' ) ) {
-                return $property;
-            }
-            if ( ! $this->css || ! isset( $this->css[ $media ][ $selector ] ) || ! $this->css[ $media ][ $selector ] ) {
-                return $property;
-            }
-
-            while ( isset( $this->css[ $media ][ $selector ][ $property ] ) )
-                $property .= ' ';
-
-            return $property;
-        }
-
-        /**
-         * Adds CSS to an existing media/selector
-         *
-         * @param string $media
-         * @param string $selector
-         * @param array  $css_add
-         *
-         * @access  private
-         * @version 1.1
-         */
-        public function merge_css_blocks( $media, $selector, $css_add ) {
-            foreach ( $css_add as $property => $value ) {
-                $this->css_add_property( $media, $selector, $property, $value, false );
-            }
-        }
-
-        /**
-         * Checks if $value is !important.
-         *
-         * @param string $value
-         *
-         * @return bool
-         * @access  public
-         * @version 1.0
-         */
-        public function is_important( &$value ) {
-            return (
-                strpos( $value, '!' ) !== false // quick test
-                AND ! strcasecmp( substr( str_replace( $this->data[ 'csstidy' ][ 'whitespace' ], '', $value ), -10, 10 ), '!important' ) );
-        }
-
-        /**
-         * Returns a value without !important
-         *
-         * @param string $value
-         *
-         * @return string
-         * @access  public
-         * @version 1.0
-         */
-        public function gvw_important( $value ) {
-            if ( $this->is_important( $value ) ) {
-                $value = trim( $value );
-                $value = substr( $value, 0, -9 );
-                $value = trim( $value );
-                $value = substr( $value, 0, -1 );
-                $value = trim( $value );
-                return $value;
-            }
-            return $value;
-        }
-
-        /**
-         * Checks if the next word in a string from pos is a CSS property
-         *
-         * @param string  $istring
-         * @param integer $pos
-         *
-         * @return bool
-         * @access  private
-         * @version 1.2
-         */
-        public function property_is_next( $istring, $pos ) {
-            $all_properties = &$this->data[ 'csstidy' ][ 'all_properties' ];
-            $istring        = substr( $istring, $pos, strlen( $istring ) - $pos );
-            $pos            = strpos( $istring, ':' );
-            if ( $pos === false ) {
-                return false;
-            }
-            $istring = strtolower( trim( substr( $istring, 0, $pos ) ) );
-            if ( isset( $all_properties[ $istring ] ) ) {
-                $this->log( 'Added semicolon to the end of declaration', 'Warning' );
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Checks if a property is valid
-         *
-         * @param string $property
-         *
-         * @return bool
-         * @access  public
-         * @version 1.0
-         */
-        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 );
-        }
-
-        /**
-         * Accepts a list of strings (e.g., the argument to format() in a @font-face src property)
-         * and returns a list of the strings.  Converts things like:
-         *
-         * format(abc) => format("abc")
-         * format(abc def) => format("abc","def")
-         * format(abc "def") => format("abc","def")
-         * format(abc, def, ghi) => format("abc","def","ghi")
-         * format("abc",'def') => format("abc","def")
-         * format("abc, def, ghi") => format("abc, def, ghi")
-         *
-         * @param string
-         *
-         * @return array
-         */
-        public function parse_string_list( $value ) {
-            $value = trim( $value );
-
-            // Case: empty
-            if ( ! $value ) {
-                return array();
-            }
-
-            $strings = array();
-
-            $in_str         = false;
-            $current_string = '';
-
-            for ( $i = 0, $_len = strlen( $value ); $i < $_len; $i++ ) {
-                if ( ( $value[ $i ] === ',' || $value[ $i ] === ' ' ) && $in_str === true ) {
-                    $in_str         = false;
-                    $strings[]      = $current_string;
-                    $current_string = '';
-                }
-                elseif ( $value[ $i ] === '"' || $value[ $i ] === "'" ) {
-                    if ( $in_str === $value[ $i ] ) {
-                        $strings[]      = $current_string;
-                        $in_str         = false;
-                        $current_string = '';
-                        continue;
-                    }
-                    elseif ( ! $in_str ) {
-                        $in_str = $value[ $i ];
-                    }
-                }
-                else {
-                    if ( $in_str ) {
-                        $current_string .= $value[ $i ];
-                    }
-                    else {
-                        if ( ! preg_match( "/[\s,]/", $value[ $i ] ) ) {
-                            $in_str         = true;
-                            $current_string = $value[ $i ];
-                        }
-                    }
-                }
-            }
-
-            if ( $current_string ) {
-                $strings[] = $current_string;
-            }
-
-            return $strings;
-        }
-    }
+        $this->settings['sort_selectors'] = 0;
+        /* is dangeroues to be used: CSS is broken sometimes */
+        $this->settings['merge_selectors'] = 0;
+        /* preserve or not browser hacks */
+
+        /* Useful to produce a rtl css from a ltr one (or the opposite) */
+        $this->settings['reverse_left_and_right'] = 0;
+
+        $this->settings['discard_invalid_selectors'] = false;
+        $this->settings['discard_invalid_properties'] = false;
+        $this->settings['css_level'] = 'CSS3.0';
+        $this->settings['preserve_css'] = false;
+        $this->settings['timestamp'] = false;
+        $this->settings['template'] = ''; // say that propertie exist
+        $this->set_cfg('template','default'); // call load_template
+        $this->optimise = new csstidy_optimise($this);
+
+        $this->tokens_list = & $this->data['csstidy']['tokens'];
+    }
+
+    /**
+     * Get the value of a setting.
+     * @param string $setting
+     * @access public
+     * @return mixed
+     * @version 1.0
+     */
+    public function get_cfg($setting) {
+        if (isset($this->settings[$setting])) {
+            return $this->settings[$setting];
+        }
+        return false;
+    }
+
+    /**
+     * Load a template
+     * @param string $template used by set_cfg to load a template via a configuration setting
+     * @access private
+     * @version 1.4
+     */
+    public function _load_template($template) {
+        switch ($template) {
+            case 'default':
+                $this->load_template('default');
+                break;
+
+            case 'highest':
+                $this->load_template('highest_compression');
+                break;
+
+            case 'high':
+                $this->load_template('high_compression');
+                break;
+
+            case 'low':
+                $this->load_template('low_compression');
+                break;
+
+            default:
+                $this->load_template($template);
+                break;
+        }
+    }
+
+    /**
+     * Set the value of a setting.
+     * @param string $setting
+     * @param mixed $value
+     * @access public
+     * @return bool
+     * @version 1.0
+     */
+    public function set_cfg($setting, $value=null) {
+        if (is_array($setting) && $value === null) {
+            foreach ($setting as $setprop => $setval) {
+                $this->settings[$setprop] = $setval;
+            }
+            if (array_key_exists('template', $setting)) {
+                $this->_load_template($this->settings['template']);
+            }
+            return true;
+        } elseif (isset($this->settings[$setting]) && $value !== '') {
+            $this->settings[$setting] = $value;
+            if ($setting === 'template') {
+                $this->_load_template($this->settings['template']);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Adds a token to $this->tokens
+     * @param mixed $type
+     * @param string $data
+     * @param bool $do add a token even if preserve_css is off
+     * @access private
+     * @version 1.0
+     */
+    public function _add_token($type, $data, $do = false) {
+        if ($this->get_cfg('preserve_css') || $do) {
+            // nested @... : if opening a new part we just closed, remove the previous closing instead of adding opening
+            if ($type === AT_START
+                and count($this->tokens)
+                and $last = end($this->tokens)
+                and $last[0] === AT_END
+                and $last[1] === trim($data)) {
+                array_pop($this->tokens);
+            }
+            else {
+                $this->tokens[] = array($type, ($type == COMMENT or $type == IMPORTANT_COMMENT) ? $data : trim($data));
+            }
+        }
+    }
+
+    /**
+     * Add a message to the message log
+     * @param string $message
+     * @param string $type
+     * @param integer $line
+     * @access private
+     * @version 1.0
+     */
+    public function log($message, $type, $line = -1) {
+        if ($line === -1) {
+            $line = $this->line;
+        }
+        $line = intval($line);
+        $add = array('m' => $message, 't' => $type);
+        if (!isset($this->log[$line]) || !in_array($add, $this->log[$line])) {
+            $this->log[$line][] = $add;
+        }
+    }
+
+    /**
+     * Parse unicode notations and find a replacement character
+     * @param string $string
+     * @param integer $i
+     * @access private
+     * @return string
+     * @version 1.2
+     */
+    public function _unicode(&$string, &$i) {
+        ++$i;
+        $add = '';
+        $replaced = false;
+
+        while ($i < strlen($string) && (ctype_xdigit($string[$i]) || ctype_space($string[$i])) && strlen($add) < 6) {
+            $add .= $string[$i];
+
+            if (ctype_space($string[$i])) {
+                break;
+            }
+            $i++;
+        }
+
+        if (hexdec($add) > 47 && hexdec($add) < 58 || hexdec($add) > 64 && hexdec($add) < 91 || hexdec($add) > 96 && hexdec($add) < 123) {
+            $this->log('Replaced unicode notation: Changed \\' . $add . ' to ' . chr(hexdec($add)), 'Information');
+            $add = chr(hexdec($add));
+            $replaced = true;
+        } else {
+            $add = trim('\\' . $add);
+        }
+
+        if (@ctype_xdigit($string[$i + 1]) && ctype_space($string[$i])
+                        && !$replaced || !ctype_space($string[$i])) {
+            $i--;
+        }
+
+        if ($add !== '\\' || !$this->get_cfg('remove_bslash') || strpos($this->tokens_list, $string[$i + 1]) !== false) {
+            return $add;
+        }
+
+        if ($add === '\\') {
+            $this->log('Removed unnecessary backslash', 'Information');
+        }
+        return '';
+    }
+
+    /**
+     * Write formatted output to a file
+     * @param string $filename
+     * @param string $doctype when printing formatted, is a shorthand for the document type
+     * @param bool $externalcss when printing formatted, indicates whether styles to be attached internally or as an external stylesheet
+     * @param string $title when printing formatted, is the title to be added in the head of the document
+     * @param string $lang when printing formatted, gives a two-letter language code to be added to the output
+     * @access public
+     * @version 1.4
+     */
+    public function write_page($filename, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
+        $this->write($filename, true);
+    }
+
+    /**
+     * Write plain output to a file
+     * @param string $filename
+     * @param bool $formatted whether to print formatted or not
+     * @param string $doctype when printing formatted, is a shorthand for the document type
+     * @param bool $externalcss when printing formatted, indicates whether styles to be attached internally or as an external stylesheet
+     * @param string $title when printing formatted, is the title to be added in the head of the document
+     * @param string $lang when printing formatted, gives a two-letter language code to be added to the output
+     * @param bool $pre_code whether to add pre and code tags around the code (for light HTML formatted templates)
+     * @access public
+     * @version 1.4
+     */
+    public function write($filename, $formatted=false, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en', $pre_code=true) {
+        $filename .= ( $formatted) ? '.xhtml' : '.css';
+
+        if (!is_dir('temp')) {
+            $madedir = mkdir('temp');
+            if (!$madedir) {
+                print 'Could not make directory "temp" in ' . dirname(__FILE__);
+                exit;
+            }
+        }
+        $handle = fopen('temp/' . $filename, 'w');
+        if ($handle) {
+            if (!$formatted) {
+                fwrite($handle, $this->print->plain());
+            } else {
+                fwrite($handle, $this->print->formatted_page($doctype, $externalcss, $title, $lang, $pre_code));
+            }
+        }
+        fclose($handle);
+    }
+
+    /**
+     * Loads a new template
+     * @param string $content either filename (if $from_file == true), content of a template file, "high_compression", "highest_compression", "low_compression", or "default"
+     * @param bool $from_file uses $content as filename if true
+     * @access public
+     * @version 1.1
+     * @see http://csstidy.sourceforge.net/templates.php
+     */
+    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];
+            return;
+        }
+
+
+        if ($from_file) {
+            $content = strip_tags(file_get_contents($content), '<span>');
+        }
+        $content = str_replace("\r\n", "\n", $content); // Unify newlines (because the output also only uses \n)
+        $template = explode('|', $content);
+
+        for ($i = 0; $i < count($template); $i++) {
+            $this->template[$i] = $template[$i];
+        }
+    }
+
+    /**
+     * Starts parsing from URL
+     * @param string $url
+     * @access public
+     * @version 1.0
+     */
+    public function parse_from_url($url) {
+        return $this->parse(@file_get_contents($url));
+    }
+
+    /**
+     * Checks if there is a token at the current position
+     * @param string $string
+     * @param integer $i
+     * @access public
+     * @version 1.11
+     */
+    public function is_token(&$string, $i) {
+        return (strpos($this->tokens_list, $string[$i]) !== false && !$this->escaped($string, $i));
+    }
+
+    /**
+     * Parses CSS in $string. The code is saved as array in $this->css
+     * @param string $string the CSS code
+     * @access public
+     * @return bool
+     * @version 1.1
+     */
+    public function parse($string) {
+        // Temporarily set locale to en_US in order to handle floats properly
+        $old = @setlocale(LC_ALL, 0);
+        @setlocale(LC_ALL, 'C');
+
+        // PHP bug? Settings need to be refreshed in PHP4
+        $this->print = new csstidy_print($this);
+        $this->optimise = new csstidy_optimise($this);
+
+        $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();
+        $this->print->input_css = $string;
+        $string = str_replace("\r\n", "\n", $string) . ' ';
+        $cur_comment = '';
+        $cur_at = '';
+
+        for ($i = 0, $size = strlen($string); $i < $size; $i++) {
+            if ($string[$i] === "\n" || $string[$i] === "\r") {
+                ++$this->line;
+            }
+
+            switch ($this->status) {
+                /* Case in at-block */
+                case 'at':
+                    if ($this->is_token($string, $i)) {
+                        if ($string[$i] === '/' && @$string[$i + 1] === '*') {
+                            $this->status = 'ic';
+                            ++$i;
+                            $this->from[] = 'at';
+                        } elseif ($string[$i] === '{') {
+                            $this->status = 'is';
+                            $this->at = $this->css_new_media_section($this->at, $cur_at);
+                            $this->_add_token(AT_START, $this->at);
+                        } elseif ($string[$i] === ',') {
+                            $cur_at = trim($cur_at) . ',';
+                        } elseif ($string[$i] === '\\') {
+                            $cur_at .= $this->_unicode($string, $i);
+                        }
+                        // fix for complicated media, i.e @media screen and (-webkit-min-device-pixel-ratio:1.5)
+                        elseif (in_array($string[$i], array('(', ')', ':', '.', '/'))) {
+                            $cur_at .= $string[$i];
+                        }
+                    } else {
+                        $lastpos = strlen($cur_at) - 1;
+                        if (!( (ctype_space($cur_at[$lastpos]) || $this->is_token($cur_at, $lastpos) && $cur_at[$lastpos] === ',') && ctype_space($string[$i]))) {
+                            $cur_at .= $string[$i];
+                        }
+                    }
+                    break;
+
+                /* Case in-selector */
+                case 'is':
+                    if ($this->is_token($string, $i)) {
+                        if ($string[$i] === '/' && @$string[$i + 1] === '*' && trim($this->selector) == '') {
+                            $this->status = 'ic';
+                            ++$i;
+                            $this->from[] = 'is';
+                        } elseif ($string[$i] === '@' && trim($this->selector) == '') {
+                            // Check for at-rule
+                            $this->invalid_at = true;
+                            foreach ($at_rules as $name => $type) {
+                                if (!strcasecmp(substr($string, $i + 1, strlen($name)), $name)) {
+                                    ($type === 'at') ? $cur_at = '@' . $name : $this->selector = '@' . $name;
+                                    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($this->at, ' ', true);
+                                        $type = 'is';
+                                    }
+                                    $this->status = $type;
+                                    $i += strlen($name);
+                                    $this->invalid_at = false;
+                                    break;
+                                }
+                            }
+
+                            if ($this->invalid_at) {
+                                $this->selector = '@';
+                                $invalid_at_name = '';
+                                for ($j = $i + 1; $j < $size; ++$j) {
+                                    if (!ctype_alpha($string[$j])) {
+                                        break;
+                                    }
+                                    $invalid_at_name .= $string[$j];
+                                }
+                                $this->log('Invalid @-rule: ' . $invalid_at_name . ' (removed)', 'Warning');
+                            }
+                        } elseif (($string[$i] === '"' || $string[$i] === "'")) {
+                            $this->cur_string[] = $string[$i];
+                            $this->status = 'instr';
+                            $this->str_char[] = $string[$i];
+                            $this->from[] = 'is';
+                            /* fixing CSS3 attribute selectors, i.e. a[href$=".mp3" */
+                            $this->quoted_string[] = ($string[$i - 1] === '=' );
+                        } elseif ($this->invalid_at && $string[$i] === ';') {
+                            $this->invalid_at = false;
+                            $this->status = 'is';
+                            if ($this->next_selector_at) {
+                                $this->at = $this->css_close_media_section($this->at);
+                                $this->at = $this->css_new_media_section($this->at, $this->next_selector_at);
+                                $this->next_selector_at = '';
+                            }
+                        } elseif ($string[$i] === '{') {
+                            $this->status = 'ip';
+                            if ($this->at == '') {
+                                $this->at = $this->css_new_media_section($this->at, DEFAULT_AT);
+                            }
+                            $this->selector = $this->css_new_selector($this->at,$this->selector);
+                            $this->_add_token(SEL_START, $this->selector);
+                            $this->added = false;
+                        } elseif ($string[$i] === '}') {
+                            $this->_add_token(AT_END, $this->at);
+                            $this->at = $this->css_close_media_section($this->at);
+                            $this->selector = '';
+                            $this->sel_separate = array();
+                        } elseif ($string[$i] === ',') {
+                            $this->selector = trim($this->selector) . ',';
+                            $this->sel_separate[] = strlen($this->selector);
+                        } elseif ($string[$i] === '\\') {
+                            $this->selector .= $this->_unicode($string, $i);
+                        } elseif ($string[$i] === '*' && @in_array($string[$i + 1], array('.', '#', '[', ':')) && ($i==0 OR $string[$i - 1]!=='/')) {
+                            // remove unnecessary universal selector, FS#147, but not comment in selector
+                        } else {
+                            $this->selector .= $string[$i];
+                        }
+                    } else {
+                        $lastpos = strlen($this->selector) - 1;
+                        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];
+                        }
+                    }
+                    break;
+
+                /* Case in-property */
+                case 'ip':
+                    if ($this->is_token($string, $i)) {
+                        if (($string[$i] === ':' || $string[$i] === '=') && $this->property != '') {
+                            $this->status = 'iv';
+                            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);
+                            }
+                        } elseif ($string[$i] === '/' && @$string[$i + 1] === '*' && $this->property == '') {
+                            $this->status = 'ic';
+                            ++$i;
+                            $this->from[] = 'ip';
+                        } elseif ($string[$i] === '}') {
+                            $this->explode_selectors();
+                            $this->status = 'is';
+                            $this->invalid_at = false;
+                            $this->_add_token(SEL_END, $this->selector);
+                            $this->selector = '';
+                            $this->property = '';
+                            if ($this->next_selector_at) {
+                                $this->at = $this->css_close_media_section($this->at);
+                                $this->at = $this->css_new_media_section($this->at, $this->next_selector_at);
+                                $this->next_selector_at = '';
+                            }
+                        } elseif ($string[$i] === ';') {
+                            $this->property = '';
+                        } elseif ($string[$i] === '\\') {
+                            $this->property .= $this->_unicode($string, $i);
+                        }
+                        // else this is dumb IE a hack, keep it
+                        // including //
+                        elseif (($this->property === '' && !ctype_space($string[$i]))
+                            || ($this->property === '/' || $string[$i] === '/')) {
+                            $this->property .= $string[$i];
+                        }
+                    } elseif (!ctype_space($string[$i])) {
+                        $this->property .= $string[$i];
+                    }
+                    break;
+
+                /* Case in-value */
+                case 'iv':
+                    $pn = (($string[$i] === "\n" || $string[$i] === "\r") && $this->property_is_next($string, $i + 1) || $i == strlen($string) - 1);
+                    if ($this->is_token($string, $i) || $pn) {
+                        if ($string[$i] === '/' && @$string[$i + 1] === '*') {
+                            $this->status = 'ic';
+                            ++$i;
+                            $this->from[] = 'iv';
+                        } elseif (($string[$i] === '"' || $string[$i] === "'" || $string[$i] === '(')) {
+                            $this->cur_string[] = $string[$i];
+                            $this->str_char[] = ($string[$i] === '(') ? ')' : $string[$i];
+                            $this->status = 'instr';
+                            $this->from[] = 'iv';
+                            $this->quoted_string[] = in_array(strtolower($this->property), $quoted_string_properties);
+                        } elseif ($string[$i] === ',') {
+                            $this->sub_value = trim($this->sub_value) . ',';
+                        } elseif ($string[$i] === '\\') {
+                            $this->sub_value .= $this->_unicode($string, $i);
+                        } elseif ($string[$i] === ';' || $pn) {
+                            if ($this->selector[0] === '@' && isset($at_rules[substr($this->selector, 1)]) && $at_rules[substr($this->selector, 1)] === 'iv') {
+                                /* Add quotes to charset, import, namespace */
+                                $this->sub_value_arr[] = trim($this->sub_value);
+
+                                $this->status = 'is';
+
+                                switch ($this->selector) {
+                                    case '@charset': $this->charset = '"'.$this->sub_value_arr[0].'"';
+                                        break;
+                                    case '@namespace': $this->namespace = implode(' ', $this->sub_value_arr);
+                                        break;
+                                    case '@import': $this->import[] = implode(' ', $this->sub_value_arr);
+                                        break;
+                                }
+
+                                $this->sub_value_arr = array();
+                                $this->sub_value = '';
+                                $this->selector = '';
+                                $this->sel_separate = array();
+                            } else {
+                                $this->status = 'ip';
+                            }
+                        } elseif ($string[$i] !== '}') {
+                            $this->sub_value .= $string[$i];
+                        }
+                        if (($string[$i] === '}' || $string[$i] === ';' || $pn) && !empty($this->selector)) {
+                            if ($this->at == '') {
+                                $this->at = $this->css_new_media_section($this->at,DEFAULT_AT);
+                            }
+
+                            // case settings
+                            if ($this->get_cfg('lowercase_s')) {
+                                $this->selector = strtolower($this->selector);
+                            }
+                            $this->property = strtolower($this->property);
+
+                            $this->optimise->subvalue();
+                            if ($this->sub_value != '') {
+                                $this->sub_value_arr[] = $this->sub_value;
+                                $this->sub_value = '';
+                            }
+
+                            $this->value = '';
+                            while (count($this->sub_value_arr)) {
+                                $sub = array_shift($this->sub_value_arr);
+                                if (strstr($this->selector, 'font-face')) {
+                                    $sub = $this->quote_font_format($sub);
+                                }
+
+                                if ($sub != '')
+                                    $this->value .= ((!strlen($this->value) || substr($this->value,-1,1) === ',')?'':' ').$sub;
+                            }
+
+                            $this->optimise->value();
+
+                            $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);
+                                $this->_add_token(VALUE, $this->value);
+                                $this->optimise->shorthands();
+                            }
+                            if (!$valid) {
+                                if ($this->get_cfg('discard_invalid_properties')) {
+                                    $this->log('Removed invalid property: ' . $this->property, 'Warning');
+                                } else {
+                                    $this->log('Invalid property in ' . strtoupper($this->get_cfg('css_level')) . ': ' . $this->property, 'Warning');
+                                }
+                            }
+
+                            $this->property = '';
+                            $this->sub_value_arr = array();
+                            $this->value = '';
+                        }
+                        if ($string[$i] === '}') {
+                            $this->explode_selectors();
+                            $this->_add_token(SEL_END, $this->selector);
+                            $this->status = 'is';
+                            $this->invalid_at = false;
+                            $this->selector = '';
+                            if ($this->next_selector_at) {
+                                $this->at = $this->css_close_media_section($this->at);
+                                $this->at = $this->css_new_media_section($this->at, $this->next_selector_at);
+                                $this->next_selector_at = '';
+                            }
+                        }
+                    } elseif (!$pn) {
+                        $this->sub_value .= $string[$i];
+
+                        if (ctype_space($string[$i])) {
+                            $this->optimise->subvalue();
+                            if ($this->sub_value != '') {
+                                $this->sub_value_arr[] = $this->sub_value;
+                                $this->sub_value = '';
+                            }
+                        }
+                    }
+                    break;
+
+                /* Case in string */
+                case 'instr':
+                    $_str_char = $this->str_char[count($this->str_char)-1];
+                    $_cur_string = $this->cur_string[count($this->cur_string)-1];
+                    $_quoted_string = $this->quoted_string[count($this->quoted_string)-1];
+                    $temp_add = $string[$i];
+
+                    // 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] === '\'') && !$this->escaped($string, $i)) {
+                        $this->cur_string[] = $string[$i];
+                        $this->str_char[] = $string[$i] === '(' ? ')' : $string[$i];
+                        $this->from[] = 'instr';
+                        $this->quoted_string[] = ($_str_char === ')' && $string[$i] !== '(' && trim($_cur_string)==='(')?$_quoted_string:!($string[$i] === '(');
+                        continue 2;
+                    }
+
+                    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');
+                    }
+
+                    $_cur_string .= $temp_add;
+
+                    if ($string[$i] === $_str_char && !$this->escaped($string, $i)) {
+                        $this->status = array_pop($this->from);
+
+                        if (!preg_match('|[' . implode('', $this->data['csstidy']['whitespace']) . ']|uis', $_cur_string) && $this->property !== 'content') {
+                            if (!$_quoted_string) {
+                                if ($_str_char !== ')') {
+                                    // Convert properties like
+                                    // font-family: 'Arial';
+                                    // to
+                                    // font-family: Arial;
+                                    // or
+                                    // url("abc")
+                                    // to
+                                    // url(abc)
+                                    $_cur_string = substr($_cur_string, 1, -1);
+                                }
+                            } else {
+                                $_quoted_string = false;
+                            }
+                        }
+
+                        array_pop($this->cur_string);
+                        array_pop($this->quoted_string);
+                        array_pop($this->str_char);
+
+                        if ($_str_char === ')') {
+                            $_cur_string = '(' . trim(substr($_cur_string, 1, -1)) . ')';
+                        }
+
+                        if ($this->status === 'iv') {
+                            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)));
+                                // and multiple spaces (too expensive)
+                                if (strpos($_cur_string, '  ') !== false)
+                                    $_cur_string = preg_replace(",\s+,", ' ', $_cur_string);
+                            }
+                            $this->sub_value .= $_cur_string;
+                        } elseif ($this->status === 'is') {
+                            $this->selector .= $_cur_string;
+                        } elseif ($this->status === 'instr') {
+                            $this->cur_string[count($this->cur_string)-1] .= $_cur_string;
+                        }
+                    } else {
+                        $this->cur_string[count($this->cur_string)-1] = $_cur_string;
+                    }
+                    break;
+
+                /* Case in-comment */
+                case 'ic':
+                    if ($string[$i] === '*' && $string[$i + 1] === '/') {
+                        $this->status = array_pop($this->from);
+                        $i++;
+                        if (strlen($cur_comment) > 1 and strncmp($cur_comment, '!', 1) === 0) {
+                            $this->_add_token(IMPORTANT_COMMENT, $cur_comment);
+                            $this->css_add_important_comment($cur_comment);
+                        }
+                        else {
+                            $this->_add_token(COMMENT, $cur_comment);
+                        }
+                        $cur_comment = '';
+                    } else {
+                        $cur_comment .= $string[$i];
+                    }
+                    break;
+            }
+        }
+
+        $this->optimise->postparse();
+
+        $this->print->_reset();
+
+        @setlocale(LC_ALL, $old); // Set locale back to original setting
+
+        return!(empty($this->css) && empty($this->import) && empty($this->charset) && empty($this->tokens) && empty($this->namespace));
+    }
+
+
+    /**
+     * format() in font-face needs quoted values for somes browser (FF at least)
+     *
+     * @param $value
+     * @return string
+     */
+    public function quote_font_format($value) {
+        if (strncmp($value,'format',6) == 0) {
+            $p = strpos($value,')',7);
+            $end = substr($value,$p);
+            $format_strings = $this->parse_string_list(substr($value, 7, $p-7));
+            if (!$format_strings) {
+                $value = '';
+            } else {
+                $value = 'format(';
+
+                foreach ($format_strings as $format_string) {
+                    $value .= '"' . str_replace('"', '\\"', $format_string) . '",';
+                }
+
+                $value = substr($value, 0, -1) . $end;
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * Explodes selectors
+     * @access private
+     * @version 1.0
+     */
+    public function explode_selectors() {
+        // Explode multiple selectors
+        if ($this->get_cfg('merge_selectors') === 1) {
+            $new_sels = array();
+            $lastpos = 0;
+            $this->sel_separate[] = strlen($this->selector);
+            foreach ($this->sel_separate as $num => $pos) {
+                if ($num == count($this->sel_separate) - 1) {
+                    $pos += 1;
+                }
+
+                $new_sels[] = substr($this->selector, $lastpos, $pos - $lastpos - 1);
+                $lastpos = $pos;
+            }
+
+            if (count($new_sels) > 1) {
+                foreach ($new_sels as $selector) {
+                    if (isset($this->css[$this->at][$this->selector])) {
+                        $this->merge_css_blocks($this->at, $selector, $this->css[$this->at][$this->selector]);
+                    }
+                }
+                unset($this->css[$this->at][$this->selector]);
+            }
+        }
+        $this->sel_separate = array();
+    }
+
+    /**
+     * Checks if a character is escaped (and returns true if it is)
+     * @param string $string
+     * @param integer $pos
+     * @access public
+     * @return bool
+     * @version 1.02
+     */
+    static function escaped(&$string, $pos) {
+        return!(@($string[$pos - 1] !== '\\') || csstidy::escaped($string, $pos - 1));
+    }
+
+
+    /**
+     * Add an important comment to the css code
+     * (one we want to keep)
+     * @param $comment
+     */
+    public function css_add_important_comment($comment) {
+        if ($this->get_cfg('preserve_css') || trim($comment) == '') {
+            return;
+        }
+        if (!isset($this->css['!'])) {
+            $this->css['!'] = '';
+        }
+        else {
+            $this->css['!'] .= "\n";
+        }
+        $this->css['!'] .= $comment;
+    }
+
+    /**
+     * Adds a property with value to the existing CSS code
+     * @param string $media
+     * @param string $selector
+     * @param string $property
+     * @param string $new_val
+     * @access private
+     * @version 1.2
+     */
+    public function css_add_property($media, $selector, $property, $new_val) {
+        if ($this->get_cfg('preserve_css') || trim($new_val) == '') {
+            return;
+        }
+
+        $this->added = true;
+        if (isset($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);
+            }
+        } else {
+            $this->css[$media][$selector][$property] = trim($new_val);
+        }
+    }
+
+    /**
+     * Check if a current media section is the continuation of the last one
+     * if not inc the name of the media section to avoid a merging
+     *
+     * @param int|string $media
+     * @return int|string
+     */
+    public function css_check_last_media_section_or_inc($media) {
+        // are we starting?
+        if (!$this->css || !is_array($this->css) || empty($this->css)) {
+            return $media;
+        }
+
+        // if the last @media is the same as this
+        // keep it
+        end($this->css);
+        $at = key($this->css);
+        if ($at == $media) {
+            return $media;
+        }
+
+        // else inc the section in the array
+        while (isset($this->css[$media]))
+            if (is_numeric($media))
+                $media++;
+            else
+                $media .= ' ';
+        return $media;
+    }
+
+    /**
+     * Start a new media section.
+     * Check if the media is not already known,
+     * else rename it with extra spaces
+     * to avoid merging
+     *
+     * @param string $current_media
+     * @param string $media
+     * @param bool $at_root
+     * @return string
+     */
+    public function css_new_media_section($current_media, $new_media, $at_root = false) {
+        if ($this->get_cfg('preserve_css')) {
+            return $new_media;
+        }
+
+        // if we already are in a media and CSS level is 3, manage nested medias
+        if ($current_media
+            && !$at_root
+            // numeric $current_media means DEFAULT_AT or inc
+            && !is_numeric($current_media)
+            && strncmp($this->get_cfg('css_level'), 'CSS3', 4) == 0) {
+
+            $new_media = rtrim($current_media) . "{" . rtrim($new_media);
+        }
+
+        return $this->css_check_last_media_section_or_inc($new_media);
+    }
+
+    /**
+     * Close a media section
+     * Find the parent media we were in before or the root
+     * @param $current_media
+     * @return string
+     */
+    public function css_close_media_section($current_media) {
+        if ($this->get_cfg('preserve_css')) {
+            return '';
+        }
+
+        if (strpos($current_media, '{') !== false) {
+            $current_media = explode('{', $current_media);
+            array_pop($current_media);
+            $current_media = implode('{', $current_media);
+            return $current_media;
+        }
+
+        return '';
+    }
+
+    /**
+     * Start a new selector.
+     * If already referenced in this media section,
+     * rename it with extra space to avoid merging
+     * except if merging is required,
+     * or last selector is the same (merge siblings)
+     *
+     * never merge @font-face
+     *
+     * @param string $media
+     * @param string $selector
+     * @return string
+     */
+    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 ($this->settings['merge_selectors'] != false)
+                return $selector;
+
+            if (!$this->css || !isset($this->css[$media]) || !$this->css[$media])
+                return $selector;
+
+            // if last is the same, keep it
+            end($this->css[$media]);
+            $sel = key($this->css[$media]);
+            if ($sel == $selector) {
+                return $selector;
+            }
+        }
+
+        while (isset($this->css[$media][$selector]))
+            $selector .= ' ';
+        return $selector;
+    }
+
+    /**
+     * Start a new propertie.
+     * If already references in this selector,
+     * rename it with extra space to avoid override
+     *
+     * @param string $media
+     * @param string $selector
+     * @param string $property
+     * @return string
+     */
+    public function css_new_property($media, $selector, $property) {
+        if ($this->get_cfg('preserve_css')) {
+            return $property;
+        }
+        if (!$this->css || !isset($this->css[$media][$selector]) || !$this->css[$media][$selector])
+            return $property;
+
+        while (isset($this->css[$media][$selector][$property]))
+            $property .= ' ';
+
+        return $property;
+    }
+
+    /**
+     * Adds CSS to an existing media/selector
+     * @param string $media
+     * @param string $selector
+     * @param array $css_add
+     * @access private
+     * @version 1.1
+     */
+    public function merge_css_blocks($media, $selector, $css_add) {
+        foreach ($css_add as $property => $value) {
+            $this->css_add_property($media, $selector, $property, $value, false);
+        }
+    }
+
+    /**
+     * Checks if $value is !important.
+     * @param string $value
+     * @return bool
+     * @access public
+     * @version 1.0
+     */
+    public function is_important(&$value) {
+        return (
+            strpos($value, '!') !== false // quick test
+            AND !strcasecmp(substr(str_replace($this->data['csstidy']['whitespace'], '', $value), -10, 10), '!important'));
+    }
+
+    /**
+     * Returns a value without !important
+     * @param string $value
+     * @return string
+     * @access public
+     * @version 1.0
+     */
+    public function gvw_important($value) {
+        if ($this->is_important($value)) {
+            $value = trim($value);
+            $value = substr($value, 0, -9);
+            $value = trim($value);
+            $value = substr($value, 0, -1);
+            $value = trim($value);
+            return $value;
+        }
+        return $value;
+    }
+
+    /**
+     * Checks if the next word in a string from pos is a CSS property
+     * @param string $istring
+     * @param integer $pos
+     * @return bool
+     * @access private
+     * @version 1.2
+     */
+    public function property_is_next($istring, $pos) {
+        $all_properties = & $this->data['csstidy']['all_properties'];
+        $istring = substr($istring, $pos, strlen($istring) - $pos);
+        $pos = strpos($istring, ':');
+        if ($pos === false) {
+            return false;
+        }
+        $istring = strtolower(trim(substr($istring, 0, $pos)));
+        if (isset($all_properties[$istring])) {
+            $this->log('Added semicolon to the end of declaration', 'Warning');
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Checks if a property is valid
+     * @param string $property
+     * @return bool
+     * @access public
+     * @version 1.0
+     */
+    public function property_is_valid($property) {
+        if (strpos($property, '--') === 0) {
+            $property = "--custom";
+        }
+        elseif (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 );
+    }
+
+    /**
+     * Accepts a list of strings (e.g., the argument to format() in a @font-face src property)
+     * and returns a list of the strings.  Converts things like:
+     *
+     * format(abc) => format("abc")
+     * format(abc def) => format("abc","def")
+     * format(abc "def") => format("abc","def")
+     * format(abc, def, ghi) => format("abc","def","ghi")
+     * format("abc",'def') => format("abc","def")
+     * format("abc, def, ghi") => format("abc, def, ghi")
+     *
+     * @param string
+     * @return array
+     */
+    public function parse_string_list($value) {
+        $value = trim($value);
+
+        // Case: empty
+        if (!$value) return array();
+
+        $strings = array();
+
+        $in_str = false;
+        $current_string = '';
+
+        for ($i = 0, $_len = strlen($value); $i < $_len; $i++) {
+            if (($value[$i] === ',' || $value[$i] === ' ') && $in_str === true) {
+                $in_str = false;
+                $strings[] = $current_string;
+                $current_string = '';
+            } elseif ($value[$i] === '"' || $value[$i] === "'") {
+                if ($in_str === $value[$i]) {
+                    $strings[] = $current_string;
+                    $in_str = false;
+                    $current_string = '';
+                    continue;
+                } elseif (!$in_str) {
+                    $in_str = $value[$i];
+                }
+            } else {
+                if ($in_str) {
+                    $current_string .= $value[$i];
+                } else {
+                    if (!preg_match("/[\s,]/", $value[$i])) {
+                        $in_str = true;
+                        $current_string = $value[$i];
+                    }
+                }
+            }
+        }
+
+        if ($current_string) {
+            $strings[] = $current_string;
+        }
+
+        return $strings;
+    }
+}

opt-out-for-google-analytics/trunk/lib/csstidy/class.csstidy_optimise.php

@@ -1 +1 @@
 <?php
 
-    // If this file is called directly, abort.
-    defined( 'WPINC' ) || die;
-
-    /**
-     * CSSTidy - CSS Parser and Optimiser
-     *
-     * CSS Optimising Class
-     * This class optimises CSS data generated by csstidy.
-     *
-     * Copyright 2005, 2006, 2007 Florian Schmitz
-     *
-     * This file is part of CSSTidy.
-     *
-     *   CSSTidy is free software; you can redistribute it and/or modify
-     *   it under the terms of the GNU Lesser General Public License as published by
-     *   the Free Software Foundation; either version 2.1 of the License, or
-     *   (at your option) any later version.
-     *
-     *   CSSTidy is distributed in the hope that it will be useful,
-     *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-     *   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/>.
-     *
-     * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
-     * @package csstidy
-     * @author  Florian Schmitz (floele at gmail dot com) 2005-2007
-     * @author  Brett Zamir (brettz9 at yahoo dot com) 2007
-     * @author  Nikolay Matsievsky (speed at webo dot name) 2009-2010
-     * @author  Cedric Morin (cedric at yterium dot com) 2010-2012
-     */
-
-    /**
-     * CSS Optimising Class
-     *
-     * This class optimises CSS data generated by csstidy.
-     *
-     * @package csstidy
-     * @author  Florian Schmitz (floele at gmail dot com) 2005-2006
-     * @version 1.0
-     */
-    class csstidy_optimise {
-
-        /**
-         * csstidy object
-         * @var object
-         */
-        public $parser;
-
-        /**
-         * Constructor
-         *
-         * @param array $css contains the class csstidy
-         *
-         * @access  private
-         * @version 1.0
-         */
-        public function __construct( $css ) {
-            $this->parser    = $css;
-            $this->css       = &$css->css;
-            $this->sub_value = &$css->sub_value;
-            $this->at        = &$css->at;
-            $this->selector  = &$css->selector;
-            $this->property  = &$css->property;
-            $this->value     = &$css->value;
-        }
-
-        /**
-         * Optimises $css after parsing
-         * @access  public
-         * @version 1.0
-         */
-        public function postparse() {
-
-            if ( $this->parser->get_cfg( 'reverse_left_and_right' ) > 0 ) {
-
-                foreach ( $this->css as $medium => $selectors ) {
-                    if ( is_array( $selectors ) ) {
-                        foreach ( $selectors as $selector => $properties ) {
-                            $this->css[ $medium ][ $selector ] = $this->reverse_left_and_right( $this->css[ $medium ][ $selector ] );
+/**
+ * CSSTidy - CSS Parser and Optimiser
+ *
+ * CSS Optimising Class
+ * This class optimises CSS data generated by csstidy.
+ *
+ * Copyright 2005, 2006, 2007 Florian Schmitz
+ *
+ * This file is part of CSSTidy.
+ *
+ *   CSSTidy is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Lesser General Public License as published by
+ *   the Free Software Foundation; either version 2.1 of the License, or
+ *   (at your option) any later version.
+ *
+ *   CSSTidy is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   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/>.
+ *
+ * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
+ * @package csstidy
+ * @author Florian Schmitz (floele at gmail dot com) 2005-2007
+ * @author Brett Zamir (brettz9 at yahoo dot com) 2007
+ * @author Nikolay Matsievsky (speed at webo dot name) 2009-2010
+ * @author Cedric Morin (cedric at yterium dot com) 2010-2012
+ */
+
+/**
+ * CSS Optimising Class
+ *
+ * This class optimises CSS data generated by csstidy.
+ *
+ * @package csstidy
+ * @author Florian Schmitz (floele at gmail dot com) 2005-2006
+ * @version 1.0
+ */
+class csstidy_optimise {
+
+    /**
+     * csstidy object
+     * @var object
+     */
+    public $parser;
+
+    /**
+     * Constructor
+     * @param array $css contains the class csstidy
+     * @access private
+     * @version 1.0
+     */
+    public function __construct($css) {
+        $this->parser = $css;
+        $this->css = & $css->css;
+        $this->sub_value = & $css->sub_value;
+        $this->at = & $css->at;
+        $this->selector = & $css->selector;
+        $this->property = & $css->property;
+        $this->value = & $css->value;
+    }
+
+    /**
+     * Optimises $css after parsing
+     * @access public
+     * @version 1.0
+     */
+    public function postparse() {
+
+        if ($this->parser->get_cfg('reverse_left_and_right') > 0) {
+
+            foreach ($this->css as $medium => $selectors) {
+                if (is_array($selectors)) {
+                    foreach ($selectors as $selector => $properties) {
+                        $this->css[$medium][$selector] = $this->reverse_left_and_right($this->css[$medium][$selector]);
+                    }
+                }
+            }
+
+        }
+
+        if ($this->parser->get_cfg('preserve_css')) {
+            return;
+        }
+
+        if ((int)$this->parser->get_cfg('merge_selectors') === 2) {
+            foreach ($this->css as $medium => $value) {
+                if (is_array($value)) {
+                    $this->merge_selectors($this->css[$medium]);
+                }
+            }
+        }
+
+        if ($this->parser->get_cfg('discard_invalid_selectors')) {
+            foreach ($this->css as $medium => $value) {
+                if (is_array($value)) {
+                    $this->discard_invalid_selectors($this->css[$medium]);
+                }
+            }
+        }
+
+        if ($this->parser->get_cfg('optimise_shorthands') > 0) {
+            foreach ($this->css as $medium => $value) {
+                if (is_array($value)) {
+                    foreach ($value as $selector => $value1) {
+                        $this->css[$medium][$selector] = $this->merge_4value_shorthands($this->css[$medium][$selector]);
+                        $this->css[$medium][$selector] = $this->merge_4value_radius_shorthands($this->css[$medium][$selector]);
+
+                        if ($this->parser->get_cfg('optimise_shorthands') < 2) {
+                            continue;
+                        }
+
+                        $this->css[$medium][$selector] = $this->merge_font($this->css[$medium][$selector]);
+
+                        if ($this->parser->get_cfg('optimise_shorthands') < 3) {
+                            continue;
+                        }
+
+                        $this->css[$medium][$selector] = $this->merge_bg($this->css[$medium][$selector]);
+                        if (empty($this->css[$medium][$selector])) {
+                            unset($this->css[$medium][$selector]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Optimises values
+     * @access public
+     * @version 1.0
+     */
+    public function value() {
+        $shorthands = & $this->parser->data['csstidy']['shorthands'];
+
+        // optimise shorthand properties
+        if (isset($shorthands[$this->property])) {
+            $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');
+            }
+            $this->value = $temp;
+        }
+
+        // Remove whitespace at ! important
+        if ($this->value != $this->compress_important($this->value)) {
+            $this->parser->log('Optimised !important', 'Information');
+        }
+    }
+
+    /**
+     * Optimises shorthands
+     * @access public
+     * @version 1.0
+     */
+    public function shorthands() {
+        $shorthands = & $this->parser->data['csstidy']['shorthands'];
+
+        if (!$this->parser->get_cfg('optimise_shorthands') || $this->parser->get_cfg('preserve_css')) {
+            return;
+        }
+
+        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, $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, $this->dissolve_short_bg($this->value));
+        }
+        if (isset($shorthands[$this->property])) {
+            $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] = '';
+            }
+        }
+    }
+
+    /**
+     * Optimises a sub-value
+     * @access public
+     * @version 1.0
+     */
+    public function subvalue() {
+        $replace_colors = & $this->parser->data['csstidy']['replace_colors'];
+
+        $this->sub_value = trim($this->sub_value);
+        if ($this->sub_value == '') { // caution : '0'
+            return;
+        }
+
+        $important = '';
+        if ($this->parser->is_important($this->sub_value)) {
+            $important = '!important';
+        }
+        $this->sub_value = $this->parser->gvw_important($this->sub_value);
+
+        // Compress font-weight
+        if ($this->property === 'font-weight' && $this->parser->get_cfg('compress_font-weight')) {
+            if ($this->sub_value === 'bold') {
+                $this->sub_value = '700';
+                $this->parser->log('Optimised font-weight: Changed "bold" to "700"', 'Information');
+            } elseif ($this->sub_value === 'normal') {
+                $this->sub_value = '400';
+                $this->parser->log('Optimised font-weight: Changed "normal" to "400"', 'Information');
+            }
+        }
+
+        $temp = $this->compress_numbers($this->sub_value);
+        if (strcasecmp($temp, $this->sub_value) !== 0) {
+            if (strlen($temp) > strlen($this->sub_value)) {
+                $this->parser->log('Fixed invalid number: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Warning');
+            } else {
+                $this->parser->log('Optimised number: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Information');
+            }
+            $this->sub_value = $temp;
+        }
+        if ($this->parser->get_cfg('compress_colors')) {
+            $temp = $this->cut_color($this->sub_value);
+            if ($temp !== $this->sub_value) {
+                if (isset($replace_colors[$this->sub_value])) {
+                    $this->parser->log('Fixed invalid color name: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Warning');
+                } else {
+                    $this->parser->log('Optimised color: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Information');
+                }
+                $this->sub_value = $temp;
+            }
+        }
+        $this->sub_value .= $important;
+    }
+
+    /**
+     * Compresses shorthand values. Example: margin:1px 1px 1px 1px -> margin:1px
+     * @param string $value
+     * @access public
+     * @return string
+     * @version 1.0
+     */
+    public function shorthand($value) {
+        $important = '';
+        if ($this->parser->is_important($value)) {
+            $values = $this->parser->gvw_important($value);
+            $important = '!important';
+        }
+        else
+            $values = $value;
+
+        $values = explode(' ', $values);
+        switch (count($values)) {
+            case 4:
+                if ($values[0] == $values[1] && $values[0] == $values[2] && $values[0] == $values[3]) {
+                    return $values[0] . $important;
+                } elseif ($values[1] == $values[3] && $values[0] == $values[2]) {
+                    return $values[0] . ' ' . $values[1] . $important;
+                } elseif ($values[1] == $values[3]) {
+                    return $values[0] . ' ' . $values[1] . ' ' . $values[2] . $important;
+                }
+                break;
+
+            case 3:
+                if ($values[0] == $values[1] && $values[0] == $values[2]) {
+                    return $values[0] . $important;
+                } elseif ($values[0] == $values[2]) {
+                    return $values[0] . ' ' . $values[1] . $important;
+                }
+                break;
+
+            case 2:
+                if ($values[0] == $values[1]) {
+                    return $values[0] . $important;
+                }
+                break;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Removes unnecessary whitespace in ! important
+     * @param string $string
+     * @return string
+     * @access public
+     * @version 1.1
+     */
+    public function compress_important(&$string) {
+        if ($this->parser->is_important($string)) {
+            $important = $this->parser->get_cfg('space_before_important') ? ' !important' : '!important';
+            $string = $this->parser->gvw_important($string) . $important;
+        }
+        return $string;
+    }
+
+    /**
+     * Color compression function. Converts all rgb() values to #-values and uses the short-form if possible. Also replaces 4 color names by #-values.
+     * @param string $color
+     * @return string
+     * @version 1.1
+     */
+    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 || strncmp($color, '"', 1) == 0)
+            return $color;
+
+        /* expressions complexes de type gradient */
+        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)
+                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);
+                }
+            }
+            return $color;
+        }
+
+        // rgb(0,0,0) -> #000000 (or #000 in this case later)
+        if (strncasecmp($color, 'rgb(', 4)==0) {
+            $color_tmp = substr($color, 4, strlen($color) - 5);
+            $color_tmp = explode(',', $color_tmp);
+            for ($i = 0; $i < count($color_tmp); $i++) {
+                $color_tmp[$i] = trim($color_tmp[$i]);
+                if (substr($color_tmp[$i], -1) === '%') {
+                    $color_tmp[$i] = round((255 * $color_tmp[$i]) / 100);
+                }
+                if ($color_tmp[$i] > 255)
+                    $color_tmp[$i] = 255;
+            }
+            $color = '#';
+            for ($i = 0; $i < 3; $i++) {
+                if ($color_tmp[$i] < 16) {
+                    $color .= '0' . dechex($color_tmp[$i]);
+                } else {
+                    $color .= dechex($color_tmp[$i]);
+                }
+            }
+        }
+
+        // Fix bad color names
+        if (isset($replace_colors[strtolower($color)])) {
+            $color = $replace_colors[strtolower($color)];
+        }
+
+        // #aabbcc -> #abc
+        if (strlen($color) == 7) {
+            $color_temp = strtolower($color);
+            if ($color_temp[0] === '#' && $color_temp[1] == $color_temp[2] && $color_temp[3] == $color_temp[4] && $color_temp[5] == $color_temp[6]) {
+                $color = '#' . $color[1] . $color[3] . $color[5];
+            }
+        }
+
+        switch (strtolower($color)) {
+            /* color name -> hex code */
+            case 'black': return '#000';
+            case 'fuchsia': return '#f0f';
+            case 'white': return '#fff';
+            case 'yellow': return '#ff0';
+
+            /* hex code -> color name */
+            case '#800000': return 'maroon';
+            case '#ffa500': return 'orange';
+            case '#808000': return 'olive';
+            case '#800080': return 'purple';
+            case '#008000': return 'green';
+            case '#000080': return 'navy';
+            case '#008080': return 'teal';
+            case '#c0c0c0': return 'silver';
+            case '#808080': return 'gray';
+            case '#f00': return 'red';
+        }
+
+        return $color;
+    }
+
+    /**
+     * Compresses numbers (ie. 1.0 becomes 1 or 1.100 becomes 1.1 )
+     * @param string $subvalue
+     * @return string
+     * @version 1.2
+     */
+    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...;
+        if ($this->property === 'font') {
+            $temp = explode('/', $subvalue);
+        } else {
+            $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
+            $number = $this->AnalyseCssNumber($temp[$l]);
+            if ($number === false) {
+                return $subvalue;
+            }
+
+            // Fix bad colors
+            if (in_array($this->property, $color_values)) {
+                $temp[$l] = '#' . $temp[$l];
+                continue;
+            }
+
+            if (abs($number[0]) > 0) {
+                if ($number[1] == '' && in_array($this->property, $unit_values, true)) {
+                    $number[1] = 'px';
+                }
+                        } elseif ($number[1] != 's' && $number[1] != 'ms') {
+                                $number[1] = '';
                         }
-                    }
-                }
-
-            }
-
-            if ( $this->parser->get_cfg( 'preserve_css' ) ) {
-                return;
-            }
-
-            if ( (int) $this->parser->get_cfg( 'merge_selectors' ) === 2 ) {
-                foreach ( $this->css as $medium => $value ) {
-                    if ( is_array( $value ) ) {
-                        $this->merge_selectors( $this->css[ $medium ] );
-                    }
-                }
-            }
-
-            if ( $this->parser->get_cfg( 'discard_invalid_selectors' ) ) {
-                foreach ( $this->css as $medium => $value ) {
-                    if ( is_array( $value ) ) {
-                        $this->discard_invalid_selectors( $this->css[ $medium ] );
-                    }
-                }
-            }
-
-            if ( $this->parser->get_cfg( 'optimise_shorthands' ) > 0 ) {
-                foreach ( $this->css as $medium => $value ) {
-                    if ( is_array( $value ) ) {
-                        foreach ( $value as $selector => $value1 ) {
-                            $this->css[ $medium ][ $selector ] = $this->merge_4value_shorthands( $this->css[ $medium ][ $selector ] );
-                            $this->css[ $medium ][ $selector ] = $this->merge_4value_radius_shorthands( $this->css[ $medium ][ $selector ] );
-
-                            if ( $this->parser->get_cfg( 'optimise_shorthands' ) < 2 ) {
-                                continue;
-                            }
-
-                            $this->css[ $medium ][ $selector ] = $this->merge_font( $this->css[ $medium ][ $selector ] );
-
-                            if ( $this->parser->get_cfg( 'optimise_shorthands' ) < 3 ) {
-                                continue;
-                            }
-
-                            $this->css[ $medium ][ $selector ] = $this->merge_bg( $this->css[ $medium ][ $selector ] );
-                            if ( empty( $this->css[ $medium ][ $selector ] ) ) {
-                                unset( $this->css[ $medium ][ $selector ] );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /**
-         * Reverse left vs right in a list of properties/values
-         *
-         * @param array $array
-         *
-         * @return array
-         */
-        public function reverse_left_and_right( $array ) {
-            $return = array();
-
-            // change left <-> right in properties name and values
-            foreach ( $array as $propertie => $value ) {
-
-                if ( method_exists( $this, $m = 'reverse_left_and_right_' . str_replace( '-', '_', trim( $propertie ) ) ) ) {
-                    $value = $this->$m( $value );
-                }
-
-                // simple replacement for properties
-                $propertie = str_ireplace( array( 'left', 'right', "\x1" ), array( "\x1", 'left', 'right' ), $propertie );
-                // be careful for values, not modifying protected or quoted valued
-                foreach ( array( 'left' => "\x1", 'right' => 'left', "\x1" => 'right' ) as $v => $r ) {
-                    if ( strpos( $value, $v ) !== false ) {
-                        // attraper les left et right separes du reste (pas au milieu d'un mot)
-                        if ( in_array( $v, array( 'left', 'right' ) ) ) {
-                            $value = preg_replace( ",\\b$v\\b,", "\x0", $value );
-                        }
-                        else {
-                            $value = str_replace( $v, "\x0", $value );
-                        }
-                        $value = $this->explode_ws( "\x0", $value . ' ', true );
-                        $value = rtrim( implode( $r, $value ) );
-                        $value = str_replace( "\x0", $v, $value );
-                    }
-                }
-                $return[ $propertie ] = $value;
-            }
-
-            return $return;
-        }
-
-        /**
-         * Explodes a string as explode() does, however, not if $sep is escaped or within a string.
-         *
-         * @param string $sep seperator
-         * @param string $string
-         * @param bool   $explode_in_parenthesis
-         *
-         * @return array
-         * @version 1.0
-         */
-        public function explode_ws( $sep, $string, $explode_in_parenthesis = false ) {
-            $status = 'st';
-            $to     = '';
-
-            $output = array(
-                0 => '',
-            );
-            $num    = 0;
-            for ( $i = 0, $len = strlen( $string ); $i < $len; $i++ ) {
-                switch ( $status ) {
-                    case 'st':
-                        if ( $string[ $i ] == $sep && ! $this->parser->escaped( $string, $i ) ) {
-                            ++$num;
-                        }
-                        elseif ( $string[ $i ] === '"' || $string[ $i ] === '\'' || ( ! $explode_in_parenthesis && $string[ $i ] === '(' ) && ! $this->parser->escaped( $string, $i ) ) {
-                            $status = 'str';
-                            $to     = ( $string[ $i ] === '(' ) ? ')' : $string[ $i ];
-                            ( isset( $output[ $num ] ) ) ? $output[ $num ] .= $string[ $i ] : $output[ $num ] = $string[ $i ];
-                        }
-                        else {
-                            ( isset( $output[ $num ] ) ) ? $output[ $num ] .= $string[ $i ] : $output[ $num ] = $string[ $i ];
-                        }
-                        break;
-
-                    case 'str':
-                        if ( $string[ $i ] == $to && ! $this->parser->escaped( $string, $i ) ) {
-                            $status = 'st';
-                        }
-                        ( isset( $output[ $num ] ) ) ? $output[ $num ] .= $string[ $i ] : $output[ $num ] = $string[ $i ];
-                        break;
-                }
-            }
-
-            return $output;
-        }
-
-        /**
-         * Merges selectors with same properties. Example: a{color:red} b{color:red} -> a,b{color:red}
-         * Very basic and has at least one bug. Hopefully there is a replacement soon.
-         *
-         * @param array $array
-         *
-         * @return array
-         * @access  public
-         * @version 1.2
-         */
-        public function merge_selectors( &$array ) {
-            $css = $array;
-            foreach ( $css as $key => $value ) {
-                if ( ! isset( $css[ $key ] ) ) {
-                    continue;
-                }
-                $newsel = '';
-
-                // Check if properties also exist in another selector
-                $keys = array();
-                // PHP bug (?) without $css = $array; here
-                foreach ( $css as $selector => $vali ) {
-                    if ( $selector == $key ) {
-                        continue;
-                    }
-
-                    if ( $css[ $key ] === $vali ) {
-                        $keys[] = $selector;
-                    }
-                }
-
-                if ( ! empty( $keys ) ) {
-                    $newsel = $key;
-                    unset( $css[ $key ] );
-                    foreach ( $keys as $selector ) {
-                        unset( $css[ $selector ] );
-                        $newsel .= ',' . $selector;
-                    }
-                    $css[ $newsel ] = $value;
-                }
-            }
-            $array = $css;
-        }
-
-        /**
-         * Removes invalid selectors and their corresponding rule-sets as
-         * defined by 4.1.7 in REC-CSS2. This is a very rudimentary check
-         * and should be replaced by a full-blown parsing algorithm or
-         * regular expression
-         * @version 1.4
-         */
-        public function discard_invalid_selectors( &$array ) {
-            $invalid = array( '+' => true, '~' => true, ',' => true, '>' => true );
-            foreach ( $array as $selector => $decls ) {
-                $ok        = true;
-                $selectors = array_map( 'trim', explode( ',', $selector ) );
-                foreach ( $selectors as $s ) {
-                    $simple_selectors = preg_split( '/\s*[+>~\s]\s*/', $s );
-                    foreach ( $simple_selectors as $ss ) {
-                        if ( $ss === '' ) {
-                            $ok = false;
-                        }
-                        // could also check $ss for internal structure,
-                        // but that probably would be too slow
-                    }
-                }
-                if ( ! $ok ) {
-                    unset( $array[ $selector ] );
-                }
-            }
-        }
-
-        /**
-         * Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()
-         *
-         * @param array      $array
-         * @param array|null $shorthands
-         *
-         * @return array
-         * @version 1.2
-         * @see     dissolve_4value_shorthands()
-         */
-        public function merge_4value_shorthands( $array, $shorthands = null ) {
-            $return = $array;
-            if ( is_null( $shorthands ) ) {
-                $shorthands = &$this->parser->data[ 'csstidy' ][ 'shorthands' ];
-            }
-
-            foreach ( $shorthands as $key => $value ) {
-                if ( $value !== 0 && isset( $array[ $value[ 0 ] ] ) && isset( $array[ $value[ 1 ] ] )
-                    && isset( $array[ $value[ 2 ] ] ) && isset( $array[ $value[ 3 ] ] ) ) {
-                    $return[ $key ] = '';
-
-                    $important = '';
-                    for ( $i = 0; $i < 4; $i++ ) {
-                        $val = $array[ $value[ $i ] ];
-                        if ( $this->parser->is_important( $val ) ) {
-                            $important      = '!important';
-                            $return[ $key ] .= $this->parser->gvw_important( $val ) . ' ';
-                        }
-                        else {
-                            $return[ $key ] .= $val . ' ';
-                        }
-                        unset( $return[ $value[ $i ] ] );
-                    }
-                    $return[ $key ] = $this->shorthand( trim( $return[ $key ] . $important ) );
-                }
-            }
-            return $return;
-        }
-
-        /**
-         * Compresses shorthand values. Example: margin:1px 1px 1px 1px -> margin:1px
-         *
-         * @param string $value
-         *
-         * @access  public
-         * @return string
-         * @version 1.0
-         */
-        public function shorthand( $value ) {
-            $important = '';
-            if ( $this->parser->is_important( $value ) ) {
-                $values    = $this->parser->gvw_important( $value );
-                $important = '!important';
-            }
-            else {
-                $values = $value;
-            }
-
-            $values = explode( ' ', $values );
-            switch ( count( $values ) ) {
-                case 4:
-                    if ( $values[ 0 ] == $values[ 1 ] && $values[ 0 ] == $values[ 2 ] && $values[ 0 ] == $values[ 3 ] ) {
-                        return $values[ 0 ] . $important;
-                    }
-                    elseif ( $values[ 1 ] == $values[ 3 ] && $values[ 0 ] == $values[ 2 ] ) {
-                        return $values[ 0 ] . ' ' . $values[ 1 ] . $important;
-                    }
-                    elseif ( $values[ 1 ] == $values[ 3 ] ) {
-                        return $values[ 0 ] . ' ' . $values[ 1 ] . ' ' . $values[ 2 ] . $important;
-                    }
-                    break;
-
-                case 3:
-                    if ( $values[ 0 ] == $values[ 1 ] && $values[ 0 ] == $values[ 2 ] ) {
-                        return $values[ 0 ] . $important;
-                    }
-                    elseif ( $values[ 0 ] == $values[ 2 ] ) {
-                        return $values[ 0 ] . ' ' . $values[ 1 ] . $important;
-                    }
-                    break;
-
-                case 2:
-                    if ( $values[ 0 ] == $values[ 1 ] ) {
-                        return $values[ 0 ] . $important;
-                    }
-                    break;
-            }
-
-            return $value;
-        }
-
-        /**
-         * Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()
-         *
-         * @param array $array
-         *
-         * @return array
-         * @version 1.2
-         * @use     merge_4value_shorthands()
-         * @see     dissolve_4value_radius_shorthands()
-         */
-        public function merge_4value_radius_shorthands( $array ) {
-            $return     = $array;
-            $shorthands = &$this->parser->data[ 'csstidy' ][ 'radius_shorthands' ];
-
-            foreach ( $shorthands as $key => $value ) {
-                if ( isset( $array[ $value[ 0 ] ] ) && isset( $array[ $value[ 1 ] ] )
-                    && isset( $array[ $value[ 2 ] ] ) && isset( $array[ $value[ 3 ] ] ) && $value !== 0 ) {
-                    $return[ $key ] = '';
-                    $a              = array();
-                    for ( $i = 0; $i < 4; $i++ ) {
-                        $v                      = $this->explode_ws( ' ', trim( $array[ $value[ $i ] ] ) );
-                        $a[ 0 ][ $value[ $i ] ] = reset( $v );
-                        $a[ 1 ][ $value[ $i ] ] = end( $v );
-                    }
-                    $r      = array();
-                    $r[ 0 ] = $this->merge_4value_shorthands( $a[ 0 ], $shorthands );
-                    $r[ 1 ] = $this->merge_4value_shorthands( $a[ 1 ], $shorthands );
-
-                    if ( isset( $r[ 0 ][ $key ] ) and isset( $r[ 1 ][ $key ] ) ) {
-                        $return[ $key ] = $r[ 0 ][ $key ];
-                        if ( $r[ 1 ][ $key ] !== $r[ 0 ][ $key ] ) {
-                            $return[ $key ] .= ' / ' . $r[ 1 ][ $key ];
-                        }
-                        for ( $i = 0; $i < 4; $i++ ) {
-                            unset( $return[ $value[ $i ] ] );
-                        }
-                    }
-                }
-            }
-            return $return;
-        }
-
-        /**
-         * Merges all fonts properties
-         *
-         * @param array $input_css
-         *
-         * @return array
-         * @version 1.3
-         * @see     dissolve_short_font()
-         */
-        public function merge_font( $input_css ) {
-            $font_prop_default = &$this->parser->data[ 'csstidy' ][ 'font_prop_default' ];
-            $new_font_value    = '';
-            $important         = '';
-            // Skip if not font-family and font-size set
-            if ( isset( $input_css[ 'font-family' ] ) && isset( $input_css[ 'font-size' ] ) && $input_css[ 'font-family' ] != 'inherit' ) {
-                // fix several words in font-family - add quotes
-                if ( isset( $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 ] === "'" ) ) ) {
-                            $family = '"' . $family . '"';
-                        }
-                        $result_families[] = $family;
-                    }
-                    $input_css[ 'font-family' ] = implode( ',', $result_families );
-                }
-                foreach ( $font_prop_default as $font_property => $default_value ) {
-
-                    // Skip if property does not exist
-                    if ( ! isset( $input_css[ $font_property ] ) ) {
-                        continue;
-                    }
-
-                    $cur_value = $input_css[ $font_property ];
-
-                    // Skip if default value is used
-                    if ( $cur_value === $default_value ) {
-                        continue;
-                    }
-
-                    // Remove !important
-                    if ( $this->parser->is_important( $cur_value ) ) {
-                        $important = '!important';
-                        $cur_value = $this->parser->gvw_important( $cur_value );
-                    }
-
-                    $new_font_value .= $cur_value;
-                    // Add delimiter
-                    $new_font_value .= ( $font_property === 'font-size' &&
-                        isset( $input_css[ 'line-height' ] ) ) ? '/' : ' ';
-                }
-
-                $new_font_value = trim( $new_font_value );
-
-                // Delete all font-properties
-                foreach ( $font_prop_default as $font_property => $default_value ) {
-                    if ( $font_property !== 'font' || ! $new_font_value ) {
-                        unset( $input_css[ $font_property ] );
-                    }
-                }
-
-                // Add new font property
-                if ( $new_font_value !== '' ) {
-                    $input_css[ 'font' ] = $new_font_value . $important;
-                }
-            }
-
-            return $input_css;
-        }
-
-        /**
-         * Merges all background properties
-         *
-         * @param array $input_css
-         *
-         * @return array
-         * @version 1.0
-         * @see     dissolve_short_bg()
-         * @todo    full CSS 3 compliance
-         */
-        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( $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 = @$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' ] ) && $input_css[ 'background' ] ) {
-                return $input_css;
-            }
-
-            for ( $i = 0; $i < $number_of_values; $i++ ) {
-                foreach ( $background_prop_default as $bg_property => $default_value ) {
-                    // Skip if property does not exist
-                    if ( ! isset( $input_css[ $bg_property ] ) ) {
-                        continue;
-                    }
-
-                    $cur_value = $input_css[ $bg_property ];
-                    // skip all optimisation if gradient() somewhere
-                    if ( stripos( $cur_value, 'gradient(' ) !== false ) {
-                        return $input_css;
-                    }
-
-                    // Skip some properties if there is no background image
-                    if ( ( ! isset( $bg_img_array[ $i ] ) || $bg_img_array[ $i ] === 'none' )
-                        && ( $bg_property === 'background-size' || $bg_property === 'background-position'
-                            || $bg_property === 'background-attachment' || $bg_property === 'background-repeat' ) ) {
-                        continue;
-                    }
-
-                    // Remove !important
-                    if ( $this->parser->is_important( $cur_value ) ) {
-                        $important = ' !important';
-                        $cur_value = $this->parser->gvw_important( $cur_value );
-                    }
-
-                    // Do not add default values
-                    if ( $cur_value === $default_value ) {
-                        continue;
-                    }
-
-                    $temp = $this->explode_ws( ',', $cur_value );
-
-                    if ( isset( $temp[ $i ] ) ) {
-                        if ( $bg_property === 'background-size' ) {
-                            $new_bg_value .= '(' . $temp[ $i ] . ') ';
-                        }
-                        else {
-                            $new_bg_value .= $temp[ $i ] . ' ';
-                        }
-                    }
-                }
-
-                $new_bg_value = trim( $new_bg_value );
-                if ( $i != $number_of_values - 1 ) {
-                    $new_bg_value .= ',';
-                }
-            }
-
-            // Delete all background-properties
-            foreach ( $background_prop_default as $bg_property => $default_value ) {
-                unset( $input_css[ $bg_property ] );
-            }
-
-            // Add new background property
-            if ( $new_bg_value !== '' ) {
-                $input_css[ 'background' ] = $new_bg_value . $important;
-            }
-            elseif ( isset ( $input_css[ 'background' ] ) ) {
-                $input_css[ 'background' ] = 'none';
-            }
-
-            return $input_css;
-        }
-
-        /**
-         * Optimises values
-         * @access  public
-         * @version 1.0
-         */
-        public function value() {
-            $shorthands = &$this->parser->data[ 'csstidy' ][ 'shorthands' ];
-
-            // optimise shorthand properties
-            if ( isset( $shorthands[ $this->property ] ) ) {
-                $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' );
-                }
-                $this->value = $temp;
-            }
-
-            // Remove whitespace at ! important
-            if ( $this->value != $this->compress_important( $this->value ) ) {
-                $this->parser->log( 'Optimised !important', 'Information' );
-            }
-        }
-
-        /**
-         * Removes unnecessary whitespace in ! important
-         *
-         * @param string $string
-         *
-         * @return string
-         * @access  public
-         * @version 1.1
-         */
-        public function compress_important( &$string ) {
-            if ( $this->parser->is_important( $string ) ) {
-                $important = $this->parser->get_cfg( 'space_before_important' ) ? ' !important' : '!important';
-                $string    = $this->parser->gvw_important( $string ) . $important;
-            }
-            return $string;
-        }
-
-        /**
-         * Optimises shorthands
-         * @access  public
-         * @version 1.0
-         */
-        public function shorthands() {
-            $shorthands = &$this->parser->data[ 'csstidy' ][ 'shorthands' ];
-
-            if ( ! $this->parser->get_cfg( 'optimise_shorthands' ) || $this->parser->get_cfg( 'preserve_css' ) ) {
-                return;
-            }
-
-            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, $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, $this->dissolve_short_bg( $this->value ) );
-            }
-            if ( isset( $shorthands[ $this->property ] ) ) {
-                $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 ] = '';
-                }
-            }
-        }
-
-        /**
-         * Dissolve font property
-         *
-         * @param string $str_value
-         *
-         * @return array
-         * @version 1.3
-         * @see     merge_font()
-         */
-        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' );
-            $font_style        = array( 'normal', 'italic', 'oblique' );
-            $important         = '';
-            $return            = array( 'font-style' => null, 'font-variant' => null, 'font-weight' => null, 'font-size' => null, 'line-height' => null, 'font-family' => null );
-
-            if ( $this->parser->is_important( $str_value ) ) {
-                $important = '!important';
-                $str_value = $this->parser->gvw_important( $str_value );
-            }
-
-            $have[ 'style' ]   = false;
-            $have[ 'variant' ] = false;
-            $have[ 'weight' ]  = false;
-            $have[ 'size' ]    = false;
-            // Detects if font-family consists of several words w/o quotes
-            $multiwords = false;
-
-            // Workaround with multiple font-family
-            $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++ ) {
-                if ( $have[ 'weight' ] === false && in_array( $str_value[ 0 ][ $j ], $font_weight ) ) {
-                    $return[ 'font-weight' ] = $str_value[ 0 ][ $j ];
-                    $have[ 'weight' ]        = true;
-                }
-                elseif ( $have[ 'variant' ] === false && in_array( $str_value[ 0 ][ $j ], $font_variant ) ) {
-                    $return[ 'font-variant' ] = $str_value[ 0 ][ $j ];
-                    $have[ 'variant' ]        = true;
-                }
-                elseif ( $have[ 'style' ] === false && in_array( $str_value[ 0 ][ $j ], $font_style ) ) {
-                    $return[ 'font-style' ] = $str_value[ 0 ][ $j ];
-                    $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                  = $this->explode_ws( '/', trim( $str_value[ 0 ][ $j ] ) );
-                    $return[ 'font-size' ] = $size[ 0 ];
-                    if ( isset( $size[ 1 ] ) ) {
-                        $return[ 'line-height' ] = $size[ 1 ];
-                    }
-                    else {
-                        $return[ 'line-height' ] = ''; // don't add 'normal' !
-                    }
-                    $have[ 'size' ] = true;
-                }
-                else {
-                    if ( isset( $return[ 'font-family' ] ) ) {
-                        $return[ 'font-family' ] .= ' ' . $str_value[ 0 ][ $j ];
-                        $multiwords              = true;
-                    }
-                    else {
-                        $return[ 'font-family' ] = $str_value[ 0 ][ $j ];
-                    }
-                }
-            }
-            // add quotes if we have several qords in font-family
-            if ( $multiwords !== false ) {
-                $return[ 'font-family' ] = '"' . $return[ 'font-family' ] . '"';
-            }
-            $i = 1;
-            while ( isset( $str_value[ $i ] ) ) {
-                $return[ 'font-family' ] .= ',' . trim( $str_value[ $i ] );
-                $i++;
-            }
-
-            // Fix for 100 and more font-size
-            if ( $have[ 'size' ] === false && isset( $return[ 'font-weight' ] ) &&
-                is_numeric( $return[ 'font-weight' ][ 0 ] ) ) {
-                $return[ 'font-size' ] = $return[ 'font-weight' ];
-                unset( $return[ 'font-weight' ] );
-            }
-
-            foreach ( $font_prop_default as $font_prop => $default_value ) {
-                if ( $return[ $font_prop ] !== null ) {
-                    $return[ $font_prop ] = $return[ $font_prop ] . $important;
-                }
-                else {
-                    $return[ $font_prop ] = $default_value . $important;
-                }
-            }
-            return $return;
-        }
-
-        /**
-         * Dissolve background property
-         *
-         * @param string $str_value
-         *
-         * @return array
-         * @version 1.0
-         * @see     merge_bg()
-         * @todo    full CSS 3 compliance
-         */
-        public function dissolve_short_bg( $str_value ) {
-            // don't try to explose background gradient !
-            if ( stripos( $str_value, 'gradient(' ) !== false ) {
-                return array( 'background' => $str_value );
-            }
-
-            $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' );
-            $clip                    = array( 'border', 'padding' );
-            $origin                  = array( 'border', 'padding', 'content' );
-            $pos                     = array( 'top', 'center', 'bottom', 'left', 'right' );
-            $important               = '';
-            $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 ( $this->parser->is_important( $str_value ) ) {
-                $important = ' !important';
-                $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;
-                $have[ 'pos' ]   = false;
-                $have[ 'color' ] = false;
-                $have[ 'bg' ]    = false;
-
-                if ( is_array( $str_value[ $i ] ) ) {
-                    $str_value[ $i ] = $str_value[ $i ][ 0 ];
-                }
-                $str_value[ $i ] = $this->explode_ws( ' ', trim( $str_value[ $i ] ) );
-
-                for ( $j = 0; $j < count( $str_value[ $i ] ); $j++ ) {
-                    if ( $have[ 'bg' ] === false && ( substr( $str_value[ $i ][ $j ], 0, 4 ) === 'url(' || $str_value[ $i ][ $j ] === 'none' ) ) {
-                        $return[ 'background-image' ] .= $str_value[ $i ][ $j ] . ',';
-                        $have[ 'bg' ]                 = true;
-                    }
-                    elseif ( in_array( $str_value[ $i ][ $j ], $repeat, true ) ) {
-                        $return[ 'background-repeat' ] .= $str_value[ $i ][ $j ] . ',';
-                    }
-                    elseif ( in_array( $str_value[ $i ][ $j ], $attachment, true ) ) {
-                        $return[ 'background-attachment' ] .= $str_value[ $i ][ $j ] . ',';
-                    }
-                    elseif ( in_array( $str_value[ $i ][ $j ], $clip, true ) && ! $have[ 'clip' ] ) {
-                        $return[ 'background-clip' ] .= $str_value[ $i ][ $j ] . ',';
-                        $have[ 'clip' ]              = true;
-                    }
-                    elseif ( in_array( $str_value[ $i ][ $j ], $origin, true ) ) {
-                        $return[ 'background-origin' ] .= $str_value[ $i ][ $j ] . ',';
-                    }
-                    elseif ( $str_value[ $i ][ $j ][ 0 ] === '(' ) {
-                        $return[ 'background-size' ] .= substr( $str_value[ $i ][ $j ], 1, -1 ) . ',';
-                    }
-                    elseif ( in_array( $str_value[ $i ][ $j ], $pos, true ) || is_numeric( $str_value[ $i ][ $j ][ 0 ] ) || $str_value[ $i ][ $j ][ 0 ] === null || $str_value[ $i ][ $j ][ 0 ] === '-' || $str_value[ $i ][ $j ][ 0 ] === '.' ) {
-                        $return[ 'background-position' ] .= $str_value[ $i ][ $j ];
-                        if ( ! $have[ 'pos' ] ) {
-                            $return[ 'background-position' ] .= ' ';
-                        }
-                        else {
-                            $return[ 'background-position' ] .= ',';
-                        }
-                        $have[ 'pos' ] = true;
-                    }
-                    elseif ( ! $have[ 'color' ] ) {
-                        $return[ 'background-color' ] .= $str_value[ $i ][ $j ] . ',';
-                        $have[ 'color' ]              = true;
-                    }
-                }
-            }
-
-            foreach ( $background_prop_default as $bg_prop => $default_value ) {
-                if ( $return[ $bg_prop ] !== null ) {
-                    $return[ $bg_prop ] = substr( $return[ $bg_prop ], 0, -1 ) . $important;
-                }
-                else {
-                    $return[ $bg_prop ] = $default_value . $important;
-                }
-            }
-            return $return;
-        }
-
-        /**
-         * Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;...
-         *
-         * @param string     $property
-         * @param string     $value
-         * @param array|null $shorthands
-         *
-         * @return array
-         * @version 1.0
-         * @see     merge_4value_shorthands()
-         */
-        public function dissolve_4value_shorthands( $property, $value, $shorthands = null ) {
-            if ( is_null( $shorthands ) ) {
-                $shorthands = &$this->parser->data[ 'csstidy' ][ 'shorthands' ];
-            }
-            if ( ! is_array( $shorthands[ $property ] ) ) {
-                $return[ $property ] = $value;
-                return $return;
-            }
-
-            $important = '';
-            if ( $this->parser->is_important( $value ) ) {
-                $value     = $this->parser->gvw_important( $value );
-                $important = '!important';
-            }
-            $values = explode( ' ', $value );
-
-
-            $return = array();
-            if ( count( $values ) == 4 ) {
-                for ( $i = 0; $i < 4; $i++ ) {
-                    $return[ $shorthands[ $property ][ $i ] ] = $values[ $i ] . $important;
-                }
-            }
-            elseif ( count( $values ) == 3 ) {
-                $return[ $shorthands[ $property ][ 0 ] ] = $values[ 0 ] . $important;
-                $return[ $shorthands[ $property ][ 1 ] ] = $values[ 1 ] . $important;
-                $return[ $shorthands[ $property ][ 3 ] ] = $values[ 1 ] . $important;
-                $return[ $shorthands[ $property ][ 2 ] ] = $values[ 2 ] . $important;
-            }
-            elseif ( count( $values ) == 2 ) {
-                for ( $i = 0; $i < 4; $i++ ) {
-                    $return[ $shorthands[ $property ][ $i ] ] = ( ( $i % 2 != 0 ) ) ? $values[ 1 ] . $important : $values[ 0 ] . $important;
-                }
-            }
-            else {
-                for ( $i = 0; $i < 4; $i++ ) {
-                    $return[ $shorthands[ $property ][ $i ] ] = $values[ 0 ] . $important;
-                }
-            }
-
-            return $return;
-        }
-
-        /**
-         * Optimises a sub-value
-         * @access  public
-         * @version 1.0
-         */
-        public function subvalue() {
-            $replace_colors = &$this->parser->data[ 'csstidy' ][ 'replace_colors' ];
-
-            $this->sub_value = trim( $this->sub_value );
-            if ( $this->sub_value == '' ) { // caution : '0'
-                return;
-            }
-
-            $important = '';
-            if ( $this->parser->is_important( $this->sub_value ) ) {
-                $important = '!important';
-            }
-            $this->sub_value = $this->parser->gvw_important( $this->sub_value );
-
-            // Compress font-weight
-            if ( $this->property === 'font-weight' && $this->parser->get_cfg( 'compress_font-weight' ) ) {
-                if ( $this->sub_value === 'bold' ) {
-                    $this->sub_value = '700';
-                    $this->parser->log( 'Optimised font-weight: Changed "bold" to "700"', 'Information' );
-                }
-                elseif ( $this->sub_value === 'normal' ) {
-                    $this->sub_value = '400';
-                    $this->parser->log( 'Optimised font-weight: Changed "normal" to "400"', 'Information' );
-                }
-            }
-
-            $temp = $this->compress_numbers( $this->sub_value );
-            if ( strcasecmp( $temp, $this->sub_value ) !== 0 ) {
-                if ( strlen( $temp ) > strlen( $this->sub_value ) ) {
-                    $this->parser->log( 'Fixed invalid number: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Warning' );
-                }
-                else {
-                    $this->parser->log( 'Optimised number: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Information' );
-                }
-                $this->sub_value = $temp;
-            }
-            if ( $this->parser->get_cfg( 'compress_colors' ) ) {
-                $temp = $this->cut_color( $this->sub_value );
-                if ( $temp !== $this->sub_value ) {
-                    if ( isset( $replace_colors[ $this->sub_value ] ) ) {
-                        $this->parser->log( 'Fixed invalid color name: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Warning' );
-                    }
-                    else {
-                        $this->parser->log( 'Optimised color: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Information' );
-                    }
-                    $this->sub_value = $temp;
-                }
-            }
-            $this->sub_value .= $important;
-        }
-
-        /**
-         * Compresses numbers (ie. 1.0 becomes 1 or 1.100 becomes 1.1 )
-         *
-         * @param string $subvalue
-         *
-         * @return string
-         * @version 1.2
-         */
-        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...;
-            if ( $this->property === 'font' ) {
-                $temp = explode( '/', $subvalue );
-            }
-            else {
-                $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
-                $number = $this->AnalyseCssNumber( $temp[ $l ] );
-                if ( $number === false ) {
-                    return $subvalue;
-                }
-
-                // Fix bad colors
-                if ( in_array( $this->property, $color_values ) ) {
-                    $temp[ $l ] = '#' . $temp[ $l ];
-                    continue;
-                }
-
-                if ( abs( $number[ 0 ] ) > 0 ) {
-                    if ( $number[ 1 ] == '' && in_array( $this->property, $unit_values, true ) ) {
-                        $number[ 1 ] = 'px';
-                    }
-                }
-                elseif ( $number[ 1 ] != 's' && $number[ 1 ] != 'ms' ) {
-                    $number[ 1 ] = '';
-                }
-
-                $temp[ $l ] = $number[ 0 ] . $number[ 1 ];
-            }
-
-            return ( ( count( $temp ) > 1 ) ? $temp[ 0 ] . '/' . $temp[ 1 ] : $temp[ 0 ] );
-        }
-
-        /**
-         * Checks if a given string is a CSS valid number. If it is,
-         * an array containing the value and unit is returned
-         *
-         * @param string $string
-         *
-         * @return array ('unit' if unit is found or '' if no unit exists, number value) or false if no number
-         */
-        public function AnalyseCssNumber( $string ) {
-            // most simple checks first
-            if ( strlen( $string ) == 0 || ctype_alpha( $string[ 0 ] ) ) {
-                return false;
-            }
-
-            $units  = &$this->parser->data[ 'csstidy' ][ 'units' ];
-            $return = array( 0, '' );
-
-            $return[ 0 ] = floatval( $string );
-            if ( abs( $return[ 0 ] ) > 0 && abs( $return[ 0 ] ) < 1 ) {
-                if ( $return[ 0 ] < 0 ) {
-                    $return[ 0 ] = '-' . ltrim( substr( $return[ 0 ], 1 ), '0' );
-                }
-                else {
-                    $return[ 0 ] = ltrim( $return[ 0 ], '0' );
-                }
-            }
-
-            // Look for unit and split from value if exists
-            foreach ( $units as $unit ) {
-                $expectUnitAt = strlen( $string ) - strlen( $unit );
-                if ( ! ( $unitInString = stristr( $string, $unit ) ) ) { // mb_strpos() fails with "false"
-                    continue;
-                }
-                $actualPosition = strpos( $string, $unitInString );
-                if ( $expectUnitAt === $actualPosition ) {
-                    $return[ 1 ] = $unit;
-                    $string      = substr( $string, 0, -strlen( $unit ) );
-                    break;
-                }
-            }
-            if ( ! is_numeric( $string ) ) {
-                return false;
-            }
-            return $return;
-        }
-
-        /**
-         * Color compression function. Converts all rgb() values to #-values and uses the short-form if possible. Also replaces 4 color names by #-values.
-         *
-         * @param string $color
-         *
-         * @return string
-         * @version 1.1
-         */
-        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 || strncmp( $color, '"', 1 ) == 0 ) {
-                return $color;
-            }
-
-            /* expressions complexes de type gradient */
-            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 ) {
-                    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 );
-                    }
-                }
-                return $color;
-            }
-
-            // rgb(0,0,0) -> #000000 (or #000 in this case later)
-            if ( strncasecmp( $color, 'rgb(', 4 ) == 0 ) {
-                $color_tmp = substr( $color, 4, strlen( $color ) - 5 );
-                $color_tmp = explode( ',', $color_tmp );
-                for ( $i = 0; $i < count( $color_tmp ); $i++ ) {
-                    $color_tmp[ $i ] = trim( $color_tmp[ $i ] );
-                    if ( substr( $color_tmp[ $i ], -1 ) === '%' ) {
-                        $color_tmp[ $i ] = round( ( 255 * $color_tmp[ $i ] ) / 100 );
-                    }
-                    if ( $color_tmp[ $i ] > 255 ) {
-                        $color_tmp[ $i ] = 255;
-                    }
-                }
-                $color = '#';
-                for ( $i = 0; $i < 3; $i++ ) {
-                    if ( $color_tmp[ $i ] < 16 ) {
-                        $color .= '0' . dechex( $color_tmp[ $i ] );
-                    }
-                    else {
-                        $color .= dechex( $color_tmp[ $i ] );
-                    }
-                }
-            }
-
-            // Fix bad color names
-            if ( isset( $replace_colors[ strtolower( $color ) ] ) ) {
-                $color = $replace_colors[ strtolower( $color ) ];
-            }
-
-            // #aabbcc -> #abc
-            if ( strlen( $color ) == 7 ) {
-                $color_temp = strtolower( $color );
-                if ( $color_temp[ 0 ] === '#' && $color_temp[ 1 ] == $color_temp[ 2 ] && $color_temp[ 3 ] == $color_temp[ 4 ] && $color_temp[ 5 ] == $color_temp[ 6 ] ) {
-                    $color = '#' . $color[ 1 ] . $color[ 3 ] . $color[ 5 ];
-                }
-            }
-
-            switch ( strtolower( $color ) ) {
-                /* color name -> hex code */
-                case 'black':
-                    return '#000';
-                case 'fuchsia':
-                    return '#f0f';
-                case 'white':
-                    return '#fff';
-                case 'yellow':
-                    return '#ff0';
-
-                /* hex code -> color name */
-                case '#800000':
-                    return 'maroon';
-                case '#ffa500':
-                    return 'orange';
-                case '#808000':
-                    return 'olive';
-                case '#800080':
-                    return 'purple';
-                case '#008000':
-                    return 'green';
-                case '#000080':
-                    return 'navy';
-                case '#008080':
-                    return 'teal';
-                case '#c0c0c0':
-                    return 'silver';
-                case '#808080':
-                    return 'gray';
-                case '#f00':
-                    return 'red';
-            }
-
-            return $color;
-        }
-
-        /**
-         * Reversing margin shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_margin( $value ) {
-            return $this->reverse_left_and_right_4value_shorthands( 'margin', $value );
-        }
-
-        /**
-         * Reversing 4 values shorthands properties
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_4value_shorthands( $property, $value ) {
-            $shorthands = &$this->parser->data[ 'csstidy' ][ 'shorthands' ];
-            if ( isset( $shorthands[ $property ] ) ) {
-                $property_right = $shorthands[ $property ][ 1 ];
-                $property_left  = $shorthands[ $property ][ 3 ];
-                $v              = $this->dissolve_4value_shorthands( $property, $value );
-                if ( $v[ $property_left ] !== $v[ $property_right ] ) {
-                    $r                    = $v[ $property_right ];
-                    $v[ $property_right ] = $v[ $property_left ];
-                    $v[ $property_left ]  = $r;
-                    $v                    = $this->merge_4value_shorthands( $v );
-                    if ( isset( $v[ $property ] ) ) {
-                        return $v[ $property ];
-                    }
-                }
-            }
-            return $value;
-        }
-
-        /**
-         * Reversing padding shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_padding( $value ) {
-            return $this->reverse_left_and_right_4value_shorthands( 'padding', $value );
-        }
-
-        /**
-         * Reversing border-color shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_border_color( $value ) {
-            return $this->reverse_left_and_right_4value_shorthands( 'border-color', $value );
-        }
-
-        /**
-         * Reversing border-style shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_border_style( $value ) {
-            return $this->reverse_left_and_right_4value_shorthands( 'border-style', $value );
-        }
-
-        /**
-         * Reversing border-width shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_border_width( $value ) {
-            return $this->reverse_left_and_right_4value_shorthands( 'border-width', $value );
-        }
-
-        /**
-         * Reversing border-radius shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_border_radius( $value ) {
-            return $this->reverse_left_and_right_4value_radius_shorthands( 'border-radius', $value );
-        }
-
-        /**
-         * Reversing 4 values radius shorthands properties
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_4value_radius_shorthands( $property, $value ) {
-            $shorthands = &$this->parser->data[ 'csstidy' ][ 'radius_shorthands' ];
-            if ( isset( $shorthands[ $property ] ) ) {
-                $v = $this->dissolve_4value_radius_shorthands( $property, $value );
-                if ( $v[ $shorthands[ $property ][ 0 ] ] !== $v[ $shorthands[ $property ][ 1 ] ]
-                    or $v[ $shorthands[ $property ][ 2 ] ] !== $v[ $shorthands[ $property ][ 3 ] ] ) {
-                    $r = array(
-                        $shorthands[ $property ][ 0 ] => $v[ $shorthands[ $property ][ 1 ] ],
-                        $shorthands[ $property ][ 1 ] => $v[ $shorthands[ $property ][ 0 ] ],
-                        $shorthands[ $property ][ 2 ] => $v[ $shorthands[ $property ][ 3 ] ],
-                        $shorthands[ $property ][ 3 ] => $v[ $shorthands[ $property ][ 2 ] ],
-                    );
-                    $v = $this->merge_4value_radius_shorthands( $r );
-                    if ( isset( $v[ $property ] ) ) {
-                        return $v[ $property ];
-                    }
-                }
-            }
-            return $value;
-        }
-
-        /**
-         * Dissolves radius properties like
-         * border-radius:10px 10px 10px / 1px 2px
-         * to border-top-left:10px 1px;border-top-right:10px 2x;...
-         *
-         * @param string $property
-         * @param string $value
-         *
-         * @return array
-         * @version 1.0
-         * @use     dissolve_4value_shorthands()
-         * @see     merge_4value_radius_shorthands()
-         */
-        public function dissolve_4value_radius_shorthands( $property, $value ) {
-            $shorthands = &$this->parser->data[ 'csstidy' ][ 'radius_shorthands' ];
-            if ( ! is_array( $shorthands[ $property ] ) ) {
-                $return[ $property ] = $value;
-                return $return;
-            }
-
-            if ( strpos( $value, '/' ) !== false ) {
-                $values = $this->explode_ws( '/', $value );
-                if ( count( $values ) == 2 ) {
-                    $r[ 0 ] = $this->dissolve_4value_shorthands( $property, trim( $values[ 0 ] ), $shorthands );
-                    $r[ 1 ] = $this->dissolve_4value_shorthands( $property, trim( $values[ 1 ] ), $shorthands );
-                    $return = array();
-                    foreach ( $r[ 0 ] as $p => $v ) {
-                        $return[ $p ] = $v;
-                        if ( $r[ 1 ][ $p ] !== $v ) {
-                            $return[ $p ] .= ' ' . $r[ 1 ][ $p ];
-                        }
-                    }
-                    return $return;
-                }
-            }
-
-            $return = $this->dissolve_4value_shorthands( $property, $value, $shorthands );
-            return $return;
-        }
-
-        /**
-         * Reversing border-radius shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right__moz_border_radius( $value ) {
-            return $this->reverse_left_and_right_4value_radius_shorthands( 'border-radius', $value );
-        }
-
-        /**
-         * Reversing border-radius shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right__webkit_border_radius( $value ) {
-            return $this->reverse_left_and_right_4value_radius_shorthands( 'border-radius', $value );
-        }
-
-
-        /**
-         * Reversing background shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_background( $value ) {
-            $values = $this->dissolve_short_bg( $value );
-            if ( isset( $values[ 'background-position' ] ) and $values[ 'background-position' ] ) {
-                $v = $this->reverse_left_and_right_background_position( $values[ 'background-position' ] );
-                if ( $v !== $values[ 'background-position' ] ) {
-                    if ( $value == $values[ 'background-position' ] ) {
-                        return $v;
-                    }
-                    else {
-                        $values[ 'background-position' ] = $v;
-                        $x                               = $this->merge_bg( $values );
-                        if ( isset( $x[ 'background' ] ) ) {
-                            return $x[ 'background' ];
-                        }
-                    }
-                }
-            }
-            return $value;
-        }
-
-        /**
-         * Reversing background position shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_background_position( $value ) {
-            // multiple background case
-            if ( strpos( $value, ',' ) !== false ) {
-                $values = $this->explode_ws( ',', $value );
-                if ( count( $values ) > 1 ) {
-                    foreach ( $values as $k => $v ) {
-                        $values[ $k ] = $this->reverse_left_and_right_background_position( $v );
-                    }
-                    return implode( ',', $values );
-                }
-            }
-
-            // if no explicit left or right value
-            if ( stripos( $value, 'left' ) === false and stripos( $value, 'right' ) === false ) {
-                $values = $this->explode_ws( ' ', trim( $value ) );
-                $values = array_map( 'trim', $values );
-                $values = array_filter( $values, function ( $v ) {
-                    return strlen( $v );
-                } );
-                $values = array_values( $values );
-                if ( count( $values ) == 1 ) {
-                    if ( in_array( $value, array( 'center', 'top', 'bottom', 'inherit', 'initial', 'unset' ) ) ) {
-                        return $value;
-                    }
-                    return "left $value";
-                }
-                if ( $values[ 1 ] == 'top' or $values[ 1 ] == 'bottom' ) {
-                    if ( $values[ 0 ] === 'center' ) {
-                        return $value;
-                    }
-                    return 'left ' . implode( ' ', $values );
-                }
-                else {
-                    $last = array_pop( $values );
-                    if ( $last === 'center' ) {
-                        return $value;
-                    }
-                    return implode( ' ', $values ) . ' left ' . $last;
-                }
-            }
-
-            return $value;
-        }
-
-        /**
-         * Reversing background position shorthands
-         *
-         * @param string $value
-         *
-         * @return string
-         */
-        public function reverse_left_and_right_background_position_x( $value ) {
-            return $this->reverse_left_and_right_background_position( $value );
-        }
-
-    }
+
+            $temp[$l] = $number[0] . $number[1];
+        }
+
+        return ((count($temp) > 1) ? $temp[0] . '/' . $temp[1] : $temp[0]);
+    }
+
+    /**
+     * Checks if a given string is a CSS valid number. If it is,
+     * an array containing the value and unit is returned
+     * @param string $string
+     * @return array ('unit' if unit is found or '' if no unit exists, number value) or false if no number
+     */
+    public function AnalyseCssNumber($string) {
+        // most simple checks first
+        if (strlen($string) == 0 || ctype_alpha($string[0])) {
+            return false;
+        }
+
+        $units = & $this->parser->data['csstidy']['units'];
+        $return = array(0, '');
+
+        $return[0] = floatval($string);
+        if (abs($return[0]) > 0 && abs($return[0]) < 1) {
+            if ($return[0] < 0) {
+                $return[0] = '-' . ltrim(substr($return[0], 1), '0');
+            } else {
+                $return[0] = ltrim($return[0], '0');
+            }
+        }
+
+        // Look for unit and split from value if exists
+        foreach ($units as $unit) {
+            $expectUnitAt = strlen($string) - strlen($unit);
+            if (!($unitInString = stristr($string, $unit))) { // mb_strpos() fails with "false"
+                continue;
+            }
+            $actualPosition = strpos($string, $unitInString);
+            if ($expectUnitAt === $actualPosition) {
+                $return[1] = $unit;
+                $string = substr($string, 0, - strlen($unit));
+                break;
+            }
+        }
+        if (!is_numeric($string)) {
+            return false;
+        }
+        return $return;
+    }
+
+    /**
+     * Merges selectors with same properties. Example: a{color:red} b{color:red} -> a,b{color:red}
+     * Very basic and has at least one bug. Hopefully there is a replacement soon.
+     * @param array $array
+     * @return array
+     * @access public
+     * @version 1.2
+     */
+    public function merge_selectors(&$array) {
+        $css = $array;
+        foreach ($css as $key => $value) {
+            if (!isset($css[$key])) {
+                continue;
+            }
+            $newsel = '';
+
+            // Check if properties also exist in another selector
+            $keys = array();
+            // PHP bug (?) without $css = $array; here
+            foreach ($css as $selector => $vali) {
+                if ($selector == $key) {
+                    continue;
+                }
+
+                if ($css[$key] === $vali) {
+                    $keys[] = $selector;
+                }
+            }
+
+            if (!empty($keys)) {
+                $newsel = $key;
+                unset($css[$key]);
+                foreach ($keys as $selector) {
+                    unset($css[$selector]);
+                    $newsel .= ',' . $selector;
+                }
+                $css[$newsel] = $value;
+            }
+        }
+        $array = $css;
+    }
+
+    /**
+     * Removes invalid selectors and their corresponding rule-sets as
+     * defined by 4.1.7 in REC-CSS2. This is a very rudimentary check
+     * and should be replaced by a full-blown parsing algorithm or
+     * regular expression
+     * @version 1.4
+     */
+    public function discard_invalid_selectors(&$array) {
+        $invalid = array('+' => true, '~' => true, ',' => true, '>' => true);
+        foreach ($array as $selector => $decls) {
+            $ok = true;
+            $selectors = array_map('trim', explode(',', $selector));
+            foreach ($selectors as $s) {
+                $simple_selectors = preg_split('/\s*[+>~\s]\s*/', $s);
+                foreach ($simple_selectors as $ss) {
+                    if ($ss === '')
+                        $ok = false;
+                    // could also check $ss for internal structure,
+                    // but that probably would be too slow
+                }
+            }
+            if (!$ok)
+                unset($array[$selector]);
+        }
+    }
+
+    /**
+     * Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;...
+     * @param string $property
+     * @param string $value
+     * @param array|null $shorthands
+     * @return array
+     * @version 1.0
+     * @see merge_4value_shorthands()
+     */
+    public function dissolve_4value_shorthands($property, $value, $shorthands = null) {
+        if (is_null($shorthands)) {
+            $shorthands = & $this->parser->data['csstidy']['shorthands'];
+        }
+        if (!is_array($shorthands[$property])) {
+            $return[$property] = $value;
+            return $return;
+        }
+
+        $important = '';
+        if ($this->parser->is_important($value)) {
+            $value = $this->parser->gvw_important($value);
+            $important = '!important';
+        }
+        $values = explode(' ', $value);
+
+
+        $return = array();
+        if (count($values) == 4) {
+            for ($i = 0; $i < 4; $i++) {
+                $return[$shorthands[$property][$i]] = $values[$i] . $important;
+            }
+        } elseif (count($values) == 3) {
+            $return[$shorthands[$property][0]] = $values[0] . $important;
+            $return[$shorthands[$property][1]] = $values[1] . $important;
+            $return[$shorthands[$property][3]] = $values[1] . $important;
+            $return[$shorthands[$property][2]] = $values[2] . $important;
+        } elseif (count($values) == 2) {
+            for ($i = 0; $i < 4; $i++) {
+                $return[$shorthands[$property][$i]] = (($i % 2 != 0)) ? $values[1] . $important : $values[0] . $important;
+            }
+        } else {
+            for ($i = 0; $i < 4; $i++) {
+                $return[$shorthands[$property][$i]] = $values[0] . $important;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Dissolves radius properties like
+     * border-radius:10px 10px 10px / 1px 2px
+     * to border-top-left:10px 1px;border-top-right:10px 2x;...
+     * @param string $property
+     * @param string $value
+     * @return array
+     * @version 1.0
+     * @use dissolve_4value_shorthands()
+     * @see merge_4value_radius_shorthands()
+     */
+    public function dissolve_4value_radius_shorthands($property, $value) {
+        $shorthands = & $this->parser->data['csstidy']['radius_shorthands'];
+        if (!is_array($shorthands[$property])) {
+            $return[$property] = $value;
+            return $return;
+        }
+
+        if (strpos($value, '/') !== false) {
+            $values = $this->explode_ws('/', $value);
+            if (count($values) == 2) {
+                $r[0] = $this->dissolve_4value_shorthands($property, trim($values[0]), $shorthands);
+                $r[1] = $this->dissolve_4value_shorthands($property, trim($values[1]), $shorthands);
+                $return = array();
+                foreach ($r[0] as $p=>$v) {
+                    $return[$p] = $v;
+                    if ($r[1][$p] !== $v) {
+                        $return[$p] .= ' ' . $r[1][$p];
+                    }
+                }
+                return $return;
+            }
+        }
+
+        $return = $this->dissolve_4value_shorthands($property, $value, $shorthands);
+        return $return;
+    }
+
+    /**
+     * Explodes a string as explode() does, however, not if $sep is escaped or within a string.
+     * @param string $sep seperator
+     * @param string $string
+     * @param bool $explode_in_parenthesis
+     * @return array
+     * @version 1.0
+     */
+    public function explode_ws($sep, $string, $explode_in_parenthesis = false) {
+        $status = 'st';
+        $to = '';
+
+        $output = array(
+            0 => '',
+        );
+        $num = 0;
+        for ($i = 0, $len = strlen($string); $i < $len; $i++) {
+            switch ($status) {
+                case 'st':
+                    if ($string[$i] == $sep && !$this->parser->escaped($string, $i)) {
+                        ++$num;
+                    } elseif ($string[$i] === '"' || $string[$i] === '\'' || (!$explode_in_parenthesis && $string[$i] === '(') && !$this->parser->escaped($string, $i)) {
+                        $status = 'str';
+                        $to = ($string[$i] === '(') ? ')' : $string[$i];
+                        (isset($output[$num])) ? $output[$num] .= $string[$i] : $output[$num] = $string[$i];
+                    } else {
+                        (isset($output[$num])) ? $output[$num] .= $string[$i] : $output[$num] = $string[$i];
+                    }
+                    break;
+
+                case 'str':
+                    if ($string[$i] == $to && !$this->parser->escaped($string, $i)) {
+                        $status = 'st';
+                    }
+                    (isset($output[$num])) ? $output[$num] .= $string[$i] : $output[$num] = $string[$i];
+                    break;
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()
+     * @param array $array
+     * @param array|null $shorthands
+     * @return array
+     * @version 1.2
+     * @see dissolve_4value_shorthands()
+     */
+    public function merge_4value_shorthands($array, $shorthands = null) {
+        $return = $array;
+        if (is_null($shorthands)) {
+            $shorthands = & $this->parser->data['csstidy']['shorthands'];
+        }
+
+        foreach ($shorthands as $key => $value) {
+            if ($value !== 0 && isset($array[$value[0]]) && isset($array[$value[1]])
+                            && isset($array[$value[2]]) && isset($array[$value[3]])) {
+                $return[$key] = '';
+
+                $important = '';
+                for ($i = 0; $i < 4; $i++) {
+                    $val = $array[$value[$i]];
+                    if ($this->parser->is_important($val)) {
+                        $important = '!important';
+                        $return[$key] .= $this->parser->gvw_important($val) . ' ';
+                    } else {
+                        $return[$key] .= $val . ' ';
+                    }
+                    unset($return[$value[$i]]);
+                }
+                $return[$key] = $this->shorthand(trim($return[$key] . $important));
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()
+     * @param array $array
+     * @return array
+     * @version 1.2
+     * @use merge_4value_shorthands()
+     * @see dissolve_4value_radius_shorthands()
+     */
+    public function merge_4value_radius_shorthands($array) {
+        $return = $array;
+        $shorthands = & $this->parser->data['csstidy']['radius_shorthands'];
+
+        foreach ($shorthands as $key => $value) {
+            if (isset($array[$value[0]]) && isset($array[$value[1]])
+                            && isset($array[$value[2]]) && isset($array[$value[3]]) && $value !== 0) {
+                $return[$key] = '';
+                $a = array();
+                for ($i = 0; $i < 4; $i++) {
+                    $v = $this->explode_ws(' ', trim($array[$value[$i]]));
+                    $a[0][$value[$i]] = reset($v);
+                    $a[1][$value[$i]] = end($v);
+                }
+                $r = array();
+                $r[0] = $this->merge_4value_shorthands($a[0], $shorthands);
+                $r[1] = $this->merge_4value_shorthands($a[1], $shorthands);
+
+                if (isset($r[0][$key]) and isset($r[1][$key])) {
+                    $return[$key] = $r[0][$key];
+                    if ($r[1][$key] !== $r[0][$key]) {
+                        $return[$key] .= ' / ' . $r[1][$key];
+                    }
+                    for ($i = 0; $i < 4; $i++) {
+                        unset($return[$value[$i]]);
+                    }
+                }
+            }
+        }
+        return $return;
+    }
+    /**
+     * Dissolve background property
+     * @param string $str_value
+     * @return array
+     * @version 1.0
+     * @see merge_bg()
+     * @todo full CSS 3 compliance
+     */
+    public function dissolve_short_bg($str_value) {
+        // don't try to explose background gradient !
+        if (stripos($str_value, 'gradient(')!== false)
+            return array('background'=>$str_value);
+
+        $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');
+        $clip = array('border', 'padding');
+        $origin = array('border', 'padding', 'content');
+        $pos = array('top', 'center', 'bottom', 'left', 'right');
+        $important = '';
+        $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 ($this->parser->is_important($str_value)) {
+            $important = ' !important';
+            $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;
+            $have['pos'] = false;
+            $have['color'] = false;
+            $have['bg'] = false;
+
+            if (is_array($str_value[$i])) {
+                $str_value[$i] = $str_value[$i][0];
+            }
+            $str_value[$i] = $this->explode_ws(' ', trim($str_value[$i]));
+
+            for ($j = 0; $j < count($str_value[$i]); $j++) {
+                if ($have['bg'] === false && (substr($str_value[$i][$j], 0, 4) === 'url(' || $str_value[$i][$j] === 'none')) {
+                    $return['background-image'] .= $str_value[$i][$j] . ',';
+                    $have['bg'] = true;
+                } elseif (in_array($str_value[$i][$j], $repeat, true)) {
+                    $return['background-repeat'] .= $str_value[$i][$j] . ',';
+                } elseif (in_array($str_value[$i][$j], $attachment, true)) {
+                    $return['background-attachment'] .= $str_value[$i][$j] . ',';
+                } elseif (in_array($str_value[$i][$j], $clip, true) && !$have['clip']) {
+                    $return['background-clip'] .= $str_value[$i][$j] . ',';
+                    $have['clip'] = true;
+                } elseif (in_array($str_value[$i][$j], $origin, true)) {
+                    $return['background-origin'] .= $str_value[$i][$j] . ',';
+                } elseif ($str_value[$i][$j][0] === '(') {
+                    $return['background-size'] .= substr($str_value[$i][$j], 1, -1) . ',';
+                } elseif (in_array($str_value[$i][$j], $pos, true) || is_numeric($str_value[$i][$j][0]) || $str_value[$i][$j][0] === null || $str_value[$i][$j][0] === '-' || $str_value[$i][$j][0] === '.') {
+                    $return['background-position'] .= $str_value[$i][$j];
+                    if (!$have['pos'])
+                        $return['background-position'] .= ' '; else
+                        $return['background-position'].= ',';
+                    $have['pos'] = true;
+                } elseif (!$have['color']) {
+                    $return['background-color'] .= $str_value[$i][$j] . ',';
+                    $have['color'] = true;
+                }
+            }
+        }
+
+        foreach ($background_prop_default as $bg_prop => $default_value) {
+            if ($return[$bg_prop] !== null) {
+                $return[$bg_prop] = substr($return[$bg_prop], 0, -1) . $important;
+            }
+            else
+                $return[$bg_prop] = $default_value . $important;
+        }
+        return $return;
+    }
+
+    /**
+     * Merges all background properties
+     * @param array $input_css
+     * @return array
+     * @version 1.0
+     * @see dissolve_short_bg()
+     * @todo full CSS 3 compliance
+     */
+    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($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 = @$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']) && $input_css['background'])
+            return $input_css;
+
+        for ($i = 0; $i < $number_of_values; $i++) {
+            foreach ($background_prop_default as $bg_property => $default_value) {
+                // Skip if property does not exist
+                if (!isset($input_css[$bg_property])) {
+                    continue;
+                }
+
+                $cur_value = $input_css[$bg_property];
+                // skip all optimisation if gradient() somewhere
+                if (stripos($cur_value, 'gradient(') !== false)
+                    return $input_css;
+
+                // Skip some properties if there is no background image
+                if ((!isset($bg_img_array[$i]) || $bg_img_array[$i] === 'none')
+                                && ($bg_property === 'background-size' || $bg_property === 'background-position'
+                                || $bg_property === 'background-attachment' || $bg_property === 'background-repeat')) {
+                    continue;
+                }
+
+                // Remove !important
+                if ($this->parser->is_important($cur_value)) {
+                    $important = ' !important';
+                    $cur_value = $this->parser->gvw_important($cur_value);
+                }
+
+                // Do not add default values
+                if ($cur_value === $default_value) {
+                    continue;
+                }
+
+                $temp = $this->explode_ws(',', $cur_value);
+
+                if (isset($temp[$i])) {
+                    if ($bg_property === 'background-size') {
+                        $new_bg_value .= '(' . $temp[$i] . ') ';
+                    } else {
+                        $new_bg_value .= $temp[$i] . ' ';
+                    }
+                }
+            }
+
+            $new_bg_value = trim($new_bg_value);
+            if ($i != $number_of_values - 1)
+                $new_bg_value .= ',';
+        }
+
+        // Delete all background-properties
+        foreach ($background_prop_default as $bg_property => $default_value) {
+            unset($input_css[$bg_property]);
+        }
+
+        // Add new background property
+        if ($new_bg_value !== '')
+            $input_css['background'] = $new_bg_value . $important;
+        elseif(isset ($input_css['background']))
+            $input_css['background'] = 'none';
+
+        return $input_css;
+    }
+
+    /**
+     * Dissolve font property
+     * @param string $str_value
+     * @return array
+     * @version 1.3
+     * @see merge_font()
+     */
+    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');
+        $font_style = array('normal', 'italic', 'oblique');
+        $important = '';
+        $return = array('font-style' => null, 'font-variant' => null, 'font-weight' => null, 'font-size' => null, 'line-height' => null, 'font-family' => null);
+
+        if ($this->parser->is_important($str_value)) {
+            $important = '!important';
+            $str_value = $this->parser->gvw_important($str_value);
+        }
+
+        $have['style'] = false;
+        $have['variant'] = false;
+        $have['weight'] = false;
+        $have['size'] = false;
+        // Detects if font-family consists of several words w/o quotes
+        $multiwords = false;
+
+        // Workaround with multiple font-family
+        $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++) {
+            if ($have['weight'] === false && in_array($str_value[0][$j], $font_weight)) {
+                $return['font-weight'] = $str_value[0][$j];
+                $have['weight'] = true;
+            } elseif ($have['variant'] === false && in_array($str_value[0][$j], $font_variant)) {
+                $return['font-variant'] = $str_value[0][$j];
+                $have['variant'] = true;
+            } elseif ($have['style'] === false && in_array($str_value[0][$j], $font_style)) {
+                $return['font-style'] = $str_value[0][$j];
+                $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 = $this->explode_ws('/', trim($str_value[0][$j]));
+                $return['font-size'] = $size[0];
+                if (isset($size[1])) {
+                    $return['line-height'] = $size[1];
+                } else {
+                    $return['line-height'] = ''; // don't add 'normal' !
+                }
+                $have['size'] = true;
+            } else {
+                if (isset($return['font-family'])) {
+                    $return['font-family'] .= ' ' . $str_value[0][$j];
+                    $multiwords = true;
+                } else {
+                    $return['font-family'] = $str_value[0][$j];
+                }
+            }
+        }
+        // add quotes if we have several qords in font-family
+        if ($multiwords !== false) {
+            $return['font-family'] = '"' . $return['font-family'] . '"';
+        }
+        $i = 1;
+        while (isset($str_value[$i])) {
+            $return['font-family'] .= ',' . trim($str_value[$i]);
+            $i++;
+        }
+
+        // Fix for 100 and more font-size
+        if ($have['size'] === false && isset($return['font-weight']) &&
+                        is_numeric($return['font-weight'][0])) {
+            $return['font-size'] = $return['font-weight'];
+            unset($return['font-weight']);
+        }
+
+        foreach ($font_prop_default as $font_prop => $default_value) {
+            if ($return[$font_prop] !== null) {
+                $return[$font_prop] = $return[$font_prop] . $important;
+            }
+            else
+                $return[$font_prop] = $default_value . $important;
+        }
+        return $return;
+    }
+
+    /**
+     * Merges all fonts properties
+     * @param array $input_css
+     * @return array
+     * @version 1.3
+     * @see dissolve_short_font()
+     */
+    public function merge_font($input_css) {
+        $font_prop_default = & $this->parser->data['csstidy']['font_prop_default'];
+        $new_font_value = '';
+        $important = '';
+        // Skip if not font-family and font-size set
+        if (isset($input_css['font-family']) && isset($input_css['font-size']) && $input_css['font-family'] != 'inherit') {
+            // fix several words in font-family - add quotes
+            if (isset($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] === "'"))) {
+                        $family = '"' . $family . '"';
+                    }
+                    $result_families[] = $family;
+                }
+                $input_css['font-family'] = implode(',', $result_families);
+            }
+            foreach ($font_prop_default as $font_property => $default_value) {
+
+                // Skip if property does not exist
+                if (!isset($input_css[$font_property])) {
+                    continue;
+                }
+
+                $cur_value = $input_css[$font_property];
+
+                // Skip if default value is used
+                if ($cur_value === $default_value) {
+                    continue;
+                }
+
+                // Remove !important
+                if ($this->parser->is_important($cur_value)) {
+                    $important = '!important';
+                    $cur_value = $this->parser->gvw_important($cur_value);
+                }
+
+                $new_font_value .= $cur_value;
+                // Add delimiter
+                $new_font_value .= ( $font_property === 'font-size' &&
+                                isset($input_css['line-height'])) ? '/' : ' ';
+            }
+
+            $new_font_value = trim($new_font_value);
+
+            // Delete all font-properties
+            foreach ($font_prop_default as $font_property => $default_value) {
+                if ($font_property !== 'font' || !$new_font_value)
+                    unset($input_css[$font_property]);
+            }
+
+            // Add new font property
+            if ($new_font_value !== '') {
+                $input_css['font'] = $new_font_value . $important;
+            }
+        }
+
+        return $input_css;
+    }
+
+    /**
+     * Reverse left vs right in a list of properties/values
+     * @param array $array
+     * @return array
+     */
+    public function reverse_left_and_right($array) {
+        $return = array();
+
+        // change left <-> right in properties name and values
+        foreach ($array as $propertie => $value) {
+
+            if (method_exists($this, $m = 'reverse_left_and_right_' . str_replace('-','_',trim($propertie)))) {
+                $value = $this->$m($value);
+            }
+
+            // simple replacement for properties
+            $propertie = str_ireplace(array('left', 'right' ,"\x1"), array("\x1", 'left', 'right') , $propertie);
+            // be careful for values, not modifying protected or quoted valued
+            foreach (array('left' => "\x1", 'right' => 'left', "\x1" => 'right') as $v => $r) {
+                if (strpos($value, $v) !== false) {
+                    // attraper les left et right separes du reste (pas au milieu d'un mot)
+                    if (in_array($v, array('left', 'right') )) {
+                        $value = preg_replace(",\\b$v\\b,", "\x0" , $value);
+                    }
+                    else {
+                        $value = str_replace($v, "\x0" , $value);
+                    }
+                    $value = $this->explode_ws("\x0", $value . ' ', true);
+                    $value = rtrim(implode($r, $value));
+                    $value = str_replace("\x0" , $v, $value);
+                }
+            }
+            $return[$propertie] = $value;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Reversing 4 values shorthands properties
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_4value_shorthands($property, $value) {
+        $shorthands = & $this->parser->data['csstidy']['shorthands'];
+        if (isset($shorthands[$property])) {
+            $property_right = $shorthands[$property][1];
+            $property_left = $shorthands[$property][3];
+            $v = $this->dissolve_4value_shorthands($property, $value);
+            if ($v[$property_left] !== $v[$property_right]) {
+                $r = $v[$property_right];
+                $v[$property_right] = $v[$property_left];
+                $v[$property_left] = $r;
+                $v = $this->merge_4value_shorthands($v);
+                if (isset($v[$property])) {
+                    return $v[$property];
+                }
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * Reversing 4 values radius shorthands properties
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_4value_radius_shorthands($property, $value) {
+        $shorthands = & $this->parser->data['csstidy']['radius_shorthands'];
+        if (isset($shorthands[$property])) {
+            $v = $this->dissolve_4value_radius_shorthands($property, $value);
+            if ($v[$shorthands[$property][0]] !== $v[$shorthands[$property][1]]
+              or $v[$shorthands[$property][2]] !== $v[$shorthands[$property][3]]) {
+                $r = array(
+                    $shorthands[$property][0] => $v[$shorthands[$property][1]],
+                    $shorthands[$property][1] => $v[$shorthands[$property][0]],
+                    $shorthands[$property][2] => $v[$shorthands[$property][3]],
+                    $shorthands[$property][3] => $v[$shorthands[$property][2]],
+                );
+                $v = $this->merge_4value_radius_shorthands($r);
+                if (isset($v[$property])) {
+                    return $v[$property];
+                }
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * Reversing margin shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_margin($value) {
+        return $this->reverse_left_and_right_4value_shorthands('margin', $value);
+    }
+
+    /**
+     * Reversing padding shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_padding($value) {
+        return $this->reverse_left_and_right_4value_shorthands('padding', $value);
+    }
+
+    /**
+     * Reversing border-color shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_border_color($value) {
+        return $this->reverse_left_and_right_4value_shorthands('border-color', $value);
+    }
+
+    /**
+     * Reversing border-style shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_border_style($value) {
+        return $this->reverse_left_and_right_4value_shorthands('border-style', $value);
+    }
+
+    /**
+     * Reversing border-width shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_border_width($value) {
+        return $this->reverse_left_and_right_4value_shorthands('border-width', $value);
+    }
+
+    /**
+     * Reversing border-radius shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_border_radius($value) {
+        return $this->reverse_left_and_right_4value_radius_shorthands('border-radius', $value);
+    }
+
+    /**
+     * Reversing border-radius shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right__moz_border_radius($value) {
+        return $this->reverse_left_and_right_4value_radius_shorthands('border-radius', $value);
+    }
+
+    /**
+     * Reversing border-radius shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right__webkit_border_radius($value) {
+        return $this->reverse_left_and_right_4value_radius_shorthands('border-radius', $value);
+    }
+
+
+    /**
+     * Reversing background shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_background($value) {
+        $values = $this->dissolve_short_bg($value);
+        if (isset($values['background-position']) and $values['background-position']) {
+            $v = $this->reverse_left_and_right_background_position($values['background-position']);
+            if ($v !== $values['background-position']) {
+                if ($value == $values['background-position']) {
+                    return $v;
+                }
+                else {
+                    $values['background-position'] = $v;
+                    $x = $this->merge_bg($values);
+                    if (isset($x['background'])) {
+                        return $x['background'];
+                    }
+                }
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * Reversing background position shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_background_position_x($value) {
+        return $this->reverse_left_and_right_background_position($value);
+    }
+
+    /**
+     * Reversing background position shorthands
+     * @param string $value
+     * @return string
+     */
+    public function reverse_left_and_right_background_position($value) {
+        // multiple background case
+        if (strpos($value, ',') !== false) {
+            $values = $this->explode_ws(',', $value);
+            if (count($values) > 1) {
+                foreach ($values as $k=>$v) {
+                    $values[$k] = $this->reverse_left_and_right_background_position($v);
+                }
+                return implode(',', $values);
+            }
+        }
+
+        // if no explicit left or right value
+        if (stripos($value, 'left') === false and stripos($value, 'right') === false) {
+            $values = $this->explode_ws(' ', trim($value));
+            $values = array_map('trim', $values);
+            $values = array_filter($values, function ($v) { return strlen($v);});
+            $values = array_values($values);
+            if (count($values) == 1) {
+                if (in_array($value, array('center', 'top', 'bottom', 'inherit', 'initial', 'unset'))) {
+                    return $value;
+                }
+                return "left $value";
+            }
+            if ($values[1] == 'top' or $values[1] == 'bottom') {
+                if ($values[0] === 'center') {
+                    return $value;
+                }
+                return 'left ' . implode(' ', $values);
+            }
+            else {
+                $last = array_pop($values);
+                if ($last === 'center') {
+                    return $value;
+                }
+                return implode(' ', $values) . ' left ' . $last;
+            }
+        }
+
+        return $value;
+    }
+
+}

opt-out-for-google-analytics/trunk/lib/csstidy/class.csstidy_print.php

@@ -1 +1 @@
 <?php
-    // If this file is called directly, abort.
-    defined( 'WPINC' ) || die;
-
-    /**
-     * CSSTidy - CSS Parser and Optimiser
-     *
-     * CSS Printing class
-     * This class prints CSS data generated by csstidy.
-     *
-     * Copyright 2005, 2006, 2007 Florian Schmitz
-     *
-     * This file is part of CSSTidy.
-     *
-     *   CSSTidy is free software; you can redistribute it and/or modify
-     *   it under the terms of the GNU Lesser General Public License as published by
-     *   the Free Software Foundation; either version 2.1 of the License, or
-     *   (at your option) any later version.
-     *
-     *   CSSTidy is distributed in the hope that it will be useful,
-     *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-     *   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/>.
-     *
-     * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
-     * @package csstidy
-     * @author  Florian Schmitz (floele at gmail dot com) 2005-2007
-     * @author  Brett Zamir (brettz9 at yahoo dot com) 2007
-     * @author  Cedric Morin (cedric at yterium dot com) 2010-2012
-     */
-
-    /**
-     * CSS Printing class
-     *
-     * This class prints CSS data generated by csstidy.
-     *
-     * @package csstidy
-     * @author  Florian Schmitz (floele at gmail dot com) 2005-2006
-     * @version 1.1.0
-     */
-    class csstidy_print {
-
-        /**
-         * csstidy object
-         * @var object
-         */
-        public $parser;
-
-        /**
-         * Saves the input CSS string
-         * @var string
-         * @access private
-         */
-        public $input_css = '';
-        /**
-         * Saves the formatted CSS string
-         * @var string
-         * @access public
-         */
-        public $output_css = '';
-        /**
-         * Saves the formatted CSS string (plain text)
-         * @var string
-         * @access public
-         */
-        public $output_css_plain = '';
-
-        /**
-         * Constructor
-         *
-         * @param array $css contains the class csstidy
-         *
-         * @access  private
-         * @version 1.0
-         */
-        public function __construct( $css ) {
-            $this->parser    = $css;
-            $this->css       = &$css->css;
-            $this->template  = &$css->template;
-            $this->tokens    = &$css->tokens;
-            $this->charset   = &$css->charset;
-            $this->import    = &$css->import;
-            $this->namespace = &$css->namespace;
-        }
-
-        /**
-         * Resets output_css and output_css_plain (new css code)
-         * @access  private
-         * @version 1.0
-         */
-        public function _reset() {
-            $this->output_css       = '';
-            $this->output_css_plain = '';
-        }
-
-        /**
-         * Returns the CSS code as plain text
-         *
-         * @param string $default_media default @media to add to selectors without any @media
-         *
-         * @return string
-         * @access  public
-         * @version 1.0
-         */
-        public function plain( $default_media = '' ) {
-            $this->_print( true, $default_media );
-            return $this->output_css_plain;
-        }
-
-        /**
-         * Returns the formatted CSS code
-         *
-         * @param string $default_media default @media to add to selectors without any @media
-         *
-         * @return string
-         * @access  public
-         * @version 1.0
-         */
-        public function formatted( $default_media = '' ) {
-            $this->_print( false, $default_media );
-            return $this->output_css;
-        }
-
-        /**
-         * Returns the formatted CSS code to make a complete webpage
-         *
-         * @param string $doctype     shorthand for the document type
-         * @param bool   $externalcss indicates whether styles to be attached internally or as an external stylesheet
-         * @param string $title       title to be added in the head of the document
-         * @param string $lang        two-letter language code to be added to the output
-         *
-         * @return string
-         * @access  public
-         * @version 1.4
-         */
-        public function formatted_page( $doctype = 'html5', $externalcss = true, $title = '', $lang = 'en' ) {
-            switch ( $doctype ) {
-                case 'html5':
-                    $doctype_output = '<!DOCTYPE html>';
-                    break;
-                case 'xhtml1.0strict':
-                    $doctype_output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+
+/**
+ * CSSTidy - CSS Parser and Optimiser
+ *
+ * CSS Printing class
+ * This class prints CSS data generated by csstidy.
+ *
+ * Copyright 2005, 2006, 2007 Florian Schmitz
+ *
+ * This file is part of CSSTidy.
+ *
+ *   CSSTidy is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Lesser General Public License as published by
+ *   the Free Software Foundation; either version 2.1 of the License, or
+ *   (at your option) any later version.
+ *
+ *   CSSTidy is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   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/>.
+ *
+ * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
+ * @package csstidy
+ * @author Florian Schmitz (floele at gmail dot com) 2005-2007
+ * @author Brett Zamir (brettz9 at yahoo dot com) 2007
+ * @author Cedric Morin (cedric at yterium dot com) 2010-2012
+ */
+
+/**
+ * CSS Printing class
+ *
+ * This class prints CSS data generated by csstidy.
+ *
+ * @package csstidy
+ * @author Florian Schmitz (floele at gmail dot com) 2005-2006
+ * @version 1.1.0
+ */
+class csstidy_print {
+
+    /**
+     * csstidy object
+     * @var object
+     */
+    public $parser;
+
+    /**
+     * Saves the input CSS string
+     * @var string
+     * @access private
+     */
+    public $input_css = '';
+    /**
+     * Saves the formatted CSS string
+     * @var string
+     * @access public
+     */
+    public $output_css = '';
+    /**
+     * Saves the formatted CSS string (plain text)
+     * @var string
+     * @access public
+     */
+    public $output_css_plain = '';
+
+    /**
+     * Constructor
+     * @param array $css contains the class csstidy
+     * @access private
+     * @version 1.0
+     */
+    public function __construct($css) {
+        $this->parser = $css;
+        $this->css = & $css->css;
+        $this->template = & $css->template;
+        $this->tokens = & $css->tokens;
+        $this->charset = & $css->charset;
+        $this->import = & $css->import;
+        $this->namespace = & $css->namespace;
+    }
+
+    /**
+     * Resets output_css and output_css_plain (new css code)
+     * @access private
+     * @version 1.0
+     */
+    public function _reset() {
+        $this->output_css = '';
+        $this->output_css_plain = '';
+    }
+
+    /**
+     * Returns the CSS code as plain text
+     * @param string $default_media default @media to add to selectors without any @media
+     * @return string
+     * @access public
+     * @version 1.0
+     */
+    public function plain($default_media='') {
+        $this->_print(true, $default_media);
+        return $this->output_css_plain;
+    }
+
+    /**
+     * Returns the formatted CSS code
+     * @param string $default_media default @media to add to selectors without any @media
+     * @return string
+     * @access public
+     * @version 1.0
+     */
+    public function formatted($default_media='') {
+        $this->_print(false, $default_media);
+        return $this->output_css;
+    }
+
+    /**
+     * Returns the formatted CSS code to make a complete webpage
+     * @param string $doctype shorthand for the document type
+     * @param bool $externalcss indicates whether styles to be attached internally or as an external stylesheet
+     * @param string $title title to be added in the head of the document
+     * @param string $lang two-letter language code to be added to the output
+     * @return string
+     * @access public
+     * @version 1.4
+     */
+    public function formatted_page($doctype='html5', $externalcss=true, $title='', $lang='en') {
+        switch ($doctype) {
+            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">';
-                    break;
-                case 'xhtml1.1':
-                default:
-                    $doctype_output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+                break;
+            case 'xhtml1.1':
+            default:
+                $doctype_output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
                 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">';
-                    break;
-            }
-
-            $output                 = $cssparsed = '';
-            $this->output_css_plain = &$output;
-
-            $output .= $doctype_output . "\n" . '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . $lang . '"';
-            $output .= ( $doctype === 'xhtml1.1' ) ? '>' : ' lang="' . $lang . '">';
-            $output .= "\n<head>\n    <title>$title</title>";
-
-            if ( $externalcss ) {
-                $output    .= "\n    <style type=\"text/css\">\n";
-                $cssparsed = file_get_contents( 'cssparsed.css' );
-                $output    .= $cssparsed; // Adds an invisible BOM or something, but not in css_optimised.php
-                $output    .= "\n</style>";
-            }
-            else {
-                $output .= "\n" . '    <link rel="stylesheet" type="text/css" href="cssparsed.css" />';
-            }
-            $output .= "\n</head>\n<body><code id=\"copytext\">";
-            $output .= $this->formatted();
-            $output .= '</code>' . "\n" . '</body></html>';
-            return $this->output_css_plain;
-        }
-
-        /**
-         * Returns the formatted CSS Code and saves it into $this->output_css and $this->output_css_plain
-         *
-         * @param bool   $plain         plain text or not
-         * @param string $default_media default @media to add to selectors without any @media
-         *
-         * @access  private
-         * @version 2.0
-         */
-        public function _print( $plain = false, $default_media = '' ) {
-            if ( $this->output_css && $this->output_css_plain ) {
-                return;
-            }
-
-            $output = '';
-            if ( ! $this->parser->get_cfg( 'preserve_css' ) ) {
-                $this->_convert_raw_css( $default_media );
-            }
-
-            $template = &$this->template;
-
-            if ( $plain ) {
-                $template = array_map( 'strip_tags', $template );
-            }
-
-            if ( $this->parser->get_cfg( 'timestamp' ) ) {
-                array_unshift( $this->tokens, array( COMMENT, ' CSSTidy ' . $this->parser->version . ': ' . date( 'r' ) . ' ' ) );
-            }
-
-            if ( ! empty( $this->charset ) ) {
-                $output .= $template[ 0 ] . '@charset ' . $template[ 5 ] . $this->charset . $template[ 6 ] . $template[ 13 ];
-            }
-
-            if ( ! empty( $this->import ) ) {
-                for ( $i = 0, $size = count( $this->import ); $i < $size; $i++ ) {
-                    if ( substr( $this->import[ $i ], 0, 4 ) === 'url(' && substr( $this->import[ $i ], -1, 1 ) === ')' ) {
-                        $this->import[ $i ] = '"' . substr( $this->import[ $i ], 4, -1 ) . '"';
-                        $this->parser->log( 'Optimised @import : Removed "url("', 'Information' );
-                    }
-                    else if ( ! preg_match( '/^".+"$/', $this->import[ $i ] ) ) {
-                        // fixes a bug for @import ".." instead of the expected @import url("..")
-                        // If it comes in due to @import ".." the "" will be missing and the output will become @import .. (which is an error)
-                        $this->import[ $i ] = '"' . $this->import[ $i ] . '"';
-                    }
-
-                    $output .= $template[ 0 ] . '@import ' . $template[ 5 ] . $this->import[ $i ] . $template[ 6 ] . $template[ 13 ];
-                }
-            }
-
-            if ( ! empty( $this->namespace ) ) {
-                if ( ( $p = strpos( $this->namespace, "url(" ) ) !== false && substr( $this->namespace, -1, 1 ) === ')' ) {
-                    $this->namespace = substr_replace( $this->namespace, '"', $p, 4 );
-                    $this->namespace = substr( $this->namespace, 0, -1 ) . '"';
-                    $this->parser->log( 'Optimised @namespace : Removed "url("', 'Information' );
-                }
-                $output .= $template[ 0 ] . '@namespace ' . $template[ 5 ] . $this->namespace . $template[ 6 ] . $template[ 13 ];
-            }
-
-            $in_at_out    = [];
-            $out          = &$output;
-            $indent_level = 0;
-
-            foreach ( $this->tokens as $key => $token ) {
-                switch ( $token[ 0 ] ) {
-                    case AT_START:
-                        $out .= $template[ 0 ] . $this->_htmlsp( $token[ 1 ], $plain ) . $template[ 1 ];
-                        $indent_level++;
-                        if ( ! isset( $in_at_out[ $indent_level ] ) ) {
-                            $in_at_out[ $indent_level ] = '';
-                        }
-                        $out = &$in_at_out[ $indent_level ];
-                        break;
-
-                    case SEL_START:
-                        if ( $this->parser->get_cfg( 'lowercase_s' ) ) {
-                            $token[ 1 ] = strtolower( $token[ 1 ] );
-                        }
-                        $out .= ( $token[ 1 ][ 0 ] !== '@' ) ? $template[ 2 ] . $this->_htmlsp( $token[ 1 ], $plain ) : $template[ 0 ] . $this->_htmlsp( $token[ 1 ], $plain );
-                        $out .= $template[ 3 ];
-                        break;
-
-                    case PROPERTY:
-                        if ( $this->parser->get_cfg( 'case_properties' ) === 2 ) {
-                            $token[ 1 ] = strtoupper( $token[ 1 ] );
-                        }
-                        elseif ( $this->parser->get_cfg( 'case_properties' ) === 1 ) {
-                            $token[ 1 ] = strtolower( $token[ 1 ] );
-                        }
-                        $out .= $template[ 4 ] . $this->_htmlsp( $token[ 1 ], $plain ) . ':' . $template[ 5 ];
-                        break;
-
-                    case VALUE:
-                        $out .= $this->_htmlsp( $token[ 1 ], $plain );
-                        if ( $this->_seeknocomment( $key, 1 ) == SEL_END && $this->parser->get_cfg( 'remove_last_;' ) ) {
-                            $out .= str_replace( ';', '', $template[ 6 ] );
-                        }
-                        else {
-                            $out .= $template[ 6 ];
-                        }
-                        break;
-
-                    case SEL_END:
-                        $out .= $template[ 7 ];
-                        if ( $this->_seeknocomment( $key, 1 ) != AT_END ) {
-                            $out .= $template[ 8 ];
-                        }
-                        break;
-
-                    case AT_END:
-                        if ( strlen( $template[ 10 ] ) ) {
-                            // indent the bloc we are closing
-                            $out = str_replace( "\n\n", "\r\n", $out ); // don't fill empty lines
-                            $out = str_replace( "\n", "\n" . $template[ 10 ], $out );
-                            $out = str_replace( "\r\n", "\n\n", $out );
-                        }
-                        if ( $indent_level > 1 ) {
-                            $out = &$in_at_out[ $indent_level - 1 ];
-                        }
-                        else {
-                            $out = &$output;
-                        }
-                        $out .= $template[ 10 ] . $in_at_out[ $indent_level ];
-                        if ( $this->_seeknocomment( $key, 1 ) != AT_END ) {
-                            $out .= $template[ 9 ];
-                        }
-                        else {
-                            $out .= rtrim( $template[ 9 ] );
-                        }
-
-                        unset( $in_at_out[ $indent_level ] );
-                        $indent_level--;
-                        break;
-
-                    case IMPORTANT_COMMENT:
-                    case COMMENT:
-                        $out .= $template[ 11 ] . '/*' . $this->_htmlsp( $token[ 1 ], $plain ) . '*/' . $template[ 12 ];
-                        break;
-                }
-            }
-
-            $output = trim( $output );
-
-            if ( ! $plain ) {
-                $this->output_css = $output;
-                $this->_print( true );
-            }
-            else {
-                // If using spaces in the template, don't want these to appear in the plain output
-                $this->output_css_plain = str_replace( '&#160;', '', $output );
-            }
-        }
-
-        /**
-         * Gets the next token type which is $move away from $key, excluding comments
-         *
-         * @param integer $key  current position
-         * @param integer $move move this far
-         *
-         * @return mixed a token type
-         * @access  private
-         * @version 1.0
-         */
-        public function _seeknocomment( $key, $move ) {
-            $go = ( $move > 0 ) ? 1 : -1;
-            for ( $i = $key + 1; abs( $key - $i ) - 1 < abs( $move ); $i += $go ) {
-                if ( ! isset( $this->tokens[ $i ] ) ) {
-                    return;
-                }
-                if ( $this->tokens[ $i ][ 0 ] == COMMENT ) {
-                    $move += 1;
-                    continue;
-                }
-                return $this->tokens[ $i ][ 0 ];
-            }
-        }
-
-        /**
-         * Converts $this->css array to a raw array ($this->tokens)
-         *
-         * @param string $default_media default @media to add to selectors without any @media
-         *
-         * @access  private
-         * @version 1.0
-         */
-        public function _convert_raw_css( $default_media = '' ) {
-            $this->tokens    = array();
-            $sort_selectors  = $this->parser->get_cfg( 'sort_selectors' );
-            $sort_properties = $this->parser->get_cfg( 'sort_properties' );
-
-            // important comment section ?
-            if ( isset( $this->css[ '!' ] ) ) {
-                $this->parser->_add_token( IMPORTANT_COMMENT, rtrim( $this->css[ '!' ] ), true );
-                unset( $this->css[ '!' ] );
-            }
-
-            foreach ( $this->css as $medium => $val ) {
-                if ( $sort_selectors ) {
-                    ksort( $val );
-                }
-                if ( intval( $medium ) < DEFAULT_AT ) {
-                    // un medium vide (contenant @font-face ou autre @) ne produit aucun conteneur
-                    if ( strlen( trim( $medium ) ) ) {
-                        $parts_to_open = explode( '{', $medium );
-                        foreach ( $parts_to_open as $part ) {
-                            $this->parser->_add_token( AT_START, $part, true );
-                        }
-                    }
-                }
-                elseif ( $default_media ) {
-                    $this->parser->_add_token( AT_START, $default_media, true );
-                }
-
-                foreach ( $val as $selector => $vali ) {
-                    if ( $sort_properties ) {
-                        ksort( $vali );
-                    }
-                    $this->parser->_add_token( SEL_START, $selector, true );
-
-                    $invalid = array(
-                        '*' => array(), // IE7 hacks first
-                        '_' => array(), // IE6 hacks
-                        '/' => array(), // IE6 hacks
-                        '-' => array()  // IE6 hacks
-                    );
-                    foreach ( $vali as $property => $valj ) {
-                        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 ) ) {
-                                $invalid[ $matches[ 1 ] ][ $property ] = $valj;
-                            }
-                            else {
-                                $this->parser->_add_token( PROPERTY, $property, true );
-                                $this->parser->_add_token( VALUE, $valj, true );
-                            }
-                        }
-                    }
-                    foreach ( $invalid as $prefix => $props ) {
-                        foreach ( $props as $property => $valj ) {
-                            $this->parser->_add_token( PROPERTY, $property, true );
-                            $this->parser->_add_token( VALUE, $valj, true );
-                        }
-                    }
-                    $this->parser->_add_token( SEL_END, $selector, true );
-                }
-
-                if ( intval( $medium ) < DEFAULT_AT ) {
-                    // un medium vide (contenant @font-face ou autre @) ne produit aucun conteneur
-                    if ( strlen( trim( $medium ) ) ) {
-                        $parts_to_close = explode( '{', $medium );
-                        foreach ( array_reverse( $parts_to_close ) as $part ) {
-                            $this->parser->_add_token( AT_END, $part, true );
-                        }
-                    }
-                }
-                elseif ( $default_media ) {
-                    $this->parser->_add_token( AT_END, $default_media, true );
-                }
-            }
-        }
-
-        /**
-         * Same as htmlspecialchars, only that chars are not replaced if $plain !== true. This makes  print_code() cleaner.
-         *
-         * @param string $string
-         * @param bool   $plain
-         *
-         * @return string
-         * @see     csstidy_print::_print()
-         * @access  private
-         * @version 1.0
-         */
-        public function _htmlsp( $string, $plain ) {
-            if ( ! $plain ) {
-                return htmlspecialchars( $string, ENT_QUOTES, 'utf-8' );
-            }
-            return $string;
-        }
-
-        /**
-         * Get compression ratio
-         * @access  public
-         * @return float
-         * @version 1.2
-         */
-        public function get_ratio() {
-            if ( ! $this->output_css_plain ) {
-                $this->formatted();
-            }
-            return round( ( strlen( $this->input_css ) - strlen( $this->output_css_plain ) ) / strlen( $this->input_css ), 3 ) * 100;
-        }
-
-        /**
-         * Get difference between the old and new code in bytes and prints the code if necessary.
-         * @access  public
-         * @return string
-         * @version 1.1
-         */
-        public function get_diff() {
-            if ( ! $this->output_css_plain ) {
-                $this->formatted();
-            }
-
-            $diff = strlen( $this->output_css_plain ) - strlen( $this->input_css );
-
-            if ( $diff > 0 ) {
-                return '+' . $diff;
-            }
-            elseif ( $diff == 0 ) {
-                return '+-' . $diff;
-            }
-
-            return $diff;
-        }
-
-        /**
-         * Get the size of either input or output CSS in KB
-         *
-         * @param string $loc default is "output"
-         *
-         * @access  public
-         * @return integer
-         * @version 1.0
-         */
-        public function size( $loc = 'output' ) {
-            if ( $loc === 'output' && ! $this->output_css ) {
-                $this->formatted();
-            }
-
-            if ( $loc === 'input' ) {
-                return ( strlen( $this->input_css ) / 1000 );
-            }
-            else {
-                return ( strlen( $this->output_css_plain ) / 1000 );
-            }
-        }
-
-    }
+                break;
+        }
+
+        $output = $cssparsed = '';
+        $this->output_css_plain = & $output;
+
+        $output .= $doctype_output . "\n" . '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . $lang . '"';
+        $output .= ( $doctype === 'xhtml1.1') ? '>' : ' lang="' . $lang . '">';
+        $output .= "\n<head>\n    <title>$title</title>";
+
+        if ($externalcss) {
+            $output .= "\n    <style type=\"text/css\">\n";
+            $cssparsed = file_get_contents('cssparsed.css');
+            $output .= $cssparsed; // Adds an invisible BOM or something, but not in css_optimised.php
+            $output .= "\n</style>";
+        } else {
+            $output .= "\n" . '    <link rel="stylesheet" type="text/css" href="cssparsed.css" />';
+        }
+        $output .= "\n</head>\n<body><code id=\"copytext\">";
+        $output .= $this->formatted();
+        $output .= '</code>' . "\n" . '</body></html>';
+        return $this->output_css_plain;
+    }
+
+    /**
+     * Returns the formatted CSS Code and saves it into $this->output_css and $this->output_css_plain
+     * @param bool $plain plain text or not
+     * @param string $default_media default @media to add to selectors without any @media
+     * @access private
+     * @version 2.0
+     */
+    public function _print($plain = false, $default_media='') {
+        if ($this->output_css && $this->output_css_plain) {
+            return;
+        }
+
+        $output = '';
+        if (!$this->parser->get_cfg('preserve_css')) {
+            $this->_convert_raw_css($default_media);
+        }
+
+        $template = & $this->template;
+
+        if ($plain) {
+            $template = array_map('strip_tags', $template);
+        }
+
+        if ($this->parser->get_cfg('timestamp')) {
+            array_unshift($this->tokens, array(COMMENT, ' CSSTidy ' . $this->parser->version . ': ' . date('r') . ' '));
+        }
+
+        if (!empty($this->charset)) {
+            $output .= $template[0] . '@charset ' . $template[5] . $this->charset . $template[6] . $template[13];
+        }
+
+        if (!empty($this->import)) {
+            for ($i = 0, $size = count($this->import); $i < $size; $i++) {
+                if (substr($this->import[$i], 0, 4) === 'url(' && substr($this->import[$i], -1, 1) === ')') {
+                    $this->import[$i] = '"' . substr($this->import[$i], 4, -1) . '"';
+                    $this->parser->log('Optimised @import : Removed "url("', 'Information');
+                }
+                else if (!preg_match('/^".+"$/',$this->import[$i])) {
+                    // fixes a bug for @import ".." instead of the expected @import url("..")
+                    // If it comes in due to @import ".." the "" will be missing and the output will become @import .. (which is an error)
+                    $this->import[$i] = '"' . $this->import[$i] . '"';
+                }
+
+                $output .= $template[0] . '@import ' . $template[5] . $this->import[$i] . $template[6] . $template[13];
+            }
+        }
+
+        if (!empty($this->namespace)) {
+            if (($p=strpos($this->namespace,"url("))!==false && substr($this->namespace, -1, 1) === ')') {
+                $this->namespace = substr_replace($this->namespace,'"',$p,4);
+                $this->namespace = substr($this->namespace, 0, -1) . '"';
+                $this->parser->log('Optimised @namespace : Removed "url("', 'Information');
+            }
+            $output .= $template[0] . '@namespace ' . $template[5] . $this->namespace . $template[6] . $template[13];
+        }
+
+        $in_at_out = [];
+        $out = & $output;
+        $indent_level = 0;
+
+        foreach ($this->tokens as $key => $token) {
+            switch ($token[0]) {
+                case AT_START:
+                    $out .= $template[0] . $this->_htmlsp($token[1], $plain) . $template[1];
+                    $indent_level++;
+                    if (!isset($in_at_out[$indent_level])) {
+                        $in_at_out[$indent_level] = '';
+                    }
+                    $out = & $in_at_out[$indent_level];
+                    break;
+
+                case SEL_START:
+                    if ($this->parser->get_cfg('lowercase_s'))
+                        $token[1] = strtolower($token[1]);
+                    $out .= ( $token[1][0] !== '@') ? $template[2] . $this->_htmlsp($token[1], $plain) : $template[0] . $this->_htmlsp($token[1], $plain);
+                    $out .= $template[3];
+                    break;
+
+                case PROPERTY:
+                    if ($this->parser->get_cfg('case_properties') === 2) {
+                        $token[1] = strtoupper($token[1]);
+                    } elseif ($this->parser->get_cfg('case_properties') === 1) {
+                        $token[1] = strtolower($token[1]);
+                    }
+                    $out .= $template[4] . $this->_htmlsp($token[1], $plain) . ':' . $template[5];
+                    break;
+
+                case VALUE:
+                    $out .= $this->_htmlsp($token[1], $plain);
+                    if ($this->_seeknocomment($key, 1) == SEL_END && $this->parser->get_cfg('remove_last_;')) {
+                        $out .= str_replace(';', '', $template[6]);
+                    } else {
+                        $out .= $template[6];
+                    }
+                    break;
+
+                case SEL_END:
+                    $out .= $template[7];
+                    if ($this->_seeknocomment($key, 1) != AT_END)
+                        $out .= $template[8];
+                    break;
+
+                case AT_END:
+                    if (strlen($template[10])) {
+                        // indent the bloc we are closing
+                        $out = str_replace("\n\n", "\r\n", $out); // don't fill empty lines
+                        $out = str_replace("\n", "\n" . $template[10], $out);
+                        $out = str_replace("\r\n", "\n\n", $out);
+                    }
+                    if ($indent_level > 1) {
+                        $out = & $in_at_out[$indent_level-1];
+                    }
+                    else {
+                        $out = & $output;
+                    }
+                    $out .= $template[10] . $in_at_out[$indent_level];
+                    if ($this->_seeknocomment($key, 1) != AT_END) {
+                        $out .= $template[9];
+                    }
+                    else {
+                        $out .= rtrim($template[9]);
+                    }
+
+                    unset($in_at_out[$indent_level]);
+                    $indent_level--;
+                    break;
+
+                case IMPORTANT_COMMENT:
+                case COMMENT:
+                    $out .= $template[11] . '/*' . $this->_htmlsp($token[1], $plain) . '*/' . $template[12];
+                    break;
+            }
+        }
+
+        $output = trim($output);
+
+        if (!$plain) {
+            $this->output_css = $output;
+            $this->_print(true);
+        } else {
+            // If using spaces in the template, don't want these to appear in the plain output
+            $this->output_css_plain = str_replace('&#160;', '', $output);
+        }
+    }
+
+    /**
+     * Gets the next token type which is $move away from $key, excluding comments
+     * @param integer $key current position
+     * @param integer $move move this far
+     * @return mixed a token type
+     * @access private
+     * @version 1.0
+     */
+    public function _seeknocomment($key, $move) {
+        $go = ($move > 0) ? 1 : -1;
+        for ($i = $key + 1; abs($key - $i) - 1 < abs($move); $i += $go) {
+            if (!isset($this->tokens[$i])) {
+                return;
+            }
+            if ($this->tokens[$i][0] == COMMENT) {
+                $move += 1;
+                continue;
+            }
+            return $this->tokens[$i][0];
+        }
+    }
+
+    /**
+     * Converts $this->css array to a raw array ($this->tokens)
+     * @param string $default_media default @media to add to selectors without any @media
+     * @access private
+     * @version 1.0
+     */
+    public function _convert_raw_css($default_media='') {
+        $this->tokens = array();
+        $sort_selectors = $this->parser->get_cfg('sort_selectors');
+        $sort_properties = $this->parser->get_cfg('sort_properties');
+
+        // important comment section ?
+        if (isset($this->css['!'])) {
+            $this->parser->_add_token(IMPORTANT_COMMENT, rtrim($this->css['!']), true);
+            unset($this->css['!']);
+        }
+
+        foreach ($this->css as $medium => $val) {
+            if ($sort_selectors)
+                ksort($val);
+            if (intval($medium) < DEFAULT_AT) {
+                // un medium vide (contenant @font-face ou autre @) ne produit aucun conteneur
+                if (strlen(trim($medium))) {
+                    $parts_to_open = explode('{', $medium);
+                    foreach ($parts_to_open as $part) {
+                        $this->parser->_add_token(AT_START, $part, true);
+                    }
+                }
+            } elseif ($default_media) {
+                $this->parser->_add_token(AT_START, $default_media, true);
+            }
+
+            foreach ($val as $selector => $vali) {
+                if ($sort_properties)
+                    ksort($vali);
+                $this->parser->_add_token(SEL_START, $selector, true);
+
+                $invalid = array(
+                    '*' => array(), // IE7 hacks first
+                    '_' => array(), // IE6 hacks
+                    '/' => array(), // IE6 hacks
+                    '-' => array()  // IE6 hacks
+                );
+                foreach ($vali as $property => $valj) {
+                    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)) {
+                            $invalid[$matches[1]][$property] = $valj;
+                        } else {
+                            $this->parser->_add_token(PROPERTY, $property, true);
+                            $this->parser->_add_token(VALUE, $valj, true);
+                        }
+                    }
+                }
+                foreach ($invalid as $prefix => $props) {
+                    foreach ($props as $property => $valj) {
+                        $this->parser->_add_token(PROPERTY, $property, true);
+                        $this->parser->_add_token(VALUE, $valj, true);
+                    }
+                }
+                $this->parser->_add_token(SEL_END, $selector, true);
+            }
+
+            if (intval($medium) < DEFAULT_AT) {
+                // un medium vide (contenant @font-face ou autre @) ne produit aucun conteneur
+                if (strlen(trim($medium))) {
+                    $parts_to_close = explode('{', $medium);
+                    foreach (array_reverse($parts_to_close) as $part) {
+                        $this->parser->_add_token(AT_END, $part, true);
+                    }
+                }
+            } elseif ($default_media) {
+                $this->parser->_add_token(AT_END, $default_media, true);
+            }
+        }
+    }
+
+    /**
+     * Same as htmlspecialchars, only that chars are not replaced if $plain !== true. This makes  print_code() cleaner.
+     * @param string $string
+     * @param bool $plain
+     * @return string
+     * @see csstidy_print::_print()
+     * @access private
+     * @version 1.0
+     */
+    public function _htmlsp($string, $plain) {
+        if (!$plain) {
+            return htmlspecialchars($string, ENT_QUOTES, 'utf-8');
+        }
+        return $string;
+    }
+
+    /**
+     * Get compression ratio
+     * @access public
+     * @return float
+     * @version 1.2
+     */
+    public function get_ratio() {
+        if (!$this->output_css_plain) {
+            $this->formatted();
+        }
+        return round((strlen($this->input_css) - strlen($this->output_css_plain)) / strlen($this->input_css), 3) * 100;
+    }
+
+    /**
+     * Get difference between the old and new code in bytes and prints the code if necessary.
+     * @access public
+     * @return string
+     * @version 1.1
+     */
+    public function get_diff() {
+        if (!$this->output_css_plain) {
+            $this->formatted();
+        }
+
+        $diff = strlen($this->output_css_plain) - strlen($this->input_css);
+
+        if ($diff > 0) {
+            return '+' . $diff;
+        } elseif ($diff == 0) {
+            return '+-' . $diff;
+        }
+
+        return $diff;
+    }
+
+    /**
+     * Get the size of either input or output CSS in KB
+     * @param string $loc default is "output"
+     * @access public
+     * @return integer
+     * @version 1.0
+     */
+    public function size($loc = 'output') {
+        if ($loc === 'output' && !$this->output_css) {
+            $this->formatted();
+        }
+
+        if ($loc === 'input') {
+            return (strlen($this->input_css) / 1000);
+        } else {
+            return (strlen($this->output_css_plain) / 1000);
+        }
+    }
+
+}

opt-out-for-google-analytics/trunk/lib/csstidy/data.inc.php

@@ -567 +567 @@
 $data['csstidy']['all_properties']['word-wrap'] = 'CSS3.0';
 $data['csstidy']['all_properties']['z-index'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['--custom'] = 'CSS3.0';
 
 /**

opt-out-for-google-analytics/trunk/readme.txt

@@ -3 +3 @@
 Tags: google analytics, opt-out, dsgvo, gdpr, analytics
 Requires at least: 3.5
-Tested up to: 5.9
+Tested up to: 6.0.2
 Requires PHP: 7.0
-Stable tag: 2.0
+Stable tag: 2.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -59 +59 @@
 
 * [MonsterInsights Pro](https://www.monsterinsights.com/?utm_source=wordpressorg&utm_medium=opt-out-for-google-analytics)
-* [Google Analytics for WordPress by MonsterInsights](https://wordpress.org/plugins/google-analytics-for-wordpress/)
+* [MonsterInsights – Google Analytics Dashboard for WordPress (Website Stats Made Easy)](https://wordpress.org/plugins/google-analytics-for-wordpress/)
 * [ExactMetrics – Google Analytics Dashboard for WordPress (Website Stats Plugin)](https://wordpress.org/plugins/google-analytics-dashboard-for-wp/)
 * [Analytify – Google Analytics Dashboard Plugin For WordPress](https://wordpress.org/plugins/wp-analytify/)
 * [GA Google Analytics](https://wordpress.org/plugins/ga-google-analytics/)
-* [Site Kit by Google](https://wordpress.org/plugins/google-site-kit/)
+* [Site Kit by Google – Analytics, Search Console, AdSense, Speed](https://wordpress.org/plugins/google-site-kit/)
 
 **AUTOMATICALLY current privacy policy**
@@ -287 +287 @@
 
 == Changelog ==
+
+= 2.1 =
+* Updated: readme.txt
+* Updated: Support for WordPress 6.0.2
+* Updated: CSStidy library to v2.0.0
+* Updated: Integration of all supported GA tracking plugins
 
 = 2.0 =

opt-out-for-google-analytics/trunk/templates/promotion.php

@@ -1 +1 @@
 <?php if ( ! $popup ): ?>
-    <div class="gaoo-promotion-wrap">
+    <div class="gaoo-promotion-wrap">
 <?php endif; ?>
 
 <?php foreach ( $promo as $item ): ?>
 
-    <div class="gaoo-promotion-box">
+    <?php
+    if ( GAOO_Promo::should_hide( $item[ 'hide_if_active' ] ) ):
+        continue;
+    endif;
+    ?>
 
-        <?php if ( $popup ): ?>
-            <h2 class="clearfix"><?php echo esc_html( $item[ 'title' ] ); ?>
-                <a href="<?php echo esc_url( add_query_arg( 'gaoo_promo', 1 ) ); ?>" title="<?php esc_attr_e( 'Close it for ever', 'opt-out-for-google-analytics' ); ?>">X</a></h2>
+    <div class="gaoo-promotion-box">
+
+        <?php if ( $popup ): ?>
+            <h2 class="clearfix"><?php echo esc_html( $item[ 'title' ] ); ?>
+                <a href="<?php echo esc_url( add_query_arg( 'gaoo_promo', 1 ) ); ?>" title="<?php esc_attr_e( 'Close it for ever', 'opt-out-for-google-analytics' ); ?>">X</a>
+            </h2>
         <?php endif; ?>
 
-        <div class="gaoo-promotion-box-body">
+        <div class="gaoo-promotion-box-body">
 
-            <?php if ( ! empty( $item[ 'link' ] ) ): ?>
-            <a href="<?php echo esc_url( $item[ 'link' ] ); ?>" target="_blank" class="gaoo-promotion-link" title="<?php esc_attr_e( 'Opens in new tab', 'opt-out-for-google-analytics' ); ?>">
-            <?php endif; ?>
+            <?php if ( ! empty( $item[ 'link' ] ) ): ?>
+            <a href="<?php echo esc_url( $item[ 'link' ] ); ?>" target="_blank" class="gaoo-promotion-link" title="<?php esc_attr_e( 'Opens in new tab', 'opt-out-for-google-analytics' ); ?>">
+                <?php endif; ?>
 
                 <?php if ( ! empty( $item[ 'image' ] ) ): ?>
-                    <img src="<?php echo esc_url( $item[ 'image' ] ); ?>" alt="<?php echo empty( $item[ 'title' ] ) ? '' : esc_attr( $item[ 'title' ] ); ?>">
+                    <img src="<?php echo esc_url( $item[ 'image' ] ); ?>" alt="<?php echo empty( $item[ 'title' ] ) ? '' : esc_attr( $item[ 'title' ] ); ?>">
                 <?php endif; ?>
 
                 <?php if ( ! empty( $item[ 'link' ] ) ): ?>
-                </a>
+            </a>
         <?php endif; ?>
 
             <?php if ( ! empty( $item[ 'desc' ] ) ): ?>
-                <div class="gaoo-promotion-description">
-                    <?php echo wp_kses_post( $item[ 'desc' ] ); ?>
-                </div>
+                <div class="gaoo-promotion-description">
+                    <?php echo wp_kses_post( $item[ 'desc' ] ); ?>
+                </div>
             <?php endif; ?>
-        </div>
+        </div>
 
-    </div>
+    </div>
 
 <?php endforeach; ?>
 
 <?php if ( ! $popup ): ?>
-    </div>
+    </div>
 <?php endif; ?>