From 6a51819af7381e2fd7e64de41683ee6331ecca06 Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Fri, 14 Mar 2014 14:18:53 +0100 Subject: [PATCH] [SPIP] ~v3.0.15 --> v3.0.16 --- www/CHANGELOG.txt | 27 + www/config/ecran_securite.php | 9 +- www/ecrire/action/editer_rubrique.php | 32 +- www/ecrire/inc/editer.php | 53 +- www/ecrire/inc/filtres_ecrire.php | 3 +- www/ecrire/inc_version.php | 2 +- www/ecrire/maj/svn10000.php | 4 + www/ecrire/paquet.xml | 2 +- www/ecrire/public/debusquer.php | 46 +- www/ecrire/public/quete.php | 2 +- .../fsource_csstidy__class.csstidy.php.html | 1038 ----------- ...e_csstidy__class.csstidy_optimise.php.html | 851 --------- ...urce_csstidy__class.csstidy_print.php.html | 402 ----- .../fsource_csstidy__data.inc.php.html | 521 ------ .../lib/csstidy/Docs/classtrees_csstidy.html | 62 - .../csstidy/_class_csstidy_optimise_php.html | 97 -- .../Docs/csstidy/_class_csstidy_php.html | 130 -- .../csstidy/_class_csstidy_print_php.html | 97 -- .../csstidy/Docs/csstidy/_data_inc_php.html | 483 ----- .../lib/csstidy/Docs/csstidy/csstidy.html | 1550 ----------------- .../Docs/csstidy/csstidy_optimise.html | 705 -------- .../csstidy/Docs/csstidy/csstidy_print.html | 617 ------- .../lib/csstidy/Docs/elementindex.html | 386 ---- .../csstidy/Docs/elementindex_csstidy.html | 405 ----- .../compresseur/lib/csstidy/Docs/errors.html | 51 - .../compresseur/lib/csstidy/Docs/index.html | 68 - .../lib/csstidy/Docs/li_csstidy.html | 68 - .../lib/csstidy/Docs/media/background.png | Bin 238 -> 0 bytes .../lib/csstidy/Docs/media/empty.png | Bin 206 -> 0 bytes .../lib/csstidy/Docs/media/style.css | 197 --- .../lib/csstidy/Docs/todolist.html | 77 - .../compresseur/lib/csstidy/README | 8 +- .../compresseur/lib/csstidy/class.csstidy.php | 326 ++-- .../lib/csstidy/class.csstidy_ctype.php | 45 - .../lib/csstidy/class.csstidy_optimise.php | 198 ++- .../lib/csstidy/class.csstidy_print.php | 60 +- .../compresseur/lib/csstidy/cssparse.css | 118 -- .../compresseur/lib/csstidy/cssparsed.css | 29 - .../compresseur/lib/csstidy/data.inc.php | 1048 ++++++----- .../compresseur/lib/csstidy/template.tpl | 10 - .../compresseur/lib/csstidy/template1.tpl | 12 - .../compresseur/lib/csstidy/template2.tpl | 5 - .../compresseur/lib/csstidy/template3.tpl | 1 - www/plugins-dist/compresseur/paquet.xml | 2 +- www/plugins-dist/forum/forum_autoriser.php | 10 + www/plugins-dist/forum/paquet.xml | 2 +- .../prive/objets/liste/participer_forum.html | 4 +- .../objets/liste/participer_forum_thread.html | 8 +- .../squelettes/inclure/discuter_forum.html | 11 +- www/plugins-dist/medias/modeles/image.html | 9 +- www/plugins-dist/medias/paquet.xml | 2 +- .../inc-destinataires-message.html | 4 +- .../organiseur/prive/rss/messages.html | 2 +- .../porte_plume/tests/all_tests.php | 8 +- .../tests/barre_outil_markitup.php | 122 +- .../porte_plume/tests/lanceur_spip.php | 21 +- .../textwheel/engine/textwheel.php | 15 +- www/plugins-dist/textwheel/paquet.xml | 2 +- .../formulaires/editer_url_objet.php | 4 +- www/plugins-dist/urls_etendues/paquet.xml | 2 +- .../formulaires/ecrire_auteur.php | 5 +- www/svn.revision | 12 +- 62 files changed, 1110 insertions(+), 8980 deletions(-) delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy.php.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy_optimise.php.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy_print.php.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__data.inc.php.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/classtrees_csstidy.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_optimise_php.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_php.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_print_php.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_data_inc_php.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy_optimise.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy_print.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/elementindex.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/elementindex_csstidy.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/errors.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/index.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/li_csstidy.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/media/background.png delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/media/empty.png delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/media/style.css delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/Docs/todolist.html delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/class.csstidy_ctype.php delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/cssparse.css delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/cssparsed.css delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/template.tpl delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/template1.tpl delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/template2.tpl delete mode 100644 www/plugins-dist/compresseur/lib/csstidy/template3.tpl diff --git a/www/CHANGELOG.txt b/www/CHANGELOG.txt index 1b7b1508..7fab8dd8 100644 --- a/www/CHANGELOG.txt +++ b/www/CHANGELOG.txt @@ -1,3 +1,30 @@ + +SPIP-Core spip-3.0.15 -> spip-3.0.16 13 mars 2014 +------------------------------------------------------------- +r21232 | cedric | (sam. 22 févr. 2014) | Ferme #3143 : pipelines pre_edition et post_edition dans rubrique_instituer +r21236 | cedric | (dim. 23 févr. 2014) | Report de r21211 : Depuis r14416 les tests simpletest ne fonctionnaient plus car ne récupéraient plus le tableau des erreurs du debusqueur. On permet d'obtenir ces informations (et d'effacer le tableau) via un 3e argument. +r21237 | denisb | (lun. 24 févr. 2014) | ecrire/inc_version.php : "Vingt fois sur le métier remettez votre ouvrage ; Polissez-le sans cesse et le repolissez : Ajoutez quelques fois et souvent effacez. " +r21238 | denisb | (lun. 24 févr. 2014) | ecrire/paquet.xml : vingt-et-un ! (voir commit précédent). +r21241 | cedric | (mar. 04 mars 2014) | Ferme #3176 : quand == == on reste sur le cas par defaut de == (severo) +r21243 | cedric | (mer. 05 mars 2014) | une securite qui evite de perdre des donnees dans le cas idiot ou la table _liens n'est pas creee +r21246 | cedric | (ven. 07 mars 2014) | Un echappement manquant dans une requete SQL, c'est mal (Philippe Baumgart et al) +r21253 | cedric | (sam. 08 mars 2014) | la fonction titre_automatique fait appel à la fonction surchargeable titrer_contenu qui calcul un titre pour un contenu donné.La fonction titrer_contenu peut recevoir le contenu sous forme de tableau, ou utiliser les valeurs du POST +r21258 | cedric | (jeu. 13 mars 2014) | Report de http://zone.spip.org/trac/spip-zone/changeset/81334 : v 1.1.9 : on est plus radical avec les tentatives d'injection par connect : aucune chance que ce soit une demande licite, on bloque donc le hit, cela evite de generer des cache compile foireux + +SPIP-plugins-dist spip-3.0.15 -> spip-3.0.16 13 mars 2014 +------------------------------------------------------------- +r80997 | cedric | (dim. 23 févr. 2014)| Report de r80808 : Mise à jour du lanceur de simpletest +r80998 | cedric | (dim. 23 févr. 2014)| Report de r80752 : Adaptation des tests à la nouvelle version de SimpleTest (et notices php en moins) +r81069 | cy_altern | (mer. 26 févr. 2014)| report 81067 +r81101 | cy_altern | (jeu. 27 févr. 2014)| un GET sans SET: la variable name est dans ENV +r81208 | cedric | (mer. 05 mars 2014) | Report de http://core.spip.org/projects/spip/repository/revisions/21242 : ne pas injecter un largeur="0" et hauteur="0" si c'est une image (distante) dont on ne connait pas les dimensions.(laisser faire le navigateur) +r81254 | cedric | (ven. 07 mars 2014) | bugfix : lorsque le type d'URL était fixé par la globale et non par la meta, le formulaire d'edition ne fonctionnait pas bien (il ne chargeait pas le bon module) +r81266 | b_b | (ven. 07 mars 2014) | report plus que tardif de r65147 qui fixait http://core.spip.org/issues/2827 (vraiment limiter le sujet à 3 caractères min) +r81273 | eric | (sam. 08 mars 2014) | Ajout d'une autorisation générique participer aux forums privés pour un objet quelconque. Cette autorisation permet d'afficher ou non les boutons "poster un message" ou "répondre au message".Par défaut, cette autorisation est toujours vraie.Tout objet peut la surcharger. +r81321 | cedric | (jeu. 13 mars 2014) | Report de r81300 : reparer le if_stri automatique sur les if_str ayant des lettres +r81322 | cedric | (jeu. 13 mars 2014) | Report de r81320 : complement de r81300 : il faut initialiser la regle avant de la rejeter sur le critere if_str/if_stri car il peuvent etre optimise par l'initialisation (un if_str sur une chaine case sensitive est automatiquement transforme en if_stri) +r81332 | cedric | (jeu. 13 mars 2014) | Upgrade de la librairie CSSTidy en v1.5.2 + SPIP-Core spip-3.0.14 -> spip-3.0.15 21 février 2014 ------------------------------------------------------------- diff --git a/www/config/ecran_securite.php b/www/config/ecran_securite.php index 7e6ec1c5..36b00446 100644 --- a/www/config/ecran_securite.php +++ b/www/config/ecran_securite.php @@ -5,7 +5,7 @@ * ------------------ */ -define('_ECRAN_SECURITE', '1.1.8'); // 2013-08-29 +define('_ECRAN_SECURITE', '1.1.9'); // 2014-03-13 /* * Documentation : http://www.spip.net/fr_article4200.html @@ -254,13 +254,12 @@ if (isset($_REQUEST['connect']) AND // cas qui permettent de sortir d'un commentaire PHP (strpos($_REQUEST['connect'], "?")!==false + OR strpos($_REQUEST['connect'], "<")!==false OR strpos($_REQUEST['connect'], ">")!==false OR strpos($_REQUEST['connect'], "\n")!==false OR strpos($_REQUEST['connect'], "\r")!==false) ) { - $_REQUEST['connect'] = str_replace(array("?", ">", "\r", "\n"), "", $_REQUEST['connect']); - if (isset($_GET['connect'])) $_GET['connect'] = $_REQUEST['connect']; - if (isset($_POST['connect'])) $_POST['connect'] = $_REQUEST['connect']; + $ecran_securite_raison = "malformed connect argument"; } /* @@ -317,4 +316,4 @@ if ( } -?> +?> \ No newline at end of file diff --git a/www/ecrire/action/editer_rubrique.php b/www/ecrire/action/editer_rubrique.php index e5713dfa..2c6ed642 100644 --- a/www/ecrire/action/editer_rubrique.php +++ b/www/ecrire/action/editer_rubrique.php @@ -226,9 +226,26 @@ function rubrique_instituer($id_rubrique, $c) { } } elseif (editer_rubrique_breves($id_rubrique, $id_parent, $c)) { + + $champs = array('id_parent' => $id_parent); $statut_ancien = $s['statut']; - sql_updateq('spip_rubriques', array('id_parent' => $id_parent), "id_rubrique=$id_rubrique"); + // Envoyer aux plugins + $champs = pipeline('pre_edition', + array( + 'args' => array( + 'table' => 'spip_rubriques', + 'id_objet' => $id_rubrique, + 'action'=>'instituer', + 'statut_ancien' => $statut_ancien, + ), + 'data' => $champs + ) + ); + + if (!count($champs)) return ''; + + sql_updateq('spip_rubriques', $champs, "id_rubrique=$id_rubrique"); propager_les_secteurs(); @@ -241,6 +258,19 @@ function rubrique_instituer($id_rubrique, $c) { effacer_meta("date_calcul_rubriques"); calculer_langues_rubriques(); + + // Pipeline + pipeline('post_edition', + array( + 'args' => array( + 'table' => 'spip_rubriques', + 'id_objet' => $id_rubrique, + 'action'=>'instituer', + 'statut_ancien' => $statut_ancien, + ), + 'data' => $champs + ) + ); } } } diff --git a/www/ecrire/inc/editer.php b/www/ecrire/inc/editer.php index 80093e19..af084e4d 100644 --- a/www/ecrire/inc/editer.php +++ b/www/ecrire/inc/editer.php @@ -219,28 +219,51 @@ function editer_texte_recolle($texte, $att_text) } /** - * Determiner un titre automatique si non renseigne, + * auto-renseigner le titre si il n'existe pas + * + * @param $champ_titre + * @param $champs_contenu + * @param int $longueur + */ +function titre_automatique($champ_titre,$champs_contenu,$longueur=null){ + if (!_request($champ_titre)){ + $titrer_contenu = charger_fonction('titrer_contenu','inc'); + if (!is_null($longueur)) + $t = $titrer_contenu($champs_contenu,null,$longueur); + else + $t = $titrer_contenu($champs_contenu); + if ($t) + set_request($champ_titre,$t); + } +} + +/** + * Determiner un titre automatique, * a partir des champs textes de contenu * - * @param string $champ_titre - * nom du champ titre * @param array $champs_contenu * liste des champs contenu textuels + * @param array|null $c + * tableau qui contient les valeurs des champs de contenu + * si null on utilise les valeurs du POST * @param int $longueur - * @return void + * longueur de coupe + * @return string */ -function titre_automatique($champ_titre,$champs_contenu,$longueur=50){ - // auto-renseigner le titre si il n'existe pas - if (!_request($champ_titre)){ - foreach($champs_contenu as $c){ - if ($t = _request($c)) - break; - } - if ($t){ - include_spip('inc/texte_mini'); - set_request($champ_titre,couper($t,$longueur,"...")); - } +function inc_titrer_contenu_dist($champs_contenu, $c=null, $longueur=50){ + // trouver un champ texte non vide + $t = ""; + foreach($champs_contenu as $champ){ + if ($t = _request($champ,$c)) + break; } + + if ($t){ + include_spip('inc/texte_mini'); + $t = couper($t,$longueur,"..."); + } + + return $t; } // Produit la liste des md5 d'un tableau de donnees, sous forme diff --git a/www/ecrire/inc/filtres_ecrire.php b/www/ecrire/inc/filtres_ecrire.php index 2ad7d6ec..b4b8e130 100644 --- a/www/ecrire/inc/filtres_ecrire.php +++ b/www/ecrire/inc/filtres_ecrire.php @@ -493,7 +493,8 @@ function afficher_plus_info($lien, $titre="+", $titre_lien="") { function lister_objets_lies($objet_source,$objet,$id_objet,$objet_lien){ include_spip('action/editer_liens'); $l = array(); - if ($objet_lien==$objet){ + // quand $objet == $objet_lien == $objet_source on reste sur le cas par defaut de $objet_lien == $objet_source + if ($objet_lien==$objet AND $objet_lien!==$objet_source){ $res = objet_trouver_liens(array($objet=>$id_objet),array($objet_source=>'*')); } else{ diff --git a/www/ecrire/inc_version.php b/www/ecrire/inc_version.php index c3f13976..869d6fc9 100644 --- a/www/ecrire/inc_version.php +++ b/www/ecrire/inc_version.php @@ -290,7 +290,7 @@ $liste_des_authentifications = array( // pour specifier les versions de SPIP necessaires // il faut s'en tenir a un nombre de decimales fixe // ex : 2.0.0, 2.0.0-dev, 2.0.0-beta, 2.0.0-beta2 -$spip_version_branche = "3.0.15"; +$spip_version_branche = "3.0.16"; // version des signatures de fonctions PHP // (= numero SVN de leur derniere modif cassant la compatibilite et/ou necessitant un recalcul des squelettes) $spip_version_code = 17873; diff --git a/www/ecrire/maj/svn10000.php b/www/ecrire/maj/svn10000.php index b48580a5..abe37f21 100644 --- a/www/ecrire/maj/svn10000.php +++ b/www/ecrire/maj/svn10000.php @@ -301,6 +301,10 @@ function maj_liens($pivot,$l='') { if (!$desc = $trouver_table($ancienne_table)) return; + // securite pour ne pas perdre de donnees + if (!$trouver_table($liens)) + return; + $champs = $desc['field']; if (isset($champs['maj'])) unset($champs['maj']); if (isset($champs[$primary])) unset($champs[$primary]); diff --git a/www/ecrire/paquet.xml b/www/ecrire/paquet.xml index e4871e23..3e049e10 100644 --- a/www/ecrire/paquet.xml +++ b/www/ecrire/paquet.xml @@ -1,7 +1,7 @@ erreur) -// et volontaires (var_mode et var_profile) -// Si pas d'autorisation, les erreurs ne sont pas affichees -// (mais seront dans les logs) -// Si l'erreur vient de SPIP, en parler sur spip@rezo.net - -function public_debusquer_dist($message = '', $lieu = ''){ + +/** + * Point d'entrée pour les erreurs de compilation + * + * Point d'entrée pour les appels involontaires ($message non vide => erreur) + * et volontaires (var_mode et var_profile) + * + * Si pas d'autorisation, les erreurs ne sont pas affichées + * (mais seront dans les logs) + * + * Si l'erreur vient de SPIP, en parler sur `spip@rezo.net` + * + * @param bool|string|array $message + * - Message d'erreur (string|array) + * - false pour retourner le texte des messages d'erreurs + * - vide pour afficher les messages d'erreurs + * @param string|Contexte $lieu + * Contexte : lieu d'origine de l'erreur + * @param array $opt + * Options pour debug ou tests unitaires + * - 'erreurs' = 'get' : Retourne le tableau des erreurs + * - 'erreurs' = 'reset' : Efface le tableau des erreurs + * @return null|string + * - string si $message à false. +**/ +function public_debusquer_dist($message = '', $lieu = '', $opt = array()){ global $visiteur_session; global $debug_objets; static $tableau_des_erreurs = array(); + // Pour des tests unitaires, pouvoir récupérer les erreurs générées + if (isset($opt['erreurs'])) { + if ($opt['erreurs'] == 'get') { + return $tableau_des_erreurs; + } + if ($opt['erreurs'] == 'reset') { + $tableau_des_erreurs = array(); + return true; + } + } + // Erreur ou appel final ? if ($message){ $message = debusquer_compose_message($message); diff --git a/www/ecrire/public/quete.php b/www/ecrire/public/quete.php index fcac3468..5283ab5a 100644 --- a/www/ecrire/public/quete.php +++ b/www/ecrire/public/quete.php @@ -392,7 +392,7 @@ function calcul_exposer ($id, $prim, $reference, $parent, $type, $connect='') { $exposer[$m][$type][$principal] = true; if ($type == 'id_mot'){ if (!$parent) { - $parent = sql_getfetsel('id_groupe','spip_mots',"id_mot=" . $principal, '','','','',$connect); + $parent = sql_getfetsel('id_groupe','spip_mots',"id_mot=" . intval($principal), '','','','',$connect); } if ($parent) $exposer[$m]['id_groupe'][$parent] = true; diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy.php.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy.php.html deleted file mode 100644 index be1898f8..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy.php.html +++ /dev/null @@ -1,1038 +0,0 @@ - - -File Source for class.csstidy.php - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- - 		-
- -

Source for file class.csstidy.php

-

Documentation is available at class.csstidy.php

-
-
  1. <?php
    2. 
-
  2. /**
    3. 
-
  3.  * CSSTidy - CSS Parser and Optimiser
    4. 
-
  4.  *
    5. 
-
  5.  * CSS Parser class
    6. 
-
  6.  *
    7. 
-
  7.  * This file is part of CSSTidy.
    8. 
-
  8.  *
    9. 
-
  9.  * CSSTidy is free software; you can redistribute it and/or modify
    10. 
-
  10.  * it under the terms of the GNU General Public License as published by
    11. 
-
  11.  * the Free Software Foundation; either version 2 of the License, or
    12. 
-
  12.  * (at your option) any later version.
    13. 
-
  13.  *
    14. 
-
  14.  * CSSTidy is distributed in the hope that it will be useful,
    15. 
-
  15.  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16. 
-
  16.  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17. 
-
  17.  * GNU General Public License for more details.
    18. 
-
  18.  *
    19. 
-
  19.  * You should have received a copy of the GNU General Public License
    20. 
-
  20.  * along with CSSTidy; if not, write to the Free Software
    21. 
-
  21.  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    22. 
-
  22.  *
    23. 
-
  23.  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
    24. 
-
  24.  * @package csstidy
    25. 
-
  25.  * @author Florian Schmitz (floele at gmail dot com) 2005-2006
    26. 
-
  26.  */
    27. 
-
  27.  
    28. 
-
  28. /**
    29. 
-
  29.  * Various CSS data needed for correct optimisations etc.
    30. 
-
  30.  *
    31. 
-
  31.  * @version 1.2
    32. 
-
  32.  */
    33. 
-
  33. require('data.inc.php');
    34. 
-
  34.  
    35. 
-
  35. /**
    36. 
-
  36.  * Contains a class for printing CSS code
    37. 
-
  37.  *
    38. 
-
  38.  * @version 1.0
    39. 
-
  39.  */
    40. 
-
  40. require('class.csstidy_print.php');
    41. 
-
  41.  
    42. 
-
  42. /**
    43. 
-
  43.  * Contains a class for optimising CSS code
    44. 
-
  44.  *
    45. 
-
  45.  * @version 1.0
    46. 
-
  46.  */
    47. 
-
  47. require('class.csstidy_optimise.php');
    48. 
-
  48.  
    49. 
-
  49. /**
    50. 
-
  50.  * CSS Parser class
    51. 
-
  51.  *
    52. 
-
  52.  * This class represents a CSS parser which reads CSS code and saves it in an array.
    53. 
-
  53.  * In opposite to most other CSS parsers, it does not use regular expressions and
    54. 
-
  54.  * thus has full CSS2 support and a higher reliability.
    55. 
-
  55.  * Additional to that it applies some optimisations and fixes to the CSS code.
    56. 
-
  56.  * An online version should be available here: http://cdburnerxp.se/cssparse/css_optimiser.php
    57. 
-
  57.  * @package csstidy
    58. 
-
  58.  * @author Florian Schmitz (floele at gmail dot com) 2005-2006
    59. 
-
  59.  * @version 1.2
    60. 
-
  60.  */
    61. 
-
  61. class csstidy {
    62. 
-
  62.  
    63. 
-
  63. /**
    64. 
-
  64.  * Saves the parsed CSS
    65. 
-
  65.  * @var array 
    66. 
-
  66.  * @access public
    67. 
-
  67.  */
    68. 
-
  68. var $css = array();
    69. 
-
  69.  
    70. 
-
  70. /**
    71. 
-
  71.  * Saves the parsed CSS (raw)
    72. 
-
  72.  * @var array 
    73. 
-
  73.  * @access private
    74. 
-
  74.  */
    75. 
-
  75. var $tokens = array();
    76. 
-
  76.  
    77. 
-
  77. /**
    78. 
-
  78.  * Printer class
    79. 
-
  79.  * @see csstidy_print
    80. 
-
  80.  * @var object 
    81. 
-
  81.  * @access public
    82. 
-
  82.  */
    83. 
-
  83. var $print;
    84. 
-
  84.  
    85. 
-
  85. /**
    86. 
-
  86.  * Optimiser class
    87. 
-
  87.  * @see csstidy_optimise
    88. 
-
  88.  * @var object 
    89. 
-
  89.  * @access private
    90. 
-
  90.  */
    91. 
-
  91. var $optimise;
    92. 
-
  92.  
    93. 
-
  93. /**
    94. 
-
  94.  * Saves the CSS charset (@charset)
    95. 
-
  95.  * @var string 
    96. 
-
  96.  * @access private
    97. 
-
  97.  */
    98. 
-
  98. var $charset = '';
    99. 
-
  99.  
    100. 
-
  100. /**
    101. 
-
  101.  * Saves all @import URLs
    102. 
-
  102.  * @var array 
    103. 
-
  103.  * @access private
    104. 
-
  104.  */
    105. 
-
  105. var $import = array();
    106. 
-
  106.  
    107. 
-
  107. /**
    108. 
-
  108.  * Saves the namespace
    109. 
-
  109.  * @var string 
    110. 
-
  110.  * @access private
    111. 
-
  111.  */
    112. 
-
  112. var $namespace = '';
    113. 
-
  113.  
    114. 
-
  114. /**
    115. 
-
  115.  * Contains the version of csstidy
    116. 
-
  116.  * @var string 
    117. 
-
  117.  * @access private
    118. 
-
  118.  */
    119. 
-
  119. var $version = '1.2';
    120. 
-
  120.  
    121. 
-
  121. /**
    122. 
-
  122.  * Stores the settings
    123. 
-
  123.  * @var array 
    124. 
-
  124.  * @access private
    125. 
-
  125.  */
    126. 
-
  126. var $settings = array();
    127. 
-
  127.  
    128. 
-
  128. /**
    129. 
-
  129.  * Saves the parser-status.
    130. 
-
  130.  *
    131. 
-
  131.  * Possible values:
    132. 
-
  132.  * - is = in selector
    133. 
-
  133.  * - ip = in property
    134. 
-
  134.  * - iv = in value
    135. 
-
  135.  * - instr = in string (started at " or ' or ( )
    136. 
-
  136.  * - ic = in comment (ignore everything)
    137. 
-
  137.  * - at = in @-block
    138. 
-
  138.  * 
    139. 
-
  139.  * @var string 
    140. 
-
  140.  * @access private
    141. 
-
  141.  */
    142. 
-
  142. var $status = 'is';
    143. 
-
  143.  
    144. 
-
  144.  
    145. 
-
  145. /**
    146. 
-
  146.  * Saves the current at rule (@media)
    147. 
-
  147.  * @var string 
    148. 
-
  148.  * @access private
    149. 
-
  149.  */
    150. 
-
  150. var $at = '';
    151. 
-
  151.  
    152. 
-
  152. /**
    153. 
-
  153.  * Saves the current selector
    154. 
-
  154.  * @var string 
    155. 
-
  155.  * @access private
    156. 
-
  156.  */
    157. 
-
  157. var $selector = '';
    158. 
-
  158.  
    159. 
-
  159. /**
    160. 
-
  160.  * Saves the current property
    161. 
-
  161.  * @var string 
    162. 
-
  162.  * @access private
    163. 
-
  163.  */
    164. 
-
  164. var $property = '';
    165. 
-
  165.  
    166. 
-
  166. /**
    167. 
-
  167.  * Saves the position of , in selectors
    168. 
-
  168.  * @var array 
    169. 
-
  169.  * @access private
    170. 
-
  170.  */
    171. 
-
  171. var $sel_separate = array();
    172. 
-
  172.  
    173. 
-
  173. /**
    174. 
-
  174.  * Saves the current value
    175. 
-
  175.  * @var string 
    176. 
-
  176.  * @access private
    177. 
-
  177.  */
    178. 
-
  178. var $value = '';
    179. 
-
  179.  
    180. 
-
  180. /**
    181. 
-
  181.  * Saves the current sub-value
    182. 
-
  182.  *
    183. 
-
  183.  * Example for a subvalue:
    184. 
-
  184.  * background:url(foo.png) red no-repeat;
    185. 
-
  185.  * "url(foo.png)", "red", and  "no-repeat" are subvalues,
    186. 
-
  186.  * seperated by whitespace
    187. 
-
  187.  * @var string 
    188. 
-
  188.  * @access private
    189. 
-
  189.  */
    190. 
-
  190. var $sub_value = '';
    191. 
-
  191.  
    192. 
-
  192. /**
    193. 
-
  193.  * Array which saves all subvalues for a property.
    194. 
-
  194.  * @var array 
    195. 
-
  195.  * @see sub_value
    196. 
-
  196.  * @access private
    197. 
-
  197.  */
    198. 
-
  198. var $sub_value_arr = array();
    199. 
-
  199.  
    200. 
-
  200. /**
    201. 
-
  201.  * Saves the char which opened the last string
    202. 
-
  202.  * @var string 
    203. 
-
  203.  * @access private
    204. 
-
  204.  */
    205. 
-
  205. var $str_char = '';
    206. 
-
  206.  
    207. 
-
  207. /**
    208. 
-
  208.  * Status from which the parser switched to ic or instr
    209. 
-
  209.  * @var string 
    210. 
-
  210.  * @access private
    211. 
-
  211.  */
    212. 
-
  212. var $from = '';
    213. 
-
  213.  
    214. 
-
  214. /**
    215. 
-
  215.  * Variable needed to manage string-in-strings, for example url("foo.png")
    216. 
-
  216.  * @var string 
    217. 
-
  217.  * @access private
    218. 
-
  218.  */
    219. 
-
  219. var $str_in_str = false;
    220. 
-
  220.  
    221. 
-
  221. /**
    222. 
-
  222.  * =true if in invalid at-rule
    223. 
-
  223.  * @var bool 
    224. 
-
  224.  * @access private
    225. 
-
  225.  */
    226. 
-
  226. var $invalid_at = false;
    227. 
-
  227.  
    228. 
-
  228. /**
    229. 
-
  229.  * =true if something has been added to the current selector
    230. 
-
  230.  * @var bool 
    231. 
-
  231.  * @access private
    232. 
-
  232.  */
    233. 
-
  233. var $added = false;
    234. 
-
  234.  
    235. 
-
  235. /**
    236. 
-
  236.  * Array which saves the message log
    237. 
-
  237.  * @var array 
    238. 
-
  238.  * @access private
    239. 
-
  239.  */
    240. 
-
  240. var $log = array();
    241. 
-
  241.  
    242. 
-
  242. /**
    243. 
-
  243.  * Saves the line number
    244. 
-
  244.  * @var integer 
    245. 
-
  245.  * @access private
    246. 
-
  246.  */
    247. 
-
  247. var $line = 1;
    248. 
-
  248.  
    249. 
-
  249. /**
    250. 
-
  250.  * Loads standard template and sets default settings
    251. 
-
  251.  * @access private
    252. 
-
  252.  * @version 1.2
    253. 
-
  253.  */
    254. 
-
  254. function csstidy()
    255. 
-
  255. {    
    256. 
-
  256.     $this->settings['remove_bslash'] = true;
    257. 
-
  257.     $this->settings['compress_colors'] = true;
    258. 
-
  258.     $this->settings['compress_font-weight'] = true;
    259. 
-
  259.     $this->settings['lowercase_s'] = false;
    260. 
-
  260.     $this->settings['optimise_shorthands'] = 1;
    261. 
-
  261.     $this->settings['remove_last_;'] = false;
    262. 
-
  262.     $this->settings['case_properties'] = 1;
    263. 
-
  263.     $this->settings['sort_properties'] = false;
    264. 
-
  264.     $this->settings['sort_selectors'] = false;
    265. 
-
  265.     $this->settings['merge_selectors'] = 2;
    266. 
-
  266.     $this->settings['discard_invalid_properties'] = false;
    267. 
-
  267.     $this->settings['css_level'] = 'CSS2.1';
    268. 
-
  268.     $this->settings['preserve_css'] = false;
    269. 
-
  269.     $this->settings['timestamp'] = false;
    270. 
-
  270.  
    271. 
-
  271.     $this->load_template('default');
    272. 
-
  272.     $this->print = new csstidy_print($this);
    273. 
-
  273.     $this->optimise = new csstidy_optimise($this);
    274. 
-
  274. }
    275. 
-
  275.  
    276. 
-
  276. /**
    277. 
-
  277.  * Get the value of a setting.
    278. 
-
  278.  * @param string $setting 
    279. 
-
  279.  * @access public
    280. 
-
  280.  * @return mixed 
    281. 
-
  281.  * @version 1.0
    282. 
-
  282.  */
    283. 
-
  283. function get_cfg($setting)
    284. 
-
  284. {
    285. 
-
  285.     if(isset($this->settings[$setting]))
    286. 
-
  286.     {
    287. 
-
  287.         return $this->settings[$setting];
    288. 
-
  288.     }
    289. 
-
  289.     return false;
    290. 
-
  290. }
    291. 
-
  291.  
    292. 
-
  292. /**
    293. 
-
  293.  * Set the value of a setting.
    294. 
-
  294.  * @param string $setting 
    295. 
-
  295.  * @param mixed $value 
    296. 
-
  296.  * @access public
    297. 
-
  297.  * @return bool 
    298. 
-
  298.  * @version 1.0
    299. 
-
  299.  */
    300. 
-
  300. function set_cfg($setting,$value)
    301. 
-
  301. {
    302. 
-
  302.     if(isset($this->settings[$setting]) && $value !== '')
    303. 
-
  303.     {
    304. 
-
  304.         $this->settings[$setting] = $value;
    305. 
-
  305.         return true;
    306. 
-
  306.     }
    307. 
-
  307.     return false;
    308. 
-
  308. }
    309. 
-
  309.  
    310. 
-
  310. /**
    311. 
-
  311.  * Adds a token to $this->tokens
    312. 
-
  312.  * @param mixed $type 
    313. 
-
  313.  * @param string $data 
    314. 
-
  314.  * @param bool $do add a token even if preserve_css is off
    315. 
-
  315.  * @access private
    316. 
-
  316.  * @version 1.0
    317. 
-
  317.  */
    318. 
-
  318. function _add_token($type, $data, $do = false) {
    319. 
-
  319.     if($this->get_cfg('preserve_css') || $do) {
    320. 
-
  320.         $this->tokens[] = array($type, ($type == COMMENT) ? $data : trim($data));
    321. 
-
  321.     }
    322. 
-
  322. }
    323. 
-
  323.  
    324. 
-
  324. /**
    325. 
-
  325.  * Add a message to the message log
    326. 
-
  326.  * @param string $message 
    327. 
-
  327.  * @param string $type 
    328. 
-
  328.  * @param integer $line 
    329. 
-
  329.  * @access private
    330. 
-
  330.  * @version 1.0
    331. 
-
  331.  */
    332. 
-
  332. function log($message,$type,$line = -1)
    333. 
-
  333. {
    334. 
-
  334.     if($line === -1)
    335. 
-
  335.     {
    336. 
-
  336.         $line = $this->line;
    337. 
-
  337.     }
    338. 
-
  338.     $line = intval($line);
    339. 
-
  339.     $add = array('m' => $message, 't' => $type);
    340. 
-
  340.     if(!isset($this->log[$line]) || !in_array($add,$this->log[$line]))
    341. 
-
  341.     {
    342. 
-
  342.         $this->log[$line][] = $add;
    343. 
-
  343.     }
    344. 
-
  344. }
    345. 
-
  345.  
    346. 
-
  346. /**
    347. 
-
  347.  * Parse unicode notations and find a replacement character
    348. 
-
  348.  * @param string $string 
    349. 
-
  349.  * @param integer $i 
    350. 
-
  350.  * @access private
    351. 
-
  351.  * @return string 
    352. 
-
  352.  * @version 1.2
    353. 
-
  353.  */
    354. 
-
  354. function _unicode(&$string, &$i)
    355. 
-
  355. {
    356. 
-
  356.     ++$i;
    357. 
-
  357.     $add = '';
    358. 
-
  358.     $tokens =& $GLOBALS['csstidy']['tokens'];
    359. 
-
  359.     $replaced = false;
    360. 
-
  360.     
    361. 
-
  361.     while($i < strlen($string) && (ctype_xdigit($string{$i}) || ctype_space($string{$i})) && strlen($add) < 6)
    362. 
-
  362.     {
    363. 
-
  363.         $add .= $string{$i};
    364. 
-
  364.  
    365. 
-
  365.         if(ctype_space($string{$i})) {
    366. 
-
  366.             break;
    367. 
-
  367.         }
    368. 
-
  368.         $i++;
    369. 
-
  369.     }
    370. 
-
  370.  
    371. 
-
  371.     if(hexdec($add) > 47 && hexdec($add) < 58 || hexdec($add) > 64 && hexdec($add) < 91 || hexdec($add) > 96 && hexdec($add) < 123)
    372. 
-
  372.     {
    373. 
-
  373.         $this->log('Replaced unicode notation: Changed \\'. $add .' to ' . chr(hexdec($add)),'Information');
    374. 
-
  374.         $add = chr(hexdec($add));
    375. 
-
  375.         $replaced = true;
    376. 
-
  376.     }
    377. 
-
  377.     else {
    378. 
-
  378.         $add = trim('\\'.$add);
    379. 
-
  379.     }
    380. 
-
  380.  
    381. 
-
  381.     if(@ctype_xdigit($string{$i+1}) && ctype_space($string{$i})
    382. 
-
  382.        && !$replaced || !ctype_space($string{$i})) {
    383. 
-
  383.         $i--;
    384. 
-
  384.     }
    385. 
-
  385.     
    386. 
-
  386.     if($add != '\\' || !$this->get_cfg('remove_bslash') || strpos($tokens, $string{$i+1}) !== false) {
    387. 
-
  387.         return $add;
    388. 
-
  388.     }
    389. 
-
  389.     
    390. 
-
  390.     if($add == '\\') {
    391. 
-
  391.         $this->log('Removed unnecessary backslash','Information');
    392. 
-
  392.     }
    393. 
-
  393.     return '';
    394. 
-
  394. }
    395. 
-
  395.  
    396. 
-
  396. /**
    397. 
-
  397.  * Loads a new template
    398. 
-
  398.  * @param string $content either filename (if $from_file == true), content of a template file, "high_compression", "highest_compression", "low_compression", or "default"
    399. 
-
  399.  * @param bool $from_file uses $content as filename if true
    400. 
-
  400.  * @access public
    401. 
-
  401.  * @version 1.1
    402. 
-
  402.  * @see http://csstidy.sourceforge.net/templates.php
    403. 
-
  403.  */
    404. 
-
  404. function load_template($content, $from_file=true)
    405. 
-
  405. {
    406. 
-
  406.     $predefined_templates =& $GLOBALS['csstidy']['predefined_templates'];
    407. 
-
  407.     if($content == 'high_compression' || $content == 'default' || $content == 'highest_compression' || $content == 'low_compression')
    408. 
-
  408.     {
    409. 
-
  409.         $this->template = $predefined_templates[$content];
    410. 
-
  410.         return;
    411. 
-
  411.     }
    412. 
-
  412.     
    413. 
-
  413.     if($from_file)
    414. 
-
  414.     {
    415. 
-
  415.         $content = strip_tags(file_get_contents($content),'<span>');
    416. 
-
  416.     }
    417. 
-
  417.     $content = str_replace("\r\n","\n",$content); // Unify newlines (because the output also only uses \n)
    418. 
-
  418.     $template = explode('|',$content);
    419. 
-
  419.  
    420. 
-
  420.     for ($i = 0; $i < count($template); $i++ )
    421. 
-
  421.     {
    422. 
-
  422.         $this->template[$i] = $template[$i];
    423. 
-
  423.     }
    424. 
-
  424. }
    425. 
-
  425.  
    426. 
-
  426. /**
    427. 
-
  427.  * Starts parsing from URL
    428. 
-
  428.  * @param string $url 
    429. 
-
  429.  * @access public
    430. 
-
  430.  * @version 1.0
    431. 
-
  431.  */
    432. 
-
  432. function parse_from_url($url)
    433. 
-
  433. {
    434. 
-
  434.     return $this->parse(@file_get_contents($url));
    435. 
-
  435. }
    436. 
-
  436.  
    437. 
-
  437. /**
    438. 
-
  438.  * Checks if there is a token at the current position
    439. 
-
  439.  * @param string $string 
    440. 
-
  440.  * @param integer $i 
    441. 
-
  441.  * @access public
    442. 
-
  442.  * @version 1.11
    443. 
-
  443.  */
    444. 
-
  444. function is_token(&$string, $i)
    445. 
-
  445. {
    446. 
-
  446.     $tokens =& $GLOBALS['csstidy']['tokens'];
    447. 
-
  447.     return (strpos($tokens, $string{$i}) !== false && !csstidy::escaped($string,$i));
    448. 
-
  448. }
    449. 
-
  449.  
    450. 
-
  450.  
    451. 
-
  451. /**
    452. 
-
  452.  * Parses CSS in $string. The code is saved as array in $this->css
    453. 
-
  453.  * @param string $string the CSS code
    454. 
-
  454.  * @access public
    455. 
-
  455.  * @return bool 
    456. 
-
  456.  * @version 1.1
    457. 
-
  457.  */
    458. 
-
  458. function parse($string) {
    459. 
-
  459.     // PHP bug? Settings need to be refreshed in PHP4
    460. 
-
  460.     $this->print = new csstidy_print($this);
    461. 
-
  461.     $this->optimise = new csstidy_optimise($this);
    462. 
-
  462.     
    463. 
-
  463.     $all_properties =& $GLOBALS['csstidy']['all_properties'];
    464. 
-
  464.     $at_rules =& $GLOBALS['csstidy']['at_rules'];
    465. 
-
  465.  
    466. 
-
  466.     $this->css = array();
    467. 
-
  467.     $this->print->input_css = $string;
    468. 
-
  468.     $string = str_replace("\r\n","\n",$string) . ' ';
    469. 
-
  469.     $cur_comment = '';
    470. 
-
  470.     
    471. 
-
  471.     for ($i = 0, $size = strlen($string); $i < $size; $i++ )
    472. 
-
  472.     {
    473. 
-
  473.         if($string{$i} == "\n" || $string{$i} == "\r")
    474. 
-
  474.         {
    475. 
-
  475.             ++$this->line;
    476. 
-
  476.         }
    477. 
-
  477.         
    478. 
-
  478.         switch($this->status)
    479. 
-
  479.         {
    480. 
-
  480.             /* Case in at-block */
    481. 
-
  481.             case 'at':
    482. 
-
  482.             if(csstidy::is_token($string,$i))
    483. 
-
  483.             {
    484. 
-
  484.                 if($string{$i} == '/' && @$string{$i+1} == '*')
    485. 
-
  485.                 {
    486. 
-
  486.                     $this->status = 'ic'; ++$i;
    487. 
-
  487.                     $this->from = 'at';
    488. 
-
  488.                 }
    489. 
-
  489.                 elseif($string{$i} == '{')
    490. 
-
  490.                 {
    491. 
-
  491.                     $this->status = 'is';
    492. 
-
  492.                     $this->_add_token(AT_START, $this->at);
    493. 
-
  493.                 }
    494. 
-
  494.                 elseif($string{$i} == ',')
    495. 
-
  495.                 {
    496. 
-
  496.                     $this->at = trim($this->at).',';
    497. 
-
  497.                 }
    498. 
-
  498.                 elseif($string{$i} == '\\')
    499. 
-
  499.                 {
    500. 
-
  500.                     $this->at .= $this->_unicode($string,$i);
    501. 
-
  501.                 }
    502. 
-
  502.             }
    503. 
-
  503.             else
    504. 
-
  504.             {
    505. 
-
  505.                 $lastpos = strlen($this->at)-1;
    506. 
-
  506.                 if(!( (ctype_space($this->at{$lastpos}) || csstidy::is_token($this->at,$lastpos) && $this->at{$lastpos} == ',') && ctype_space($string{$i})))
    507. 
-
  507.                 {
    508. 
-
  508.                     $this->at .= $string{$i};
    509. 
-
  509.                 }
    510. 
-
  510.             }
    511. 
-
  511.             break;
    512. 
-
  512.             
    513. 
-
  513.             /* Case in-selector */
    514. 
-
  514.             case 'is':
    515. 
-
  515.             if(csstidy::is_token($string,$i))
    516. 
-
  516.             {
    517. 
-
  517.                 if($string{$i} == '/' && @$string{$i+1} == '*' && trim($this->selector) == '')
    518. 
-
  518.                 {
    519. 
-
  519.                     $this->status = 'ic'; ++$i;
    520. 
-
  520.                     $this->from = 'is';
    521. 
-
  521.                 }
    522. 
-
  522.                 elseif($string{$i} == '@' && trim($this->selector) == '')
    523. 
-
  523.                 {
    524. 
-
  524.                     // Check for at-rule
    525. 
-
  525.                     $this->invalid_at = true;
    526. 
-
  526.                     foreach($at_rules as $name => $type)
    527. 
-
  527.                     {
    528. 
-
  528.                         if(!strcasecmp(substr($string,$i+1,strlen($name)),$name))
    529. 
-
  529.                         {
    530. 
-
  530.                             ($type == 'at') ? $this->at = '@'.$name : $this->selector = '@'.$name;
    531. 
-
  531.                             $this->status = $type;
    532. 
-
  532.                             $i += strlen($name);
    533. 
-
  533.                             $this->invalid_at = false;
    534. 
-
  534.                         }
    535. 
-
  535.                     }
    536. 
-
  536.                             
    537. 
-
  537.                     if($this->invalid_at)
    538. 
-
  538.                     {
    539. 
-
  539.                         $this->selector = '@';
    540. 
-
  540.                         $invalid_at_name = '';
    541. 
-
  541.                         for($j = $i+1; $j < $size; ++$j)
    542. 
-
  542.                         {
    543. 
-
  543.                             if(!ctype_alpha($string{$j}))
    544. 
-
  544.                             {
    545. 
-
  545.                                 break;
    546. 
-
  546.                             }
    547. 
-
  547.                             $invalid_at_name .= $string{$j};
    548. 
-
  548.                         }
    549. 
-
  549.                         $this->log('Invalid @-rule: '.$invalid_at_name.' (removed)','Warning');
    550. 
-
  550.                     }
    551. 
-
  551.                 }
    552. 
-
  552.                 elseif(($string{$i} == '"' || $string{$i} == "'"))
    553. 
-
  553.                 {
    554. 
-
  554.                     $this->selector .= $string{$i};
    555. 
-
  555.                     $this->status = 'instr';
    556. 
-
  556.                     $this->str_char = $string{$i};
    557. 
-
  557.                     $this->from = 'is';
    558. 
-
  558.                 }
    559. 
-
  559.                 elseif($this->invalid_at && $string{$i} == ';')
    560. 
-
  560.                 {
    561. 
-
  561.                     $this->invalid_at = false;
    562. 
-
  562.                     $this->status = 'is';
    563. 
-
  563.                 }
    564. 
-
  564.                 elseif($string{$i} == '{')
    565. 
-
  565.                 {
    566. 
-
  566.                     $this->status = 'ip';
    567. 
-
  567.                     $this->_add_token(SEL_START, $this->selector);
    568. 
-
  568.                     $this->added = false;
    569. 
-
  569.                 }
    570. 
-
  570.                 elseif($string{$i} == '}')
    571. 
-
  571.                 {
    572. 
-
  572.                     $this->_add_token(AT_END, $this->at);
    573. 
-
  573.                     $this->at = '';
    574. 
-
  574.                     $this->selector = '';
    575. 
-
  575.                     $this->sel_separate = array();
    576. 
-
  576.                 }
    577. 
-
  577.                 elseif($string{$i} == ',') 
    578. 
-
  578.                 {
    579. 
-
  579.                     $this->selector = trim($this->selector).',';
    580. 
-
  580.                     $this->sel_separate[] = strlen($this->selector);
    581. 
-
  581.                 }
    582. 
-
  582.                 elseif($string{$i} == '\\')
    583. 
-
  583.                 {
    584. 
-
  584.                     $this->selector .= $this->_unicode($string,$i);
    585. 
-
  585.                 }
    586. 
-
  586.                 else $this->selector .= $string{$i};
    587. 
-
  587.             }
    588. 
-
  588.             else
    589. 
-
  589.             {
    590. 
-
  590.                 $lastpos = strlen($this->selector)-1;
    591. 
-
  591.                 if($lastpos == -1 || !( (ctype_space($this->selector{$lastpos}) || csstidy::is_token($this->selector,$lastpos) && $this->selector{$lastpos} == ',') && ctype_space($string{$i})))
    592. 
-
  592.                 {
    593. 
-
  593.                     $this->selector .= $string{$i};
    594. 
-
  594.                 }
    595. 
-
  595.             }
    596. 
-
  596.             break;
    597. 
-
  597.             
    598. 
-
  598.             /* Case in-property */
    599. 
-
  599.             case 'ip':
    600. 
-
  600.             if(csstidy::is_token($string,$i))
    601. 
-
  601.             {
    602. 
-
  602.                 if(($string{$i} == ':' || $string{$i} == '=') && $this->property != '')
    603. 
-
  603.                 {
    604. 
-
  604.                     $this->status = 'iv';
    605. 
-
  605.                     if(csstidy::property_is_valid($this->property) || !$this->get_cfg('discard_invalid_properties')) {
    606. 
-
  606.                         $this->_add_token(PROPERTY, $this->property);
    607. 
-
  607.                     }
    608. 
-
  608.                 }
    609. 
-
  609.                 elseif($string{$i} == '/' && @$string{$i+1} == '*' && $this->property == '')
    610. 
-
  610.                 {
    611. 
-
  611.                     $this->status = 'ic'; ++$i;
    612. 
-
  612.                     $this->from = 'ip';
    613. 
-
  613.                 }
    614. 
-
  614.                 elseif($string{$i} == '}')
    615. 
-
  615.                 {
    616. 
-
  616.                     $this->explode_selectors();
    617. 
-
  617.                     $this->status = 'is';
    618. 
-
  618.                     $this->invalid_at = false;
    619. 
-
  619.                     $this->_add_token(SEL_END, $this->selector);
    620. 
-
  620.                     $this->selector = '';
    621. 
-
  621.                     $this->property = '';
    622. 
-
  622.                 }
    623. 
-
  623.                 elseif($string{$i} == ';')
    624. 
-
  624.                 {
    625. 
-
  625.                     $this->property = '';
    626. 
-
  626.                 }
    627. 
-
  627.                 elseif($string{$i} == '\\')
    628. 
-
  628.                 {
    629. 
-
  629.                     $this->property .= $this->_unicode($string,$i);
    630. 
-
  630.                 }
    631. 
-
  631.             }
    632. 
-
  632.             elseif(!ctype_space($string{$i}))
    633. 
-
  633.             {
    634. 
-
  634.                 $this->property .= $string{$i};
    635. 
-
  635.             }
    636. 
-
  636.             break;
    637. 
-
  637.             
    638. 
-
  638.             /* Case in-value */
    639. 
-
  639.             case 'iv':
    640. 
-
  640.             $pn = (($string{$i} == "\n" || $string{$i} == "\r") && $this->property_is_next($string,$i+1) || $i == strlen($string)-1);
    641. 
-
  641.             if(csstidy::is_token($string,$i) || $pn)
    642. 
-
  642.             {
    643. 
-
  643.                 if($string{$i} == '/' && @$string{$i+1} == '*')
    644. 
-
  644.                 {
    645. 
-
  645.                     $this->status = 'ic'; ++$i;
    646. 
-
  646.                     $this->from = 'iv';
    647. 
-
  647.                 }
    648. 
-
  648.                 elseif(($string{$i} == '"' || $string{$i} == "'" || $string{$i} == '('))
    649. 
-
  649.                 {
    650. 
-
  650.                     $this->sub_value .= $string{$i};
    651. 
-
  651.                     $this->str_char = ($string{$i} == '(') ? ')' : $string{$i};
    652. 
-
  652.                     $this->status = 'instr';
    653. 
-
  653.                     $this->from = 'iv';
    654. 
-
  654.                 }
    655. 
-
  655.                 elseif($string{$i} == ',')
    656. 
-
  656.                 {
    657. 
-
  657.                     $this->sub_value = trim($this->sub_value).',';
    658. 
-
  658.                 }
    659. 
-
  659.                 elseif($string{$i} == '\\')
    660. 
-
  660.                 {
    661. 
-
  661.                     $this->sub_value .= $this->_unicode($string,$i);
    662. 
-
  662.                 }
    663. 
-
  663.                 elseif($string{$i} == ';' || $pn)
    664. 
-
  664.                 {
    665. 
-
  665.                     if($this->selector{0} == '@' && isset($at_rules[substr($this->selector,1)]) && $at_rules[substr($this->selector,1)] == 'iv')
    666. 
-
  666.                     {
    667. 
-
  667.                         $this->sub_value_arr[] = trim($this->sub_value);
    668. 
-
  668.                         
    669. 
-
  669.                         $this->status = 'is';
    670. 
-
  670.                         
    671. 
-
  671.                         switch($this->selector)
    672. 
-
  672.                         {
    673. 
-
  673.                             case '@charset': $this->charset = $this->sub_value_arr[0]; break;
    674. 
-
  674.                             case '@namespace': $this->namespace = implode(' ',$this->sub_value_arr); break;
    675. 
-
  675.                             case '@import': $this->import[] = implode(' ',$this->sub_value_arr); break;
    676. 
-
  676.                         }
    677. 
-
  677.         
    678. 
-
  678.                         $this->sub_value_arr = array();
    679. 
-
  679.                         $this->sub_value = '';
    680. 
-
  680.                         $this->selector = '';
    681. 
-
  681.                         $this->sel_separate = array();
    682. 
-
  682.                     }
    683. 
-
  683.                     else
    684. 
-
  684.                     {
    685. 
-
  685.                         $this->status = 'ip';
    686. 
-
  686.                     }
    687. 
-
  687.                 }
    688. 
-
  688.                 elseif($string{$i} != '}')
    689. 
-
  689.                 {
    690. 
-
  690.                     $this->sub_value .= $string{$i};
    691. 
-
  691.                 }
    692. 
-
  692.                 if(($string{$i} == '}' || $string{$i} == ';' || $pn) && !empty($this->selector))
    693. 
-
  693.                 {
    694. 
-
  694.                     if($this->at == '')
    695. 
-
  695.                     {
    696. 
-
  696.                         $this->at = DEFAULT_AT;
    697. 
-
  697.                     }
    698. 
-
  698.                     
    699. 
-
  699.                     // case settings
    700. 
-
  700.                     if($this->get_cfg('lowercase_s'))
    701. 
-
  701.                     {
    702. 
-
  702.                         $this->selector = strtolower($this->selector);
    703. 
-
  703.                     }
    704. 
-
  704.                     $this->property = strtolower($this->property);
    705. 
-
  705.                     
    706. 
-
  706.                     $this->optimise->subvalue();
    707. 
-
  707.                     if($this->sub_value != '') {
    708. 
-
  708.                         $this->sub_value_arr[] = $this->sub_value;
    709. 
-
  709.                         $this->sub_value = '';
    710. 
-
  710.                     }                
    711. 
-
  711.                         
    712. 
-
  712.                     $this->value = implode(' ',$this->sub_value_arr);
    713. 
-
  713.  
    714. 
-
  714.                     $this->selector = trim($this->selector);
    715. 
-
  715.                     
    716. 
-
  716.                     $this->optimise->value();
    717. 
-
  717.                              
    718. 
-
  718.                     $valid = csstidy::property_is_valid($this->property);
    719. 
-
  719.                     if((!$this->invalid_at || $this->get_cfg('preserve_css')) && (!$this->get_cfg('discard_invalid_properties') || $valid))
    720. 
-
  720.                     {
    721. 
-
  721.                         $this->css_add_property($this->at,$this->selector,$this->property,$this->value);
    722. 
-
  722.                         $this->_add_token(VALUE, $this->value);
    723. 
-
  723.                         $this->optimise->shorthands();
    724. 
-
  724.                     }
    725. 
-
  725.                     if(!$valid)
    726. 
-
  726.                     {
    727. 
-
  727.                         if($this->get_cfg('discard_invalid_properties'))
    728. 
-
  728.                         {
    729. 
-
  729.                             $this->log('Removed invalid property: '.$this->property,'Warning');
    730. 
-
  730.                         }
    731. 
-
  731.                         else
    732. 
-
  732.                         {
    733. 
-
  733.                             $this->log('Invalid property in '.strtoupper($this->get_cfg('css_level')).': '.$this->property,'Warning');
    734. 
-
  734.                         }
    735. 
-
  735.                     }
    736. 
-
  736.                                         
    737. 
-
  737.                     $this->property = '';
    738. 
-
  738.                     $this->sub_value_arr = array();
    739. 
-
  739.                     $this->value = '';
    740. 
-
  740.                 }
    741. 
-
  741.                 if($string{$i} == '}')
    742. 
-
  742.                 {
    743. 
-
  743.                     $this->explode_selectors();
    744. 
-
  744.                     $this->_add_token(SEL_END, $this->selector);
    745. 
-
  745.                     $this->status = 'is';
    746. 
-
  746.                     $this->invalid_at = false;
    747. 
-
  747.                     $this->selector = '';
    748. 
-
  748.                 }    
    749. 
-
  749.             }
    750. 
-
  750.             elseif(!$pn)
    751. 
-
  751.             {
    752. 
-
  752.                 $this->sub_value .= $string{$i};
    753. 
-
  753.  
    754. 
-
  754.                 if(ctype_space($string{$i}))
    755. 
-
  755.                 {
    756. 
-
  756.                     $this->optimise->subvalue();
    757. 
-
  757.                     if($this->sub_value != '') {
    758. 
-
  758.                         $this->sub_value_arr[] = $this->sub_value;
    759. 
-
  759.                         $this->sub_value = '';
    760. 
-
  760.                     }
    761. 
-
  761.                 }
    762. 
-
  762.             }
    763. 
-
  763.             break;
    764. 
-
  764.             
    765. 
-
  765.             /* Case in string */
    766. 
-
  766.             case 'instr':
    767. 
-
  767.             if($this->str_char == ')' && $string{$i} == '"' && !$this->str_in_str && !csstidy::escaped($string,$i))
    768. 
-
  768.             {
    769. 
-
  769.                 $this->str_in_str = true;
    770. 
-
  770.             }
    771. 
-
  771.             elseif($this->str_char == ')' && $string{$i} == '"' && $this->str_in_str && !csstidy::escaped($string,$i))
    772. 
-
  772.             {
    773. 
-
  773.                 $this->str_in_str = false;
    774. 
-
  774.             }
    775. 
-
  775.             if($string{$i} == $this->str_char && !csstidy::escaped($string,$i) && !$this->str_in_str)
    776. 
-
  776.             {
    777. 
-
  777.                 $this->status = $this->from;
    778. 
-
  778.             }
    779. 
-
  779.             $temp_add = $string{$i};
    780. 
-
  780.                                                                 // ...and no not-escaped backslash at the previous position
    781. 
-
  781.             if( ($string{$i} == "\n" || $string{$i} == "\r") && !($string{$i-1} == '\\' && !csstidy::escaped($string,$i-1)) )
    782. 
-
  782.             {
    783. 
-
  783.                 $temp_add = "\\A ";
    784. 
-
  784.                 $this->log('Fixed incorrect newline in string','Warning');
    785. 
-
  785.             }
    786. 
-
  786.             if($this->from == 'iv')
    787. 
-
  787.             {
    788. 
-
  788.                 $this->sub_value .= $temp_add;
    789. 
-
  789.             }
    790. 
-
  790.             elseif($this->from == 'is')
    791. 
-
  791.             {
    792. 
-
  792.                 $this->selector .= $temp_add;
    793. 
-
  793.             }
    794. 
-
  794.             break;
    795. 
-
  795.             
    796. 
-
  796.             /* Case in-comment */
    797. 
-
  797.             case 'ic':
    798. 
-
  798.             if($string{$i} == '*' && $string{$i+1} == '/')
    799. 
-
  799.             {
    800. 
-
  800.                 $this->status = $this->from;
    801. 
-
  801.                 $i++;
    802. 
-
  802.                 $this->_add_token(COMMENT, $cur_comment);
    803. 
-
  803.                 $cur_comment = '';
    804. 
-
  804.             }
    805. 
-
  805.             else
    806. 
-
  806.             {
    807. 
-
  807.                 $cur_comment .= $string{$i};
    808. 
-
  808.             }
    809. 
-
  809.             break;
    810. 
-
  810.         }
    811. 
-
  811.     }
    812. 
-
  812.  
    813. 
-
  813.     $this->optimise->postparse();
    814. 
-
  814.  
    815. 
-
  815.     $this->print->_reset();
    816. 
-
  816.  
    817. 
-
  817.     return !(empty($this->css) && empty($this->import) && empty($this->charset) && empty($this->tokens) && empty($this->namespace));
    818. 
-
  818. }
    819. 
-
  819.  
    820. 
-
  820. /**
    821. 
-
  821.  * Explodes selectors
    822. 
-
  822.  * @access private
    823. 
-
  823.  * @version 1.0
    824. 
-
  824.  */
    825. 
-
  825. function explode_selectors()
    826. 
-
  826. {
    827. 
-
  827.     // Explode multiple selectors
    828. 
-
  828.     if($this->get_cfg('merge_selectors') == 1)
    829. 
-
  829.     {
    830. 
-
  830.         $new_sels = array();
    831. 
-
  831.         $lastpos = 0;
    832. 
-
  832.         $this->sel_separate[] = strlen($this->selector);
    833. 
-
  833.         foreach($this->sel_separate as $num => $pos)
    834. 
-
  834.         {
    835. 
-
  835.             if($num == count($this->sel_separate)-1) {
    836. 
-
  836.                 $pos += 1;
    837. 
-
  837.             }
    838. 
-
  838.             
    839. 
-
  839.             $new_sels[] = substr($this->selector,$lastpos,$pos-$lastpos-1);
    840. 
-
  840.             $lastpos = $pos;
    841. 
-
  841.         }
    842. 
-
  842.  
    843. 
-
  843.         if(count($new_sels) > 1)
    844. 
-
  844.         {
    845. 
-
  845.             foreach($new_sels as $selector)
    846. 
-
  846.             {
    847. 
-
  847.                 $this->merge_css_blocks($this->at,$selector,$this->css[$this->at][$this->selector]);
    848. 
-
  848.             }
    849. 
-
  849.             unset($this->css[$this->at][$this->selector]);
    850. 
-
  850.         }
    851. 
-
  851.     }
    852. 
-
  852.     $this->sel_separate = array();
    853. 
-
  853. }
    854. 
-
  854.  
    855. 
-
  855. /**
    856. 
-
  856.  * Checks if a character is escaped (and returns true if it is)
    857. 
-
  857.  * @param string $string 
    858. 
-
  858.  * @param integer $pos 
    859. 
-
  859.  * @access public
    860. 
-
  860.  * @return bool 
    861. 
-
  861.  * @version 1.02
    862. 
-
  862.  */
    863. 
-
  863. function escaped(&$string,$pos) 
    864. 
-
  864. {
    865. 
-
  865.     return !(@($string{$pos-1} != '\\') || csstidy::escaped($string,$pos-1));
    866. 
-
  866. }
    867. 
-
  867.  
    868. 
-
  868. /**
    869. 
-
  869.  * Adds a property with value to the existing CSS code
    870. 
-
  870.  * @param string $media 
    871. 
-
  871.  * @param string $selector 
    872. 
-
  872.  * @param string $property 
    873. 
-
  873.  * @param string $new_val 
    874. 
-
  874.  * @access private
    875. 
-
  875.  * @version 1.2
    876. 
-
  876.  */
    877. 
-
  877. function css_add_property($media,$selector,$property,$new_val)
    878. 
-
  878. {   
    879. 
-
  879.     if($this->get_cfg('preserve_css') || trim($new_val) == '') {
    880. 
-
  880.         return;
    881. 
-
  881.     }
    882. 
-
  882.  
    883. 
-
  883.     $this->added = true;
    884. 
-
  884.     if(isset($this->css[$media][$selector][$property]))
    885. 
-
  885.     {
    886. 
-
  886.         if((csstidy::is_important($this->css[$media][$selector][$property]) && csstidy::is_important($new_val)) || !csstidy::is_important($this->css[$media][$selector][$property]))
    887. 
-
  887.         {
    888. 
-
  888.             unset($this->css[$media][$selector][$property]);
    889. 
-
  889.             $this->css[$media][$selector][$property] = trim($new_val);
    890. 
-
  890.         }
    891. 
-
  891.     }
    892. 
-
  892.     else
    893. 
-
  893.     {
    894. 
-
  894.         $this->css[$media][$selector][$property] = trim($new_val);
    895. 
-
  895.     }
    896. 
-
  896. }
    897. 
-
  897.  
    898. 
-
  898. /**
    899. 
-
  899.  * Adds CSS to an existing media/selector
    900. 
-
  900.  * @param string $media 
    901. 
-
  901.  * @param string $selector 
    902. 
-
  902.  * @param array $css_add 
    903. 
-
  903.  * @access private
    904. 
-
  904.  * @version 1.1
    905. 
-
  905.  */
    906. 
-
  906. function merge_css_blocks($media,$selector,$css_add)
    907. 
-
  907. {
    908. 
-
  908.     foreach($css_add as $property => $value)
    909. 
-
  909.     {
    910. 
-
  910.         $this->css_add_property($media,$selector,$property,$value,false);
    911. 
-
  911.     }
    912. 
-
  912. }
    913. 
-
  913.  
    914. 
-
  914. /**
    915. 
-
  915.  * Checks if $value is !important.
    916. 
-
  916.  * @param string $value 
    917. 
-
  917.  * @return bool 
    918. 
-
  918.  * @access public
    919. 
-
  919.  * @version 1.0
    920. 
-
  920.  */
    921. 
-
  921. function is_important(&$value)
    922. 
-
  922. {
    923. 
-
  923.     return (!strcasecmp(substr(str_replace($GLOBALS['csstidy']['whitespace'],'',$value),-10,10),'!important'));
    924. 
-
  924. }
    925. 
-
  925.  
    926. 
-
  926. /**
    927. 
-
  927.  * Returns a value without !important
    928. 
-
  928.  * @param string $value 
    929. 
-
  929.  * @return string 
    930. 
-
  930.  * @access public
    931. 
-
  931.  * @version 1.0
    932. 
-
  932.  */
    933. 
-
  933. function gvw_important($value)
    934. 
-
  934. {
    935. 
-
  935.     if(csstidy::is_important($value))
    936. 
-
  936.     {
    937. 
-
  937.         $value = trim($value);
    938. 
-
  938.         $value = substr($value,0,-9);
    939. 
-
  939.         $value = trim($value);
    940. 
-
  940.         $value = substr($value,0,-1);
    941. 
-
  941.         $value = trim($value);
    942. 
-
  942.         return $value;
    943. 
-
  943.     }
    944. 
-
  944.     return $value;
    945. 
-
  945. }
    946. 
-
  946.  
    947. 
-
  947. /**
    948. 
-
  948.  * Checks if the next word in a string from pos is a CSS property
    949. 
-
  949.  * @param string $istring 
    950. 
-
  950.  * @param integer $pos 
    951. 
-
  951.  * @return bool 
    952. 
-
  952.  * @access private
    953. 
-
  953.  * @version 1.2
    954. 
-
  954.  */
    955. 
-
  955. function property_is_next($istring, $pos)
    956. 
-
  956. {
    957. 
-
  957.     $all_properties =& $GLOBALS['csstidy']['all_properties'];
    958. 
-
  958.     $istring = substr($istring,$pos,strlen($istring)-$pos);
    959. 
-
  959.     $pos = strpos($istring,':');
    960. 
-
  960.     if($pos === false)
    961. 
-
  961.     {
    962. 
-
  962.         return false;
    963. 
-
  963.     }
    964. 
-
  964.     $istring = strtolower(trim(substr($istring,0,$pos)));
    965. 
-
  965.     if(isset($all_properties[$istring]))
    966. 
-
  966.     {
    967. 
-
  967.         $this->log('Added semicolon to the end of declaration','Warning');
    968. 
-
  968.         return true;
    969. 
-
  969.     }
    970. 
-
  970.     return false;
    971. 
-
  971. }
    972. 
-
  972.  
    973. 
-
  973. /**
    974. 
-
  974.  * Checks if a property is valid
    975. 
-
  975.  * @param string $property 
    976. 
-
  976.  * @return bool; 
    977. 
-
  977.  * @access public
    978. 
-
  978.  * @version 1.0
    979. 
-
  979.  */
    980. 
-
  980. function property_is_valid($property) {
    981. 
-
  981.     $all_properties =& $GLOBALS['csstidy']['all_properties'];
    982. 
-
  982.     return (isset($all_properties[$property]) && strpos($all_properties[$property],strtoupper($this->get_cfg('css_level'))) !== false );
    983. 
-
  983. }
    984. 
-
  984.  
    985. 
-
  985. }
    986. 
-
  986. ?>
    987. 
-
-
-
-
- Documentation generated on Mon, 15 May 2006 22:55:14 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy_optimise.php.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy_optimise.php.html deleted file mode 100644 index f13419ce..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy_optimise.php.html +++ /dev/null @@ -1,851 +0,0 @@ - - -File Source for class.csstidy_optimise.php - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- - 		-
- -

Source for file class.csstidy_optimise.php

-

Documentation is available at class.csstidy_optimise.php

-
-
  1. <?php
    2. 
-
  2. /**
    3. 
-
  3.  * CSSTidy - CSS Parser and Optimiser
    4. 
-
  4.  *
    5. 
-
  5.  * CSS Optimising Class
    6. 
-
  6.  * This class optimises CSS data generated by csstidy.
    7. 
-
  7.  *
    8. 
-
  8.  * This file is part of CSSTidy.
    9. 
-
  9.  *
    10. 
-
  10.  * CSSTidy is free software; you can redistribute it and/or modify
    11. 
-
  11.  * it under the terms of the GNU General Public License as published by
    12. 
-
  12.  * the Free Software Foundation; either version 2 of the License, or
    13. 
-
  13.  * (at your option) any later version.
    14. 
-
  14.  *
    15. 
-
  15.  * CSSTidy is distributed in the hope that it will be useful,
    16. 
-
  16.  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    17. 
-
  17.  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    18. 
-
  18.  * GNU General Public License for more details.
    19. 
-
  19.  *
    20. 
-
  20.  * You should have received a copy of the GNU General Public License
    21. 
-
  21.  * along with CSSTidy; if not, write to the Free Software
    22. 
-
  22.  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    23. 
-
  23.  *
    24. 
-
  24.  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
    25. 
-
  25.  * @package csstidy
    26. 
-
  26.  * @author Florian Schmitz (floele at gmail dot com) 2005-2006
    27. 
-
  27.  */
    28. 
-
  28.  
    29. 
-
  29. /**
    30. 
-
  30.  * CSS Optimising Class
    31. 
-
  31.  *
    32. 
-
  32.  * This class optimises CSS data generated by csstidy.
    33. 
-
  33.  *
    34. 
-
  34.  * @package csstidy
    35. 
-
  35.  * @author Florian Schmitz (floele at gmail dot com) 2005-2006
    36. 
-
  36.  * @version 1.0
    37. 
-
  37.  */
    38. 
-
  38.  
    39. 
-
  39. class csstidy_optimise
    40. 
-
  40. {
    41. 
-
  41.     /**
    42. 
-
  42.      * Constructor
    43. 
-
  43.      * @param array $css contains the class csstidy
    44. 
-
  44.      * @access private
    45. 
-
  45.      * @version 1.0
    46. 
-
  46.      */
    47. 
-
  47.     function csstidy_optimise(&$css)
    48. 
-
  48.     {
    49. 
-
  49.         $this->parser    =& $css;
    50. 
-
  50.         $this->css       =& $css->css;
    51. 
-
  51.         $this->sub_value =& $css->sub_value;
    52. 
-
  52.         $this->at        =& $css->at;
    53. 
-
  53.         $this->selector  =& $css->selector;
    54. 
-
  54.         $this->property  =& $css->property;
    55. 
-
  55.         $this->value     =& $css->value;
    56. 
-
  56.     }
    57. 
-
  57.  
    58. 
-
  58.     /**
    59. 
-
  59.      * Optimises $css after parsing
    60. 
-
  60.      * @access public
    61. 
-
  61.      * @version 1.0
    62. 
-
  62.      */
    63. 
-
  63.     function postparse()
    64. 
-
  64.     {
    65. 
-
  65.         if ($this->parser->get_cfg('preserve_css')) {
    66. 
-
  66.             return;
    67. 
-
  67.         }
    68. 
-
  68.         
    69. 
-
  69.         if ($this->parser->get_cfg('merge_selectors') == 2)
    70. 
-
  70.         {
    71. 
-
  71.             foreach ($this->css as $medium => $value)
    72. 
-
  72.             {
    73. 
-
  73.                 $this->merge_selectors($this->css[$medium]);
    74. 
-
  74.             }
    75. 
-
  75.         }
    76. 
-
  76.  
    77. 
-
  77.         if ($this->parser->get_cfg('optimise_shorthands') > 0)
    78. 
-
  78.         {
    79. 
-
  79.             foreach ($this->css as $medium => $value)
    80. 
-
  80.             {
    81. 
-
  81.                 foreach ($value as $selector => $value1)
    82. 
-
  82.                 {
    83. 
-
  83.                     $this->css[$medium][$selector] = csstidy_optimise::merge_4value_shorthands($this->css[$medium][$selector]);
    84. 
-
  84.                     
    85. 
-
  85.                     if ($this->parser->get_cfg('optimise_shorthands') < 2) {
    86. 
-
  86.                         continue;
    87. 
-
  87.                     }
    88. 
-
  88.                     
    89. 
-
  89.                     $this->css[$medium][$selector] = csstidy_optimise::merge_bg($this->css[$medium][$selector]);
    90. 
-
  90.                     if (empty($this->css[$medium][$selector])) {
    91. 
-
  91.                         unset($this->css[$medium][$selector]);
    92. 
-
  92.                     }
    93. 
-
  93.                 }
    94. 
-
  94.             }
    95. 
-
  95.         }
    96. 
-
  96.     }
    97. 
-
  97.  
    98. 
-
  98.     /**
    99. 
-
  99.      * Optimises values
    100. 
-
  100.      * @access public
    101. 
-
  101.      * @version 1.0
    102. 
-
  102.      */
    103. 
-
  103.     function value()
    104. 
-
  104.     {
    105. 
-
  105.         $shorthands =& $GLOBALS['csstidy']['shorthands'];
    106. 
-
  106.         
    107. 
-
  107.         // optimise shorthand properties
    108. 
-
  108.         if(isset($shorthands[$this->property]))
    109. 
-
  109.         {
    110. 
-
  110.             $temp = csstidy_optimise::shorthand($this->value); // FIXME - move
    111. 
-
  111.             if($temp != $this->value)
    112. 
-
  112.             {
    113. 
-
  113.                 $this->parser->log('Optimised shorthand notation ('.$this->property.'): Changed "'.$this->value.'" to "'.$temp.'"','Information');
    114. 
-
  114.             }
    115. 
-
  115.             $this->value = $temp;
    116. 
-
  116.         }
    117. 
-
  117.         
    118. 
-
  118.         // Remove whitespace at ! important
    119. 
-
  119.         if($this->value != $this->compress_important($this->value))
    120. 
-
  120.         {
    121. 
-
  121.             $this->parser->log('Optimised !important','Information');
    122. 
-
  122.         }
    123. 
-
  123.     }
    124. 
-
  124.                      
    125. 
-
  125.     /**
    126. 
-
  126.      * Optimises shorthands
    127. 
-
  127.      * @access public
    128. 
-
  128.      * @version 1.0
    129. 
-
  129.      */
    130. 
-
  130.     function shorthands()
    131. 
-
  131.     {
    132. 
-
  132.         $shorthands =& $GLOBALS['csstidy']['shorthands'];
    133. 
-
  133.         
    134. 
-
  134.         if(!$this->parser->get_cfg('optimise_shorthands') || $this->parser->get_cfg('preserve_css')) {
    135. 
-
  135.             return;
    136. 
-
  136.         }
    137. 
-
  137.         
    138. 
-
  138.         if($this->property == 'background' && $this->parser->get_cfg('optimise_shorthands') > 1)
    139. 
-
  139.         {
    140. 
-
  140.             unset($this->css[$this->at][$this->selector]['background']);
    141. 
-
  141.             $this->parser->merge_css_blocks($this->at,$this->selector,csstidy_optimise::dissolve_short_bg($this->value));
    142. 
-
  142.         }
    143. 
-
  143.         if(isset($shorthands[$this->property]))
    144. 
-
  144.         {
    145. 
-
  145.             $this->parser->merge_css_blocks($this->at,$this->selector,csstidy_optimise::dissolve_4value_shorthands($this->property,$this->value));
    146. 
-
  146.             if(is_array($shorthands[$this->property]))
    147. 
-
  147.             {
    148. 
-
  148.                 unset($this->css[$this->at][$this->selector][$this->property]);
    149. 
-
  149.             }
    150. 
-
  150.         }
    151. 
-
  151.     }
    152. 
-
  152.     
    153. 
-
  153.     /**
    154. 
-
  154.      * Optimises a sub-value
    155. 
-
  155.      * @access public
    156. 
-
  156.      * @version 1.0
    157. 
-
  157.      */
    158. 
-
  158.     function subvalue()
    159. 
-
  159.     {
    160. 
-
  160.         $replace_colors =& $GLOBALS['csstidy']['replace_colors'];
    161. 
-
  161.  
    162. 
-
  162.         $this->sub_value = trim($this->sub_value);
    163. 
-
  163.         if($this->sub_value == '') // caution : '0'
    164. 
-
  164.         {
    165. 
-
  165.             return;
    166. 
-
  166.         }
    167. 
-
  167.         
    168. 
-
  168.         // Compress font-weight
    169. 
-
  169.         if($this->property == 'font-weight' && $this->parser->get_cfg('compress_font-weight'))
    170. 
-
  170.         {
    171. 
-
  171.             $important = '';
    172. 
-
  172.             if(csstidy::is_important($this->sub_value))
    173. 
-
  173.             {
    174. 
-
  174.                 $important = ' !important';
    175. 
-
  175.                 $this->sub_value = csstidy::gvw_important($this->sub_value);
    176. 
-
  176.             }
    177. 
-
  177.             if($this->sub_value == 'bold')
    178. 
-
  178.             {
    179. 
-
  179.                 $this->sub_value = '700'.$important;
    180. 
-
  180.                 $this->parser->log('Optimised font-weight: Changed "bold" to "700"','Information');
    181. 
-
  181.             }
    182. 
-
  182.             else if($this->sub_value == 'normal')
    183. 
-
  183.             {
    184. 
-
  184.                 $this->sub_value = '400'.$important;
    185. 
-
  185.                 $this->parser->log('Optimised font-weight: Changed "normal" to "400"','Information');
    186. 
-
  186.             }
    187. 
-
  187.         }
    188. 
-
  188.         
    189. 
-
  189.         $temp = $this->compress_numbers($this->sub_value);
    190. 
-
  190.         if($temp != $this->sub_value)
    191. 
-
  191.         {
    192. 
-
  192.             if(strlen($temp) > strlen($this->sub_value)) {
    193. 
-
  193.                 $this->parser->log('Fixed invalid number: Changed "'.$this->sub_value.'" to "'.$temp.'"','Warning');
    194. 
-
  194.             } else {
    195. 
-
  195.                 $this->parser->log('Optimised number: Changed "'.$this->sub_value.'" to "'.$temp.'"','Information');
    196. 
-
  196.             }            
    197. 
-
  197.             $this->sub_value = $temp;
    198. 
-
  198.         }
    199. 
-
  199.         if($this->parser->get_cfg('compress_colors'))
    200. 
-
  200.         {
    201. 
-
  201.             $temp = $this->cut_color($this->sub_value);
    202. 
-
  202.             if($temp !== $this->sub_value)
    203. 
-
  203.             {
    204. 
-
  204.                 if(isset($replace_colors[$this->sub_value])) {
    205. 
-
  205.                     $this->parser->log('Fixed invalid color name: Changed "'.$this->sub_value.'" to "'.$temp.'"','Warning');
    206. 
-
  206.                 } else {
    207. 
-
  207.                     $this->parser->log('Optimised color: Changed "'.$this->sub_value.'" to "'.$temp.'"','Information');
    208. 
-
  208.                 }                
    209. 
-
  209.                 $this->sub_value = $temp;
    210. 
-
  210.             }
    211. 
-
  211.         }
    212. 
-
  212.     }
    213. 
-
  213.     
    214. 
-
  214.     /**
    215. 
-
  215.      * Compresses shorthand values. Example: margin:1px 1px 1px 1px -> margin:1px
    216. 
-
  216.      * @param string $value 
    217. 
-
  217.      * @access public
    218. 
-
  218.      * @return string 
    219. 
-
  219.      * @version 1.0
    220. 
-
  220.      */
    221. 
-
  221.     function shorthand($value)
    222. 
-
  222.     {
    223. 
-
  223.         $important = '';
    224. 
-
  224.         if(csstidy::is_important($value))
    225. 
-
  225.         {
    226. 
-
  226.             $values = csstidy::gvw_important($value);
    227. 
-
  227.             $important = ' !important';
    228. 
-
  228.         }
    229. 
-
  229.         else $values = $value;
    230. 
-
  230.         
    231. 
-
  231.         $values = explode(' ',$values);
    232. 
-
  232.         switch(count($values))
    233. 
-
  233.         {
    234. 
-
  234.             case 4:
    235. 
-
  235.             if($values[0] == $values[1] && $values[0] == $values[2] && $values[0] == $values[3])
    236. 
-
  236.             {
    237. 
-
  237.                 return $values[0].$important;
    238. 
-
  238.             }
    239. 
-
  239.             elseif($values[1] == $values[3] && $values[0] == $values[2])
    240. 
-
  240.             {
    241. 
-
  241.                 return $values[0].' '.$values[1].$important;
    242. 
-
  242.             }
    243. 
-
  243.             elseif($values[1] == $values[3])
    244. 
-
  244.             {
    245. 
-
  245.                 return $values[0].' '.$values[1].' '.$values[2].$important;
    246. 
-
  246.             }
    247. 
-
  247.             break;
    248. 
-
  248.             
    249. 
-
  249.             case 3:
    250. 
-
  250.             if($values[0] == $values[1] && $values[0] == $values[2])
    251. 
-
  251.             {
    252. 
-
  252.                 return $values[0].$important;
    253. 
-
  253.             }
    254. 
-
  254.             elseif($values[0] == $values[2])
    255. 
-
  255.             {
    256. 
-
  256.                 return $values[0].' '.$values[1].$important;
    257. 
-
  257.             }
    258. 
-
  258.             break;
    259. 
-
  259.             
    260. 
-
  260.             case 2:
    261. 
-
  261.             if($values[0] == $values[1])
    262. 
-
  262.             {
    263. 
-
  263.                 return $values[0].$important;
    264. 
-
  264.             }
    265. 
-
  265.             break;
    266. 
-
  266.         }
    267. 
-
  267.         
    268. 
-
  268.         return $value;
    269. 
-
  269.     }
    270. 
-
  270.  
    271. 
-
  271.     /**
    272. 
-
  272.      * Removes unnecessary whitespace in ! important
    273. 
-
  273.      * @param string $string 
    274. 
-
  274.      * @return string 
    275. 
-
  275.      * @access public
    276. 
-
  276.      * @version 1.1
    277. 
-
  277.      */
    278. 
-
  278.     function compress_important(&$string)
    279. 
-
  279.     {
    280. 
-
  280.         if(csstidy::is_important($string))
    281. 
-
  281.         {
    282. 
-
  282.             $string = csstidy::gvw_important($string) . ' !important';
    283. 
-
  283.         }
    284. 
-
  284.         return $string;
    285. 
-
  285.     }
    286. 
-
  286.  
    287. 
-
  287.     /**
    288. 
-
  288.      * Color compression function. Converts all rgb() values to #-values and uses the short-form if possible. Also replaces 4 color names by #-values.
    289. 
-
  289.      * @param string $color 
    290. 
-
  290.      * @return string 
    291. 
-
  291.      * @version 1.1
    292. 
-
  292.      */
    293. 
-
  293.     function cut_color($color)
    294. 
-
  294.     {
    295. 
-
  295.         $replace_colors =& $GLOBALS['csstidy']['replace_colors'];
    296. 
-
  296.         
    297. 
-
  297.         // rgb(0,0,0) -> #000000 (or #000 in this case later)
    298. 
-
  298.         if(strtolower(substr($color,0,4)) == 'rgb(')
    299. 
-
  299.         {
    300. 
-
  300.             $color_tmp = substr($color,4,strlen($color)-5);
    301. 
-
  301.             $color_tmp = explode(',',$color_tmp);
    302. 
-
  302.             for ( $i = 0; $i < count($color_tmp); $i++ )
    303. 
-
  303.             {
    304. 
-
  304.                 $color_tmp[$i] = trim ($color_tmp[$i]);
    305. 
-
  305.                 if(substr($color_tmp[$i],-1) == '%')
    306. 
-
  306.                 {
    307. 
-
  307.                     $color_tmp[$i] = round((255*$color_tmp[$i])/100);
    308. 
-
  308.                 }
    309. 
-
  309.                 if($color_tmp[$i]>255) $color_tmp[$i] = 255;
    310. 
-
  310.             }
    311. 
-
  311.             $color = '#';
    312. 
-
  312.             for ($i = 0; $i < 3; $i++ )
    313. 
-
  313.             {
    314. 
-
  314.                 if($color_tmp[$i]<16) {
    315. 
-
  315.                     $color .= '0' . dechex($color_tmp[$i]);
    316. 
-
  316.                 } else {
    317. 
-
  317.                     $color .= dechex($color_tmp[$i]);
    318. 
-
  318.                 }
    319. 
-
  319.             }
    320. 
-
  320.         }
    321. 
-
  321.         
    322. 
-
  322.         // Fix bad color names
    323. 
-
  323.         if(isset($replace_colors[strtolower($color)]))
    324. 
-
  324.         {
    325. 
-
  325.             $color = $replace_colors[strtolower($color)];
    326. 
-
  326.         }
    327. 
-
  327.         
    328. 
-
  328.         // #aabbcc -> #abc
    329. 
-
  329.         if(strlen($color) == 7)
    330. 
-
  330.         {
    331. 
-
  331.             $color_temp = strtolower($color);
    332. 
-
  332.             if($color_temp{0} == '#' && $color_temp{1} == $color_temp{2} && $color_temp{3} == $color_temp{4} && $color_temp{5} == $color_temp{6})
    333. 
-
  333.             {
    334. 
-
  334.                 $color = '#'.$color{1}.$color{3}.$color{5};
    335. 
-
  335.             }
    336. 
-
  336.         }
    337. 
-
  337.         
    338. 
-
  338.         switch(strtolower($color))
    339. 
-
  339.         {
    340. 
-
  340.             /* color name -> hex code */
    341. 
-
  341.             case 'black': return '#000';
    342. 
-
  342.             case 'fuchsia': return '#F0F';
    343. 
-
  343.             case 'white': return '#FFF';
    344. 
-
  344.             case 'yellow': return '#FF0';
    345. 
-
  345.                     
    346. 
-
  346.             /* hex code -> color name */
    347. 
-
  347.             case '#800000': return 'maroon';
    348. 
-
  348.             case '#ffa500': return 'orange';
    349. 
-
  349.             case '#808000': return 'olive';
    350. 
-
  350.             case '#800080': return 'purple';
    351. 
-
  351.             case '#008000': return 'green';
    352. 
-
  352.             case '#000080': return 'navy';
    353. 
-
  353.             case '#008080': return 'teal';
    354. 
-
  354.             case '#c0c0c0': return 'silver';
    355. 
-
  355.             case '#808080': return 'gray';
    356. 
-
  356.             case '#f00': return 'red';    
    357. 
-
  357.         }
    358. 
-
  358.  
    359. 
-
  359.         return $color;
    360. 
-
  360.     }
    361. 
-
  361.     
    362. 
-
  362.     /**
    363. 
-
  363.      * Compresses numbers (ie. 1.0 becomes 1 or 1.100 becomes 1.1 )
    364. 
-
  364.      * @param string $subvalue 
    365. 
-
  365.      * @return string 
    366. 
-
  366.      * @version 1.2
    367. 
-
  367.      */
    368. 
-
  368.     function compress_numbers($subvalue)
    369. 
-
  369.     {
    370. 
-
  370.         $units =& $GLOBALS['csstidy']['units'];
    371. 
-
  371.         $number_values =& $GLOBALS['csstidy']['number_values'];
    372. 
-
  372.         $color_values =& $GLOBALS['csstidy']['color_values'];
    373. 
-
  373.  
    374. 
-
  374.         // for font:1em/1em sans-serif...;
    375. 
-
  375.         if($this->property == 'font')
    376. 
-
  376.         {
    377. 
-
  377.             $temp = explode('/',$subvalue);
    378. 
-
  378.         }
    379. 
-
  379.         else
    380. 
-
  380.         {
    381. 
-
  381.             $temp = array($subvalue);
    382. 
-
  382.         }
    383. 
-
  383.         for ($l = 0; $l < count($temp); $l++)
    384. 
-
  384.         {
    385. 
-
  385.             // continue if no numeric value
    386. 
-
  386.             if (!(strlen($temp[$l]) > 0 && ( is_numeric($temp[$l]{0}) || $temp[$l]{0} == '+' || $temp[$l]{0} == '-' ) ))
    387. 
-
  387.             {
    388. 
-
  388.                 continue;
    389. 
-
  389.             }
    390. 
-
  390.  
    391. 
-
  391.             // Fix bad colors
    392. 
-
  392.             if (in_array($this->property, $color_values))
    393. 
-
  393.             {
    394. 
-
  394.                 $temp[$l] = '#'.$temp[$l];
    395. 
-
  395.             }
    396. 
-
  396.         
    397. 
-
  397.             if (floatval($temp[$l]) == 0)
    398. 
-
  398.             {
    399. 
-
  399.                 $temp[$l] = '0';
    400. 
-
  400.             }
    401. 
-
  401.             else
    402. 
-
  402.             {
    403. 
-
  403.                 $unit_found = FALSE;
    404. 
-
  404.                 for ($m = 0, $size_4 = count($units); $m < $size_4; $m++)
    405. 
-
  405.                 {
    406. 
-
  406.                     if (strpos(strtolower($temp[$l]),$units[$m]) !== FALSE)
    407. 
-
  407.                     {
    408. 
-
  408.                         $temp[$l] = floatval($temp[$l]).$units[$m];
    409. 
-
  409.                         $unit_found = TRUE;
    410. 
-
  410.                         break;
    411. 
-
  411.                     }
    412. 
-
  412.                 }
    413. 
-
  413.                 if (!$unit_found && !in_array($this->property,$number_values,TRUE))
    414. 
-
  414.                 {
    415. 
-
  415.                     $temp[$l] = floatval($temp[$l]).'px';
    416. 
-
  416.                 }
    417. 
-
  417.                 else if (!$unit_found)
    418. 
-
  418.                 {
    419. 
-
  419.                     $temp[$l] = floatval($temp[$l]);
    420. 
-
  420.                 }
    421. 
-
  421.             }
    422. 
-
  422.         }
    423. 
-
  423.  
    424. 
-
  424.         return ((count($temp) > 1) ? $temp[0].'/'.$temp[1] : $temp[0]);
    425. 
-
  425.     }
    426. 
-
  426.  
    427. 
-
  427.     /**
    428. 
-
  428.      * Merges selectors with same properties. Example: a{color:red} b{color:red} -> a,b{color:red}
    429. 
-
  429.      * Very basic and has at least one bug. Hopefully there is a replacement soon.
    430. 
-
  430.      * @param array $array 
    431. 
-
  431.      * @return array 
    432. 
-
  432.      * @access public
    433. 
-
  433.      * @version 1.2
    434. 
-
  434.      */
    435. 
-
  435.     function merge_selectors(&$array)
    436. 
-
  436.     {
    437. 
-
  437.         $css = $array;
    438. 
-
  438.         foreach($css as $key => $value)
    439. 
-
  439.         {
    440. 
-
  440.             if(!isset($css[$key]))
    441. 
-
  441.             {
    442. 
-
  442.                 continue;
    443. 
-
  443.             }
    444. 
-
  444.             $newsel = '';
    445. 
-
  445.             
    446. 
-
  446.             // Check if properties also exist in another selector
    447. 
-
  447.             $keys = array();
    448. 
-
  448.             // PHP bug (?) without $css = $array; here
    449. 
-
  449.             foreach($css as $selector => $vali)
    450. 
-
  450.             {
    451. 
-
  451.                 if($selector == $key)
    452. 
-
  452.                 {
    453. 
-
  453.                     continue;
    454. 
-
  454.                 }
    455. 
-
  455.                 
    456. 
-
  456.                 if($css[$key] === $vali)
    457. 
-
  457.                 {
    458. 
-
  458.                     $keys[] = $selector;
    459. 
-
  459.                 }
    460. 
-
  460.             }
    461. 
-
  461.  
    462. 
-
  462.             if(!empty($keys))
    463. 
-
  463.             {
    464. 
-
  464.                 $newsel = $key;
    465. 
-
  465.                 unset($css[$key]);
    466. 
-
  466.                 foreach($keys as $selector)
    467. 
-
  467.                 {
    468. 
-
  468.                     unset($css[$selector]);
    469. 
-
  469.                     $newsel .= ','.$selector;
    470. 
-
  470.                 }
    471. 
-
  471.                 $css[$newsel] = $value;
    472. 
-
  472.             }
    473. 
-
  473.         }
    474. 
-
  474.         $array = $css;
    475. 
-
  475.     }
    476. 
-
  476.  
    477. 
-
  477.     /**
    478. 
-
  478.      * Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;...
    479. 
-
  479.      * @param string $property 
    480. 
-
  480.      * @param string $value 
    481. 
-
  481.      * @return array 
    482. 
-
  482.      * @version 1.0
    483. 
-
  483.      * @see merge_4value_shorthands()
    484. 
-
  484.      */
    485. 
-
  485.     function dissolve_4value_shorthands($property,$value)
    486. 
-
  486.     {
    487. 
-
  487.         $shorthands =& $GLOBALS['csstidy']['shorthands'];
    488. 
-
  488.         if(!is_array($shorthands[$property]))
    489. 
-
  489.         {
    490. 
-
  490.             $return[$property] = $value;
    491. 
-
  491.             return $return;
    492. 
-
  492.         }
    493. 
-
  493.         
    494. 
-
  494.         $important = '';
    495. 
-
  495.         if(csstidy::is_important($value))
    496. 
-
  496.         {
    497. 
-
  497.             $value = csstidy::gvw_important($value);
    498. 
-
  498.             $important = ' !important';
    499. 
-
  499.         }
    500. 
-
  500.         $values = explode(' ',$value);
    501. 
-
  501.  
    502. 
-
  502.  
    503. 
-
  503.         $return = array();
    504. 
-
  504.         if(count($values) == 4)
    505. 
-
  505.         {
    506. 
-
  506.             for($i=0;$i<4;$i++)
    507. 
-
  507.             {
    508. 
-
  508.                 $return[$shorthands[$property][$i]] = $values[$i].$important;
    509. 
-
  509.             }
    510. 
-
  510.         }
    511. 
-
  511.         elseif(count($values) == 3)
    512. 
-
  512.         {
    513. 
-
  513.             $return[$shorthands[$property][0]] = $values[0].$important;
    514. 
-
  514.             $return[$shorthands[$property][1]] = $values[1].$important;
    515. 
-
  515.             $return[$shorthands[$property][3]] = $values[1].$important;
    516. 
-
  516.             $return[$shorthands[$property][2]] = $values[2].$important;
    517. 
-
  517.         }
    518. 
-
  518.         elseif(count($values) == 2)
    519. 
-
  519.         {
    520. 
-
  520.             for($i=0;$i<4;$i++)
    521. 
-
  521.             {
    522. 
-
  522.                 $return[$shorthands[$property][$i]] = (($i % 2 != 0)) ? $values[1].$important : $values[0].$important;
    523. 
-
  523.             }
    524. 
-
  524.         }
    525. 
-
  525.         else
    526. 
-
  526.         {
    527. 
-
  527.             for($i=0;$i<4;$i++)
    528. 
-
  528.             {
    529. 
-
  529.                 $return[$shorthands[$property][$i]] = $values[0].$important;
    530. 
-
  530.             }    
    531. 
-
  531.         }
    532. 
-
  532.         
    533. 
-
  533.         return $return;
    534. 
-
  534.     }
    535. 
-
  535.  
    536. 
-
  536.     /**
    537. 
-
  537.      * Explodes a string as explode() does, however, not if $sep is escaped or within a string.
    538. 
-
  538.      * @param string $sep seperator
    539. 
-
  539.      * @param string $string 
    540. 
-
  540.      * @return array 
    541. 
-
  541.      * @version 1.0
    542. 
-
  542.      */
    543. 
-
  543.     function explode_ws($sep,$string)
    544. 
-
  544.     {
    545. 
-
  545.         $status = 'st';
    546. 
-
  546.         $to = '';
    547. 
-
  547.         
    548. 
-
  548.         $output = array();
    549. 
-
  549.         $num = 0;
    550. 
-
  550.         for($i = 0, $len = strlen($string);$i < $len; $i++)
    551. 
-
  551.         {
    552. 
-
  552.             switch($status)
    553. 
-
  553.             {
    554. 
-
  554.                 case 'st':
    555. 
-
  555.                 if($string{$i} == $sep && !csstidy::escaped($string,$i))
    556. 
-
  556.                 {
    557. 
-
  557.                     ++$num;
    558. 
-
  558.                 }
    559. 
-
  559.                 elseif($string{$i} == '"' || $string{$i} == '\'' || $string{$i} == '(' && !csstidy::escaped($string,$i))
    560. 
-
  560.                 {
    561. 
-
  561.                     $status = 'str';
    562. 
-
  562.                     $to = ($string{$i} == '(') ? ')' : $string{$i};
    563. 
-
  563.                     (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
    564. 
-
  564.                 }
    565. 
-
  565.                 else
    566. 
-
  566.                 {
    567. 
-
  567.                     (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
    568. 
-
  568.                 }
    569. 
-
  569.                 break;
    570. 
-
  570.                 
    571. 
-
  571.                 case 'str':
    572. 
-
  572.                 if($string{$i} == $to && !csstidy::escaped($string,$i))
    573. 
-
  573.                 {
    574. 
-
  574.                     $status = 'st';
    575. 
-
  575.                 }
    576. 
-
  576.                 (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
    577. 
-
  577.                 break;
    578. 
-
  578.             }
    579. 
-
  579.         }
    580. 
-
  580.         
    581. 
-
  581.         if(isset($output[0]))
    582. 
-
  582.         {
    583. 
-
  583.             return $output;
    584. 
-
  584.         }
    585. 
-
  585.         else
    586. 
-
  586.         {
    587. 
-
  587.             return array($output);
    588. 
-
  588.         }
    589. 
-
  589.     }
    590. 
-
  590.  
    591. 
-
  591.     /**
    592. 
-
  592.      * Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()
    593. 
-
  593.      * @param array $array 
    594. 
-
  594.      * @return array 
    595. 
-
  595.      * @version 1.2
    596. 
-
  596.      * @see dissolve_4value_shorthands()
    597. 
-
  597.      */
    598. 
-
  598.     function merge_4value_shorthands($array)
    599. 
-
  599.     {
    600. 
-
  600.         $return = $array;
    601. 
-
  601.         $shorthands =& $GLOBALS['csstidy']['shorthands'];
    602. 
-
  602.         
    603. 
-
  603.         foreach($shorthands as $key => $value)
    604. 
-
  604.         {
    605. 
-
  605.             if(isset($array[$value[0]]) && isset($array[$value[1]])
    606. 
-
  606.             && isset($array[$value[2]]) && isset($array[$value[3]]) && $value !== 0)
    607. 
-
  607.             {
    608. 
-
  608.                 $return[$key] = '';
    609. 
-
  609.                 
    610. 
-
  610.                 $important = '';
    611. 
-
  611.                 for($i = 0; $i < 4; $i++)
    612. 
-
  612.                 {
    613. 
-
  613.                     $val = $array[$value[$i]];
    614. 
-
  614.                     if(csstidy::is_important($val))
    615. 
-
  615.                     {
    616. 
-
  616.                         $important = '!important';
    617. 
-
  617.                         $return[$key] .= csstidy::gvw_important($val).' ';
    618. 
-
  618.                     }
    619. 
-
  619.                     else
    620. 
-
  620.                     {
    621. 
-
  621.                         $return[$key] .= $val.' ';
    622. 
-
  622.                     }
    623. 
-
  623.                     unset($return[$value[$i]]);
    624. 
-
  624.                 }
    625. 
-
  625.                 $return[$key] = csstidy_optimise::shorthand(trim($return[$key].$important));        
    626. 
-
  626.             }
    627. 
-
  627.         }
    628. 
-
  628.         return $return;
    629. 
-
  629.     }
    630. 
-
  630.  
    631. 
-
  631.     /**
    632. 
-
  632.      * Dissolve background property
    633. 
-
  633.      * @param string $str_value 
    634. 
-
  634.      * @return array 
    635. 
-
  635.      * @version 1.0
    636. 
-
  636.      * @see merge_bg()
    637. 
-
  637.      * @todo full CSS 3 compliance
    638. 
-
  638.      */
    639. 
-
  639.     function dissolve_short_bg($str_value)
    640. 
-
  640.     {
    641. 
-
  641.         $background_prop_default =& $GLOBALS['csstidy']['background_prop_default'];
    642. 
-
  642.         $repeat = array('repeat','repeat-x','repeat-y','no-repeat','space');
    643. 
-
  643.         $attachment = array('scroll','fixed','local');
    644. 
-
  644.         $clip = array('border','padding');
    645. 
-
  645.         $origin = array('border','padding','content');
    646. 
-
  646.         $pos = array('top','center','bottom','left','right');
    647. 
-
  647.         $important = '';
    648. 
-
  648.         $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);
    649. 
-
  649.         
    650. 
-
  650.         if(csstidy::is_important($str_value))
    651. 
-
  651.         {
    652. 
-
  652.             $important = ' !important';
    653. 
-
  653.             $str_value = csstidy::gvw_important($str_value);
    654. 
-
  654.         }
    655. 
-
  655.         
    656. 
-
  656.         $str_value = csstidy_optimise::explode_ws(',',$str_value);
    657. 
-
  657.         for($i = 0; $i < count($str_value); $i++)
    658. 
-
  658.         {
    659. 
-
  659.             $have['clip'] = FALSE; $have['pos'] = FALSE;
    660. 
-
  660.             $have['color'] = FALSE; $have['bg'] = FALSE;
    661. 
-
  661.             
    662. 
-
  662.             $str_value[$i] = csstidy_optimise::explode_ws(' ',trim($str_value[$i]));
    663. 
-
  663.             
    664. 
-
  664.             for($j = 0; $j < count($str_value[$i]); $j++)
    665. 
-
  665.             {
    666. 
-
  666.                 if($have['bg'] === FALSE && (substr($str_value[$i][$j],0,4) == 'url(' || $str_value[$i][$j] === 'none'))
    667. 
-
  667.                 {
    668. 
-
  668.                     $return['background-image'] .= $str_value[$i][$j].',';
    669. 
-
  669.                     $have['bg'] = TRUE;
    670. 
-
  670.                 }
    671. 
-
  671.                 elseif(in_array($str_value[$i][$j],$repeat,TRUE))
    672. 
-
  672.                 {
    673. 
-
  673.                     $return['background-repeat'] .= $str_value[$i][$j].',';
    674. 
-
  674.                 }
    675. 
-
  675.                 elseif(in_array($str_value[$i][$j],$attachment,TRUE))
    676. 
-
  676.                 {
    677. 
-
  677.                     $return['background-attachment'] .= $str_value[$i][$j].',';
    678. 
-
  678.                 }
    679. 
-
  679.                 elseif(in_array($str_value[$i][$j],$clip,TRUE) && !$have['clip'])
    680. 
-
  680.                 {
    681. 
-
  681.                     $return['background-clip'] .= $str_value[$i][$j].',';
    682. 
-
  682.                     $have['clip'] = TRUE;
    683. 
-
  683.                 }
    684. 
-
  684.                 elseif(in_array($str_value[$i][$j],$origin,TRUE))
    685. 
-
  685.                 {
    686. 
-
  686.                     $return['background-origin'] .= $str_value[$i][$j].',';
    687. 
-
  687.                 }
    688. 
-
  688.                 elseif($str_value[$i][$j]{0} == '(')
    689. 
-
  689.                 {
    690. 
-
  690.                     $return['background-size'] .= substr($str_value[$i][$j],1,-1).',';
    691. 
-
  691.                 }
    692. 
-
  692.                 elseif(in_array($str_value[$i][$j],$pos,TRUE) || is_numeric($str_value[$i][$j]{0}) || $str_value[$i][$j]{0} === NULL)
    693. 
-
  693.                 {
    694. 
-
  694.                     $return['background-position'] .= $str_value[$i][$j];
    695. 
-
  695.                     if(!$have['pos']) $return['background-position'] .= ' '; else $return['background-position'].= ',';
    696. 
-
  696.                     $have['pos'] = TRUE;
    697. 
-
  697.                 }
    698. 
-
  698.                 elseif(!$have['color'])
    699. 
-
  699.                 {
    700. 
-
  700.                     $return['background-color'] .= $str_value[$i][$j].',';
    701. 
-
  701.                     $have['color'] = TRUE;
    702. 
-
  702.                 }
    703. 
-
  703.             }
    704. 
-
  704.         }
    705. 
-
  705.         
    706. 
-
  706.         foreach($background_prop_default as $bg_prop => $default_value)
    707. 
-
  707.         {
    708. 
-
  708.             if($return[$bg_prop] !== NULL)
    709. 
-
  709.             {
    710. 
-
  710.                 $return[$bg_prop] = substr($return[$bg_prop],0,-1).$important;
    711. 
-
  711.             }
    712. 
-
  712.             else $return[$bg_prop] = $default_value.$important;
    713. 
-
  713.         }
    714. 
-
  714.         return $return;    
    715. 
-
  715.     }
    716. 
-
  716.  
    717. 
-
  717.     /**
    718. 
-
  718.      * Merges all background properties
    719. 
-
  719.      * @param array $input_css 
    720. 
-
  720.      * @return array 
    721. 
-
  721.      * @version 1.0
    722. 
-
  722.      * @see dissolve_short_bg()
    723. 
-
  723.      * @todo full CSS 3 compliance
    724. 
-
  724.      */
    725. 
-
  725.     function merge_bg($input_css)
    726. 
-
  726.     {
    727. 
-
  727.         $background_prop_default =& $GLOBALS['csstidy']['background_prop_default'];
    728. 
-
  728.         // Max number of background images. CSS3 not yet fully implemented
    729. 
-
  729.         $number_of_values = @max(count(csstidy_optimise::explode_ws(',',$input_css['background-image'])),count(csstidy_optimise::explode_ws(',',$input_css['background-color'])),1);
    730. 
-
  730.         // Array with background images to check if BG image exists
    731. 
-
  731.         $bg_img_array = @csstidy_optimise::explode_ws(',',csstidy::gvw_important($input_css['background-image']));
    732. 
-
  732.         $new_bg_value = '';
    733. 
-
  733.         $important = '';
    734. 
-
  734.         
    735. 
-
  735.         for($i = 0; $i < $number_of_values; $i++)
    736. 
-
  736.         {
    737. 
-
  737.             foreach($background_prop_default as $bg_property => $default_value)
    738. 
-
  738.             {
    739. 
-
  739.                 // Skip if property does not exist
    740. 
-
  740.                 if(!isset($input_css[$bg_property]))
    741. 
-
  741.                 {
    742. 
-
  742.                     continue;
    743. 
-
  743.                 }
    744. 
-
  744.                 
    745. 
-
  745.                 $cur_value = $input_css[$bg_property];
    746. 
-
  746.                 
    747. 
-
  747.                 // Skip some properties if there is no background image
    748. 
-
  748.                 if((!isset($bg_img_array[$i]) || $bg_img_array[$i] === 'none')
    749. 
-
  749.                     && ($bg_property === 'background-size' || $bg_property === 'background-position'
    750. 
-
  750.                     || $bg_property === 'background-attachment' || $bg_property === 'background-repeat'))
    751. 
-
  751.                 {
    752. 
-
  752.                     continue;
    753. 
-
  753.                 }
    754. 
-
  754.                 
    755. 
-
  755.                 // Remove !important
    756. 
-
  756.                 if(csstidy::is_important($cur_value))
    757. 
-
  757.                 {
    758. 
-
  758.                     $important = ' !important';
    759. 
-
  759.                     $cur_value = csstidy::gvw_important($cur_value);
    760. 
-
  760.                 }
    761. 
-
  761.                 
    762. 
-
  762.                 // Do not add default values
    763. 
-
  763.                 if($cur_value === $default_value)
    764. 
-
  764.                 {
    765. 
-
  765.                     continue;
    766. 
-
  766.                 }
    767. 
-
  767.                 
    768. 
-
  768.                 $temp = csstidy_optimise::explode_ws(',',$cur_value);
    769. 
-
  769.  
    770. 
-
  770.                 if(isset($temp[$i]))
    771. 
-
  771.                 {                    
    772. 
-
  772.                     if($bg_property == 'background-size')
    773. 
-
  773.                     {
    774. 
-
  774.                         $new_bg_value .= '('.$temp[$i].') ';
    775. 
-
  775.                     }
    776. 
-
  776.                     else
    777. 
-
  777.                     {
    778. 
-
  778.                         $new_bg_value .= $temp[$i].' ';
    779. 
-
  779.                     }
    780. 
-
  780.                 }            
    781. 
-
  781.             }
    782. 
-
  782.             
    783. 
-
  783.             $new_bg_value = trim($new_bg_value);
    784. 
-
  784.             if($i != $number_of_values-1) $new_bg_value .= ',';
    785. 
-
  785.         }
    786. 
-
  786.         
    787. 
-
  787.         // Delete all background-properties
    788. 
-
  788.         foreach($background_prop_default as $bg_property => $default_value)
    789. 
-
  789.         {
    790. 
-
  790.             unset($input_css[$bg_property]);
    791. 
-
  791.         }
    792. 
-
  792.         
    793. 
-
  793.         // Add new background property
    794. 
-
  794.         if($new_bg_value !== '') $input_css['background'] = $new_bg_value.$important;
    795. 
-
  795.         
    796. 
-
  796.         return $input_css;
    797. 
-
  797.     }
    798. 
-
  798. }
    799. 
-
  799. ?>
    800. 
-
-
-
-
- Documentation generated on Mon, 15 May 2006 22:55:34 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy_print.php.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy_print.php.html deleted file mode 100644 index f49644e4..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__class.csstidy_print.php.html +++ /dev/null @@ -1,402 +0,0 @@ - - -File Source for class.csstidy_print.php - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- - 		-
- -

Source for file class.csstidy_print.php

-

Documentation is available at class.csstidy_print.php

-
-
  1. <?php
    2. 
-
  2. /**
    3. 
-
  3.  * CSSTidy - CSS Parser and Optimiser
    4. 
-
  4.  *
    5. 
-
  5.  * CSS Printing class
    6. 
-
  6.  * This class prints CSS data generated by csstidy.
    7. 
-
  7.  *
    8. 
-
  8.  * This file is part of CSSTidy.
    9. 
-
  9.  *
    10. 
-
  10.  * CSSTidy is free software; you can redistribute it and/or modify
    11. 
-
  11.  * it under the terms of the GNU General Public License as published by
    12. 
-
  12.  * the Free Software Foundation; either version 2 of the License, or
    13. 
-
  13.  * (at your option) any later version.
    14. 
-
  14.  *
    15. 
-
  15.  * CSSTidy is distributed in the hope that it will be useful,
    16. 
-
  16.  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    17. 
-
  17.  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    18. 
-
  18.  * GNU General Public License for more details.
    19. 
-
  19.  *
    20. 
-
  20.  * You should have received a copy of the GNU General Public License
    21. 
-
  21.  * along with CSSTidy; if not, write to the Free Software
    22. 
-
  22.  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    23. 
-
  23.  *
    24. 
-
  24.  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
    25. 
-
  25.  * @package csstidy
    26. 
-
  26.  * @author Florian Schmitz (floele at gmail dot com) 2005-2006
    27. 
-
  27.  */
    28. 
-
  28.  
    29. 
-
  29. /**
    30. 
-
  30.  * CSS Printing class
    31. 
-
  31.  *
    32. 
-
  32.  * This class prints CSS data generated by csstidy.
    33. 
-
  33.  *
    34. 
-
  34.  * @package csstidy
    35. 
-
  35.  * @author Florian Schmitz (floele at gmail dot com) 2005-2006
    36. 
-
  36.  * @version 1.0
    37. 
-
  37.  */
    38. 
-
  38.  
    39. 
-
  39. class csstidy_print
    40. 
-
  40. {
    41. 
-
  41.     /**
    42. 
-
  42.      * Saves the input CSS string
    43. 
-
  43.      * @var string 
    44. 
-
  44.      * @access private
    45. 
-
  45.      */
    46. 
-
  46.     var $input_css = '';
    47. 
-
  47.  
    48. 
-
  48.     /**
    49. 
-
  49.      * Saves the formatted CSS string
    50. 
-
  50.      * @var string 
    51. 
-
  51.      * @access public
    52. 
-
  52.      */
    53. 
-
  53.     var $output_css = '';
    54. 
-
  54.  
    55. 
-
  55.     /**
    56. 
-
  56.      * Saves the formatted CSS string (plain text)
    57. 
-
  57.      * @var string 
    58. 
-
  58.      * @access public
    59. 
-
  59.      */
    60. 
-
  60.     var $output_css_plain = '';
    61. 
-
  61.  
    62. 
-
  62.     /**
    63. 
-
  63.      * Constructor
    64. 
-
  64.      * @param array $css contains the class csstidy
    65. 
-
  65.      * @access private
    66. 
-
  66.      * @version 1.0
    67. 
-
  67.      */
    68. 
-
  68.     function csstidy_print(&$css)
    69. 
-
  69.     {
    70. 
-
  70.         $this->parser    =& $css;
    71. 
-
  71.         $this->css       =& $css->css;
    72. 
-
  72.         $this->template  =& $css->template;
    73. 
-
  73.         $this->tokens    =& $css->tokens;
    74. 
-
  74.         $this->charset   =& $css->charset;
    75. 
-
  75.         $this->import    =& $css->import;
    76. 
-
  76.         $this->namespace =& $css->namespace;
    77. 
-
  77.     }
    78. 
-
  78.  
    79. 
-
  79.     /**
    80. 
-
  80.      * Resets output_css and output_css_plain (new css code)
    81. 
-
  81.      * @access private
    82. 
-
  82.      * @version 1.0
    83. 
-
  83.      */
    84. 
-
  84.     function _reset()
    85. 
-
  85.     {
    86. 
-
  86.         $this->output_css = '';
    87. 
-
  87.         $this->output_css_plain = '';
    88. 
-
  88.     }
    89. 
-
  89.  
    90. 
-
  90.     /**
    91. 
-
  91.      * Returns the CSS code as plain text
    92. 
-
  92.      * @return string 
    93. 
-
  93.      * @access public
    94. 
-
  94.      * @version 1.0
    95. 
-
  95.      */
    96. 
-
  96.     function plain()
    97. 
-
  97.     {
    98. 
-
  98.         $this->_print(true);
    99. 
-
  99.         return $this->output_css_plain;
    100. 
-
  100.     }
    101. 
-
  101.  
    102. 
-
  102.     /**
    103. 
-
  103.      * Returns the formatted CSS code
    104. 
-
  104.      * @return string 
    105. 
-
  105.      * @access public
    106. 
-
  106.      * @version 1.0
    107. 
-
  107.      */
    108. 
-
  108.     function formatted()
    109. 
-
  109.     {
    110. 
-
  110.         $this->_print(false);
    111. 
-
  111.         return $this->output_css;
    112. 
-
  112.     }
    113. 
-
  113.     
    114. 
-
  114.     /**
    115. 
-
  115.      * Returns the formatted CSS Code and saves it into $this->output_css and $this->output_css_plain
    116. 
-
  116.      * @param bool $plain plain text or not
    117. 
-
  117.      * @access private
    118. 
-
  118.      * @version 2.0
    119. 
-
  119.      */
    120. 
-
  120.     function _print($plain = false)
    121. 
-
  121.     {
    122. 
-
  122.         if ($this->output_css && $this->output_css_plain) {
    123. 
-
  123.             return;
    124. 
-
  124.         }
    125. 
-
  125.         
    126. 
-
  126.         $output = '';
    127. 
-
  127.         if (!$this->parser->get_cfg('preserve_css')) {
    128. 
-
  128.             $this->_convert_raw_css();
    129. 
-
  129.         }
    130. 
-
  130.  
    131. 
-
  131.         $template =& $this->template;
    132. 
-
  132.  
    133. 
-
  133.         if ($plain) {
    134. 
-
  134.             $template = array_map('strip_tags', $template);
    135. 
-
  135.         }
    136. 
-
  136.         
    137. 
-
  137.         if ($this->parser->get_cfg('timestamp')) {
    138. 
-
  138.             array_unshift($this->tokens, array(COMMENT, ' CSSTidy ' . $this->parser->version . ': ' . date('r') . ' '));
    139. 
-
  139.         }
    140. 
-
  140.         
    141. 
-
  141.         if (!empty($this->charset)) {
    142. 
-
  142.             $output .= $template[0].'@charset '.$template[5].$this->charset.$template[6];
    143. 
-
  143.         }
    144. 
-
  144.         
    145. 
-
  145.         if (!empty($this->import)) {
    146. 
-
  146.             for ($i = 0, $size = count($this->import); $i < $size; $i ++) {
    147. 
-
  147.                 $output .= $template[0].'@import '.$template[5].$this->import[$i].$template[6];
    148. 
-
  148.             }
    149. 
-
  149.         }
    150. 
-
  150.         
    151. 
-
  151.         if (!empty($this->namespace)) {
    152. 
-
  152.             $output .= $template[0].'@namespace '.$template[5].$this->namespace.$template[6];
    153. 
-
  153.         }
    154. 
-
  154.         
    155. 
-
  155.         $output .= $template[13];
    156. 
-
  156.         $in_at_out = '';
    157. 
-
  157.         $out =& $output;
    158. 
-
  158.         
    159. 
-
  159.         foreach ($this->tokens as $key => $token)
    160. 
-
  160.         {
    161. 
-
  161.             switch ($token[0])
    162. 
-
  162.             {
    163. 
-
  163.                 case AT_START:
    164. 
-
  164.                     $out .= $template[0].$this->_htmlsp($token[1], $plain).$template[1];
    165. 
-
  165.                     $out =& $in_at_out;
    166. 
-
  166.                     break;
    167. 
-
  167.                 
    168. 
-
  168.                 case SEL_START:
    169. 
-
  169.                     if($this->parser->get_cfg('lowercase_s')) $token[1] = strtolower($token[1]);
    170. 
-
  170.                     $out .= ($token[1]{0} !== '@') ? $template[2].$this->_htmlsp($token[1], $plain) : $template[0].$this->_htmlsp($token[1], $plain);
    171. 
-
  171.                     $out .= $template[3];
    172. 
-
  172.                     break;
    173. 
-
  173.                     
    174. 
-
  174.                 case PROPERTY:
    175. 
-
  175.                     if($this->parser->get_cfg('case_properties') == 2) $token[1] = strtoupper($token[1]);
    176. 
-
  176.                     if($this->parser->get_cfg('case_properties') == 1) $token[1] = strtolower($token[1]);
    177. 
-
  177.                     $out .= $template[4] . $this->_htmlsp($token[1], $plain) . ':' . $template[5];
    178. 
-
  178.                     break;
    179. 
-
  179.                 
    180. 
-
  180.                 case VALUE:
    181. 
-
  181.                     $out .= $this->_htmlsp($token[1], $plain);
    182. 
-
  182.                     if($this->_seeknocomment($key, 1) == SEL_END && $this->parser->get_cfg('remove_last_;')) {
    183. 
-
  183.                         $out .= str_replace(';', '', $template[6]);
    184. 
-
  184.                     } else {
    185. 
-
  185.                         $out .= $template[6];
    186. 
-
  186.                     }
    187. 
-
  187.                     break;
    188. 
-
  188.                 
    189. 
-
  189.                 case SEL_END:
    190. 
-
  190.                     $out .= $template[7];
    191. 
-
  191.                     if($this->_seeknocomment($key, 1) != AT_END) $out .= $template[8];
    192. 
-
  192.                     break;
    193. 
-
  193.                 
    194. 
-
  194.                 case AT_END:
    195. 
-
  195.                     $out =& $output;
    196. 
-
  196.                     $out .= $template[10] . str_replace("\n", "\n" . $template[10], $in_at_out);
    197. 
-
  197.                     $in_at_out = '';
    198. 
-
  198.                     $out .= $template[9];
    199. 
-
  199.                     break;
    200. 
-
  200.  
    201. 
-
  201.                 case COMMENT:
    202. 
-
  202.                     $out .= $template[11] . '/*' . $this->_htmlsp($token[1], $plain) . '*/' . $template[12];
    203. 
-
  203.                     break;
    204. 
-
  204.             }
    205. 
-
  205.         }
    206. 
-
  206.  
    207. 
-
  207.         $output = trim($output);
    208. 
-
  208.         
    209. 
-
  209.         if (!$plain) {
    210. 
-
  210.             $this->output_css = $output;
    211. 
-
  211.             $this->_print(true);
    212. 
-
  212.         } else {
    213. 
-
  213.             $this->output_css_plain = $output;
    214. 
-
  214.         }
    215. 
-
  215.     }
    216. 
-
  216.     
    217. 
-
  217.     /**
    218. 
-
  218.      * Gets the next token type which is $move away from $key, excluding comments
    219. 
-
  219.      * @param integer $key current position
    220. 
-
  220.      * @param integer $move move this far
    221. 
-
  221.      * @return mixed a token type
    222. 
-
  222.      * @access private
    223. 
-
  223.      * @version 1.0
    224. 
-
  224.      */
    225. 
-
  225.     function _seeknocomment($key, $move) {
    226. 
-
  226.         $go = ($move > 0) ? 1 : -1;
    227. 
-
  227.         for ($i = $key + 1; abs($key-$i)-1 < abs($move); $i += $go) {
    228. 
-
  228.             if (!isset($this->tokens[$i])) {
    229. 
-
  229.                 return;
    230. 
-
  230.             }
    231. 
-
  231.             if ($this->tokens[$i][0] == COMMENT) {
    232. 
-
  232.                 $move += 1;
    233. 
-
  233.                 continue;
    234. 
-
  234.             }
    235. 
-
  235.             return $this->tokens[$i][0];
    236. 
-
  236.         }
    237. 
-
  237.     }
    238. 
-
  238.     
    239. 
-
  239.     /**
    240. 
-
  240.      * Converts $this->css array to a raw array ($this->tokens)
    241. 
-
  241.      * @access private
    242. 
-
  242.      * @version 1.0
    243. 
-
  243.      */
    244. 
-
  244.     function _convert_raw_css()
    245. 
-
  245.     {
    246. 
-
  246.         $this->tokens = array();
    247. 
-
  247.         ksort($this->css);
    248. 
-
  248.         
    249. 
-
  249.         foreach ($this->css as $medium => $val)
    250. 
-
  250.         {
    251. 
-
  251.             if ($this->parser->get_cfg('sort_selectors')) ksort($val);
    252. 
-
  252.             if ($medium != DEFAULT_AT) {
    253. 
-
  253.                 $this->parser->_add_token(AT_START, $medium, true);
    254. 
-
  254.             }
    255. 
-
  255.             
    256. 
-
  256.             foreach ($val as $selector => $vali)
    257. 
-
  257.             {
    258. 
-
  258.                 if ($this->parser->get_cfg('sort_properties')) ksort($vali);
    259. 
-
  259.                 $this->parser->_add_token(SEL_START, $selector, true);
    260. 
-
  260.                 
    261. 
-
  261.                 foreach ($vali as $property => $valj)
    262. 
-
  262.                 {
    263. 
-
  263.                     $this->parser->_add_token(PROPERTY, $property, true);
    264. 
-
  264.                     $this->parser->_add_token(VALUE, $valj, true);
    265. 
-
  265.                 }
    266. 
-
  266.                 
    267. 
-
  267.                 $this->parser->_add_token(SEL_END, $selector, true);
    268. 
-
  268.             }
    269. 
-
  269.             
    270. 
-
  270.             if ($medium != DEFAULT_AT) {
    271. 
-
  271.                 $this->parser->_add_token(AT_END, $medium, true);
    272. 
-
  272.             }
    273. 
-
  273.         }
    274. 
-
  274.     }
    275. 
-
  275.     
    276. 
-
  276.     /**
    277. 
-
  277.      * Same as htmlspecialchars, only that chars are not replaced if $plain !== true. This makes  print_code() cleaner.
    278. 
-
  278.      * @param string $string 
    279. 
-
  279.      * @param bool $plain 
    280. 
-
  280.      * @return string 
    281. 
-
  281.      * @see csstidy_print::_print()
    282. 
-
  282.      * @access private
    283. 
-
  283.      * @version 1.0
    284. 
-
  284.      */
    285. 
-
  285.     function _htmlsp($string, $plain)
    286. 
-
  286.     {
    287. 
-
  287.         if (!$plain) {
    288. 
-
  288.             return htmlspecialchars($string);
    289. 
-
  289.         }
    290. 
-
  290.         return $string;
    291. 
-
  291.     }
    292. 
-
  292.       
    293. 
-
  293.     /**
    294. 
-
  294.      * Get compression ratio
    295. 
-
  295.      * @access public
    296. 
-
  296.      * @return float 
    297. 
-
  297.      * @version 1.2
    298. 
-
  298.      */
    299. 
-
  299.     function get_ratio()
    300. 
-
  300.     {
    301. 
-
  301.         if (!$this->output_css_plain) {
    302. 
-
  302.             $this->formatted();
    303. 
-
  303.         }
    304. 
-
  304.         return round((strlen($this->input_css) - strlen($this->output_css_plain)) / strlen($this->input_css), 3) * 100;
    305. 
-
  305.     }
    306. 
-
  306.  
    307. 
-
  307.     /**
    308. 
-
  308.      * Get difference between the old and new code in bytes and prints the code if necessary.
    309. 
-
  309.      * @access public
    310. 
-
  310.      * @return string 
    311. 
-
  311.      * @version 1.1
    312. 
-
  312.      */
    313. 
-
  313.     function get_diff()
    314. 
-
  314.     {
    315. 
-
  315.         if (!$this->output_css_plain) {
    316. 
-
  316.             $this->formatted();
    317. 
-
  317.         }
    318. 
-
  318.         
    319. 
-
  319.         $diff = strlen($this->output_css_plain) - strlen($this->input_css);
    320. 
-
  320.         
    321. 
-
  321.         if ($diff > 0) {
    322. 
-
  322.             return '+' . $diff;
    323. 
-
  323.         } elseif ($diff == 0) {
    324. 
-
  324.             return '+-' . $diff;
    325. 
-
  325.         }
    326. 
-
  326.         
    327. 
-
  327.         return $diff;
    328. 
-
  328.     }
    329. 
-
  329.  
    330. 
-
  330.     /**
    331. 
-
  331.      * Get the size of either input or output CSS in KB
    332. 
-
  332.      * @param string $loc default is "output"
    333. 
-
  333.      * @access public
    334. 
-
  334.      * @return integer 
    335. 
-
  335.      * @version 1.0
    336. 
-
  336.      */
    337. 
-
  337.     function size($loc = 'output')
    338. 
-
  338.     {
    339. 
-
  339.         if ($loc == 'output' && !$this->output_css) {
    340. 
-
  340.             $this->formatted();
    341. 
-
  341.         }
    342. 
-
  342.         
    343. 
-
  343.         if ($loc == 'input') {
    344. 
-
  344.             return (strlen($this->input_css) / 1000);
    345. 
-
  345.         } else {
    346. 
-
  346.             return (strlen($this->output_css_plain) / 1000);
    347. 
-
  347.         }
    348. 
-
  348.     }
    349. 
-
  349. }
    350. 
-
  350. ?>
    351. 
-
-
-
-
- Documentation generated on Mon, 15 May 2006 22:55:42 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__data.inc.php.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__data.inc.php.html deleted file mode 100644 index 5c62d6c4..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/__filesource/fsource_csstidy__data.inc.php.html +++ /dev/null @@ -1,521 +0,0 @@ - - -File Source for data.inc.php - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- - 		-
- -

Source for file data.inc.php

-

Documentation is available at data.inc.php

-
-
  1. <?php
    2. 
-
  2. /**
    3. 
-
  3.  * Various CSS Data for CSSTidy
    4. 
-
  4.  *
    5. 
-
  5.  * This file is part of CSSTidy.
    6. 
-
  6.  *
    7. 
-
  7.  * CSSTidy is free software; you can redistribute it and/or modify
    8. 
-
  8.  * it under the terms of the GNU General Public License as published by
    9. 
-
  9.  * the Free Software Foundation; either version 2 of the License, or
    10. 
-
  10.  * (at your option) any later version.
    11. 
-
  11.  *
    12. 
-
  12.  * CSSTidy is distributed in the hope that it will be useful,
    13. 
-
  13.  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    14. 
-
  14.  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15. 
-
  15.  * GNU General Public License for more details.
    16. 
-
  16.  *
    17. 
-
  17.  * You should have received a copy of the GNU General Public License
    18. 
-
  18.  * along with CSSTidy; if not, write to the Free Software
    19. 
-
  19.  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    20. 
-
  20.  * 
    21. 
-
  21.  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
    22. 
-
  22.  * @package csstidy
    23. 
-
  23.  * @author Florian Schmitz (floele at gmail dot com) 2005
    24. 
-
  24.  */
    25. 
-
  25.  
    26. 
-
  26. define('AT_START',    1);
    27. 
-
  27. define('AT_END',      2);
    28. 
-
  28. define('SEL_START',   3);
    29. 
-
  29. define('SEL_END',     4);
    30. 
-
  30. define('PROPERTY',    5);
    31. 
-
  31. define('VALUE',       6);
    32. 
-
  32. define('COMMENT',     7);
    33. 
-
  33. define('DEFAULT_AT', 41);
    34. 
-
  34.  
    35. 
-
  35. /**
    36. 
-
  36.  * All whitespace allowed in CSS
    37. 
-
  37.  *
    38. 
-
  38.  * @global array $GLOBALS['csstidy']['whitespace'] 
    39. 
-
  39.  * @version 1.0
    40. 
-
  40.  */
    41. 
-
  41. $GLOBALS['csstidy']['whitespace'] = array(' ',"\n","\t","\r","\x0B");
    42. 
-
  42.  
    43. 
-
  43. /**
    44. 
-
  44.  * All CSS tokens used by csstidy
    45. 
-
  45.  *
    46. 
-
  46.  * @global string $GLOBALS['csstidy']['tokens'] 
    47. 
-
  47.  * @version 1.0
    48. 
-
  48.  */
    49. 
-
  49. $GLOBALS['csstidy']['tokens'] = '/@}{;:=\'"(,\\!$%&)*+.<>?[]^`|~';
    50. 
-
  50.  
    51. 
-
  51. /**
    52. 
-
  52.  * All CSS units (CSS 3 units included)
    53. 
-
  53.  *
    54. 
-
  54.  * @see compress_numbers()
    55. 
-
  55.  * @global array $GLOBALS['csstidy']['units'] 
    56. 
-
  56.  * @version 1.0
    57. 
-
  57.  */
    58. 
-
  58. $GLOBALS['csstidy']['units'] = array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','deg','grad','rad','ms','s','khz','hz');
    59. 
-
  59.  
    60. 
-
  60. /**
    61. 
-
  61.  * Available at-rules
    62. 
-
  62.  *
    63. 
-
  63.  * @global array $GLOBALS['csstidy']['at_rules'] 
    64. 
-
  64.  * @version 1.0
    65. 
-
  65.  */
    66. 
-
  66. $GLOBALS['csstidy']['at_rules'] = array('page' => 'is','font-face' => 'is','charset' => 'iv', 'import' => 'iv','namespace' => 'iv','media' => 'at');
    67. 
-
  67.  
    68. 
-
  68.  /**
    69. 
-
  69.  * Properties that allow <number> as value
    70. 
-
  70.  *
    71. 
-
  71.  * @todo CSS3 properties
    72. 
-
  72.  * @see compress_numbers();
    73. 
-
  73.  * @global array $GLOBALS['csstidy']['number_values'] 
    74. 
-
  74.  * @version 1.2
    75. 
-
  75.  */
    76. 
-
  76. $GLOBALS['csstidy']['number_values'] = array('line-height','pitch-range','richness','speech-rate','stress','volume','font','font-weight','z-index','counter-increment','counter-reset','orphans','widows');
    77. 
-
  77.  
    78. 
-
  78. /**
    79. 
-
  79.  * Properties that allow <color> as value
    80. 
-
  80.  *
    81. 
-
  81.  * @todo CSS3 properties
    82. 
-
  82.  * @see compress_numbers();
    83. 
-
  83.  * @global array $GLOBALS['csstidy']['color_values'] 
    84. 
-
  84.  * @version 1.0
    85. 
-
  85.  */
    86. 
-
  86. $GLOBALS['csstidy']['color_values'] = array();
    87. 
-
  87. $GLOBALS['csstidy']['color_values'][] = 'background-color';
    88. 
-
  88. $GLOBALS['csstidy']['color_values'][] = 'border-color';
    89. 
-
  89. $GLOBALS['csstidy']['color_values'][] = 'border-top-color';
    90. 
-
  90. $GLOBALS['csstidy']['color_values'][] = 'border-right-color';
    91. 
-
  91. $GLOBALS['csstidy']['color_values'][] = 'border-bottom-color';
    92. 
-
  92. $GLOBALS['csstidy']['color_values'][] = 'border-left-color';
    93. 
-
  93. $GLOBALS['csstidy']['color_values'][] = 'color';
    94. 
-
  94. $GLOBALS['csstidy']['color_values'][] = 'outline-color';
    95. 
-
  95.  
    96. 
-
  96.  
    97. 
-
  97. /**
    98. 
-
  98.  * Default values for the background properties
    99. 
-
  99.  *
    100. 
-
  100.  * @todo Possibly property names will change during CSS3 development
    101. 
-
  101.  * @global array $GLOBALS['csstidy']['background_prop_default'] 
    102. 
-
  102.  * @see dissolve_short_bg()
    103. 
-
  103.  * @see merge_bg()
    104. 
-
  104.  * @version 1.0
    105. 
-
  105.  */
    106. 
-
  106. $GLOBALS['csstidy']['background_prop_default'] = array();
    107. 
-
  107. $GLOBALS['csstidy']['background_prop_default']['background-image'] = 'none';
    108. 
-
  108. $GLOBALS['csstidy']['background_prop_default']['background-size'] = 'auto';
    109. 
-
  109. $GLOBALS['csstidy']['background_prop_default']['background-repeat'] = 'repeat';
    110. 
-
  110. $GLOBALS['csstidy']['background_prop_default']['background-position'] = '0 0';
    111. 
-
  111. $GLOBALS['csstidy']['background_prop_default']['background-attachment'] = 'scroll';
    112. 
-
  112. $GLOBALS['csstidy']['background_prop_default']['background-clip'] = 'border';
    113. 
-
  113. $GLOBALS['csstidy']['background_prop_default']['background-origin'] = 'padding';
    114. 
-
  114. $GLOBALS['csstidy']['background_prop_default']['background-color'] = 'transparent';
    115. 
-
  115.  
    116. 
-
  116. /**
    117. 
-
  117.  * A list of non-W3C color names which get replaced by their hex-codes
    118. 
-
  118.  *
    119. 
-
  119.  * @global array $GLOBALS['csstidy']['replace_colors'] 
    120. 
-
  120.  * @see cut_color()
    121. 
-
  121.  * @version 1.0
    122. 
-
  122.  */
    123. 
-
  123. $GLOBALS['csstidy']['replace_colors'] = array();
    124. 
-
  124. $GLOBALS['csstidy']['replace_colors']['aliceblue'] = '#F0F8FF';
    125. 
-
  125. $GLOBALS['csstidy']['replace_colors']['antiquewhite'] = '#FAEBD7';
    126. 
-
  126. $GLOBALS['csstidy']['replace_colors']['aquamarine'] = '#7FFFD4';
    127. 
-
  127. $GLOBALS['csstidy']['replace_colors']['azure'] = '#F0FFFF';
    128. 
-
  128. $GLOBALS['csstidy']['replace_colors']['beige'] = '#F5F5DC';
    129. 
-
  129. $GLOBALS['csstidy']['replace_colors']['bisque'] = '#FFE4C4';
    130. 
-
  130. $GLOBALS['csstidy']['replace_colors']['blanchedalmond'] = '#FFEBCD';
    131. 
-
  131. $GLOBALS['csstidy']['replace_colors']['blueviolet'] = '#8A2BE2';
    132. 
-
  132. $GLOBALS['csstidy']['replace_colors']['brown'] = '#A52A2A';
    133. 
-
  133. $GLOBALS['csstidy']['replace_colors']['burlywood'] = '#DEB887';
    134. 
-
  134. $GLOBALS['csstidy']['replace_colors']['cadetblue'] = '#5F9EA0';
    135. 
-
  135. $GLOBALS['csstidy']['replace_colors']['chartreuse'] = '#7FFF00';
    136. 
-
  136. $GLOBALS['csstidy']['replace_colors']['chocolate'] = '#D2691E';
    137. 
-
  137. $GLOBALS['csstidy']['replace_colors']['coral'] = '#FF7F50';
    138. 
-
  138. $GLOBALS['csstidy']['replace_colors']['cornflowerblue'] = '#6495ED';
    139. 
-
  139. $GLOBALS['csstidy']['replace_colors']['cornsilk'] = '#FFF8DC';
    140. 
-
  140. $GLOBALS['csstidy']['replace_colors']['crimson'] = '#DC143C';
    141. 
-
  141. $GLOBALS['csstidy']['replace_colors']['cyan'] = '#00FFFF';
    142. 
-
  142. $GLOBALS['csstidy']['replace_colors']['darkblue'] = '#00008B';
    143. 
-
  143. $GLOBALS['csstidy']['replace_colors']['darkcyan'] = '#008B8B';
    144. 
-
  144. $GLOBALS['csstidy']['replace_colors']['darkgoldenrod'] = '#B8860B';
    145. 
-
  145. $GLOBALS['csstidy']['replace_colors']['darkgray'] = '#A9A9A9';
    146. 
-
  146. $GLOBALS['csstidy']['replace_colors']['darkgreen'] = '#006400';
    147. 
-
  147. $GLOBALS['csstidy']['replace_colors']['darkkhaki'] = '#BDB76B';
    148. 
-
  148. $GLOBALS['csstidy']['replace_colors']['darkmagenta'] = '#8B008B';
    149. 
-
  149. $GLOBALS['csstidy']['replace_colors']['darkolivegreen'] = '#556B2F';
    150. 
-
  150. $GLOBALS['csstidy']['replace_colors']['darkorange'] = '#FF8C00';
    151. 
-
  151. $GLOBALS['csstidy']['replace_colors']['darkorchid'] = '#9932CC';
    152. 
-
  152. $GLOBALS['csstidy']['replace_colors']['darkred'] = '#8B0000';
    153. 
-
  153. $GLOBALS['csstidy']['replace_colors']['darksalmon'] = '#E9967A';
    154. 
-
  154. $GLOBALS['csstidy']['replace_colors']['darkseagreen'] = '#8FBC8F';
    155. 
-
  155. $GLOBALS['csstidy']['replace_colors']['darkslateblue'] = '#483D8B';
    156. 
-
  156. $GLOBALS['csstidy']['replace_colors']['darkslategray'] = '#2F4F4F';
    157. 
-
  157. $GLOBALS['csstidy']['replace_colors']['darkturquoise'] = '#00CED1';
    158. 
-
  158. $GLOBALS['csstidy']['replace_colors']['darkviolet'] = '#9400D3';
    159. 
-
  159. $GLOBALS['csstidy']['replace_colors']['deeppink'] = '#FF1493';
    160. 
-
  160. $GLOBALS['csstidy']['replace_colors']['deepskyblue'] = '#00BFFF';
    161. 
-
  161. $GLOBALS['csstidy']['replace_colors']['dimgray'] = '#696969';
    162. 
-
  162. $GLOBALS['csstidy']['replace_colors']['dodgerblue'] = '#1E90FF';
    163. 
-
  163. $GLOBALS['csstidy']['replace_colors']['feldspar'] = '#D19275';
    164. 
-
  164. $GLOBALS['csstidy']['replace_colors']['firebrick'] = '#B22222';
    165. 
-
  165. $GLOBALS['csstidy']['replace_colors']['floralwhite'] = '#FFFAF0';
    166. 
-
  166. $GLOBALS['csstidy']['replace_colors']['forestgreen'] = '#228B22';
    167. 
-
  167. $GLOBALS['csstidy']['replace_colors']['gainsboro'] = '#DCDCDC';
    168. 
-
  168. $GLOBALS['csstidy']['replace_colors']['ghostwhite'] = '#F8F8FF';
    169. 
-
  169. $GLOBALS['csstidy']['replace_colors']['gold'] = '#FFD700';
    170. 
-
  170. $GLOBALS['csstidy']['replace_colors']['goldenrod'] = '#DAA520';
    171. 
-
  171. $GLOBALS['csstidy']['replace_colors']['greenyellow'] = '#ADFF2F';
    172. 
-
  172. $GLOBALS['csstidy']['replace_colors']['honeydew'] = '#F0FFF0';
    173. 
-
  173. $GLOBALS['csstidy']['replace_colors']['hotpink'] = '#FF69B4';
    174. 
-
  174. $GLOBALS['csstidy']['replace_colors']['indianred'] = '#CD5C5C';
    175. 
-
  175. $GLOBALS['csstidy']['replace_colors']['indigo'] = '#4B0082';
    176. 
-
  176. $GLOBALS['csstidy']['replace_colors']['ivory'] = '#FFFFF0';
    177. 
-
  177. $GLOBALS['csstidy']['replace_colors']['khaki'] = '#F0E68C';
    178. 
-
  178. $GLOBALS['csstidy']['replace_colors']['lavender'] = '#E6E6FA';
    179. 
-
  179. $GLOBALS['csstidy']['replace_colors']['lavenderblush'] = '#FFF0F5';
    180. 
-
  180. $GLOBALS['csstidy']['replace_colors']['lawngreen'] = '#7CFC00';
    181. 
-
  181. $GLOBALS['csstidy']['replace_colors']['lemonchiffon'] = '#FFFACD';
    182. 
-
  182. $GLOBALS['csstidy']['replace_colors']['lightblue'] = '#ADD8E6';
    183. 
-
  183. $GLOBALS['csstidy']['replace_colors']['lightcoral'] = '#F08080';
    184. 
-
  184. $GLOBALS['csstidy']['replace_colors']['lightcyan'] = '#E0FFFF';
    185. 
-
  185. $GLOBALS['csstidy']['replace_colors']['lightgoldenrodyellow'] = '#FAFAD2';
    186. 
-
  186. $GLOBALS['csstidy']['replace_colors']['lightgrey'] = '#D3D3D3';
    187. 
-
  187. $GLOBALS['csstidy']['replace_colors']['lightgreen'] = '#90EE90';
    188. 
-
  188. $GLOBALS['csstidy']['replace_colors']['lightpink'] = '#FFB6C1';
    189. 
-
  189. $GLOBALS['csstidy']['replace_colors']['lightsalmon'] = '#FFA07A';
    190. 
-
  190. $GLOBALS['csstidy']['replace_colors']['lightseagreen'] = '#20B2AA';
    191. 
-
  191. $GLOBALS['csstidy']['replace_colors']['lightskyblue'] = '#87CEFA';
    192. 
-
  192. $GLOBALS['csstidy']['replace_colors']['lightslateblue'] = '#8470FF';
    193. 
-
  193. $GLOBALS['csstidy']['replace_colors']['lightslategray'] = '#778899';
    194. 
-
  194. $GLOBALS['csstidy']['replace_colors']['lightsteelblue'] = '#B0C4DE';
    195. 
-
  195. $GLOBALS['csstidy']['replace_colors']['lightyellow'] = '#FFFFE0';
    196. 
-
  196. $GLOBALS['csstidy']['replace_colors']['limegreen'] = '#32CD32';
    197. 
-
  197. $GLOBALS['csstidy']['replace_colors']['linen'] = '#FAF0E6';
    198. 
-
  198. $GLOBALS['csstidy']['replace_colors']['magenta'] = '#FF00FF';
    199. 
-
  199. $GLOBALS['csstidy']['replace_colors']['mediumaquamarine'] = '#66CDAA';
    200. 
-
  200. $GLOBALS['csstidy']['replace_colors']['mediumblue'] = '#0000CD';
    201. 
-
  201. $GLOBALS['csstidy']['replace_colors']['mediumorchid'] = '#BA55D3';
    202. 
-
  202. $GLOBALS['csstidy']['replace_colors']['mediumpurple'] = '#9370D8';
    203. 
-
  203. $GLOBALS['csstidy']['replace_colors']['mediumseagreen'] = '#3CB371';
    204. 
-
  204. $GLOBALS['csstidy']['replace_colors']['mediumslateblue'] = '#7B68EE';
    205. 
-
  205. $GLOBALS['csstidy']['replace_colors']['mediumspringgreen'] = '#00FA9A';
    206. 
-
  206. $GLOBALS['csstidy']['replace_colors']['mediumturquoise'] = '#48D1CC';
    207. 
-
  207. $GLOBALS['csstidy']['replace_colors']['mediumvioletred'] = '#C71585';
    208. 
-
  208. $GLOBALS['csstidy']['replace_colors']['midnightblue'] = '#191970';
    209. 
-
  209. $GLOBALS['csstidy']['replace_colors']['mintcream'] = '#F5FFFA';
    210. 
-
  210. $GLOBALS['csstidy']['replace_colors']['mistyrose'] = '#FFE4E1';
    211. 
-
  211. $GLOBALS['csstidy']['replace_colors']['moccasin'] = '#FFE4B5';
    212. 
-
  212. $GLOBALS['csstidy']['replace_colors']['navajowhite'] = '#FFDEAD';
    213. 
-
  213. $GLOBALS['csstidy']['replace_colors']['oldlace'] = '#FDF5E6';
    214. 
-
  214. $GLOBALS['csstidy']['replace_colors']['olivedrab'] = '#6B8E23';
    215. 
-
  215. $GLOBALS['csstidy']['replace_colors']['orangered'] = '#FF4500';
    216. 
-
  216. $GLOBALS['csstidy']['replace_colors']['orchid'] = '#DA70D6';
    217. 
-
  217. $GLOBALS['csstidy']['replace_colors']['palegoldenrod'] = '#EEE8AA';
    218. 
-
  218. $GLOBALS['csstidy']['replace_colors']['palegreen'] = '#98FB98';
    219. 
-
  219. $GLOBALS['csstidy']['replace_colors']['paleturquoise'] = '#AFEEEE';
    220. 
-
  220. $GLOBALS['csstidy']['replace_colors']['palevioletred'] = '#D87093';
    221. 
-
  221. $GLOBALS['csstidy']['replace_colors']['papayawhip'] = '#FFEFD5';
    222. 
-
  222. $GLOBALS['csstidy']['replace_colors']['peachpuff'] = '#FFDAB9';
    223. 
-
  223. $GLOBALS['csstidy']['replace_colors']['peru'] = '#CD853F';
    224. 
-
  224. $GLOBALS['csstidy']['replace_colors']['pink'] = '#FFC0CB';
    225. 
-
  225. $GLOBALS['csstidy']['replace_colors']['plum'] = '#DDA0DD';
    226. 
-
  226. $GLOBALS['csstidy']['replace_colors']['powderblue'] = '#B0E0E6';
    227. 
-
  227. $GLOBALS['csstidy']['replace_colors']['rosybrown'] = '#BC8F8F';
    228. 
-
  228. $GLOBALS['csstidy']['replace_colors']['royalblue'] = '#4169E1';
    229. 
-
  229. $GLOBALS['csstidy']['replace_colors']['saddlebrown'] = '#8B4513';
    230. 
-
  230. $GLOBALS['csstidy']['replace_colors']['salmon'] = '#FA8072';
    231. 
-
  231. $GLOBALS['csstidy']['replace_colors']['sandybrown'] = '#F4A460';
    232. 
-
  232. $GLOBALS['csstidy']['replace_colors']['seagreen'] = '#2E8B57';
    233. 
-
  233. $GLOBALS['csstidy']['replace_colors']['seashell'] = '#FFF5EE';
    234. 
-
  234. $GLOBALS['csstidy']['replace_colors']['sienna'] = '#A0522D';
    235. 
-
  235. $GLOBALS['csstidy']['replace_colors']['skyblue'] = '#87CEEB';
    236. 
-
  236. $GLOBALS['csstidy']['replace_colors']['slateblue'] = '#6A5ACD';
    237. 
-
  237. $GLOBALS['csstidy']['replace_colors']['slategray'] = '#708090';
    238. 
-
  238. $GLOBALS['csstidy']['replace_colors']['snow'] = '#FFFAFA';
    239. 
-
  239. $GLOBALS['csstidy']['replace_colors']['springgreen'] = '#00FF7F';
    240. 
-
  240. $GLOBALS['csstidy']['replace_colors']['steelblue'] = '#4682B4';
    241. 
-
  241. $GLOBALS['csstidy']['replace_colors']['tan'] = '#D2B48C';
    242. 
-
  242. $GLOBALS['csstidy']['replace_colors']['thistle'] = '#D8BFD8';
    243. 
-
  243. $GLOBALS['csstidy']['replace_colors']['tomato'] = '#FF6347';
    244. 
-
  244. $GLOBALS['csstidy']['replace_colors']['turquoise'] = '#40E0D0';
    245. 
-
  245. $GLOBALS['csstidy']['replace_colors']['violet'] = '#EE82EE';
    246. 
-
  246. $GLOBALS['csstidy']['replace_colors']['violetred'] = '#D02090';
    247. 
-
  247. $GLOBALS['csstidy']['replace_colors']['wheat'] = '#F5DEB3';
    248. 
-
  248. $GLOBALS['csstidy']['replace_colors']['whitesmoke'] = '#F5F5F5';
    249. 
-
  249. $GLOBALS['csstidy']['replace_colors']['yellowgreen'] = '#9ACD32';
    250. 
-
  250.  
    251. 
-
  251.  
    252. 
-
  252. /**
    253. 
-
  253.  * A list of all shorthand properties that are devided into four properties and/or have four subvalues
    254. 
-
  254.  *
    255. 
-
  255.  * @global array $GLOBALS['csstidy']['shorthands'] 
    256. 
-
  256.  * @todo Are there new ones in CSS3?
    257. 
-
  257.  * @see dissolve_4value_shorthands()
    258. 
-
  258.  * @see merge_4value_shorthands()
    259. 
-
  259.  * @version 1.0
    260. 
-
  260.  */
    261. 
-
  261. $GLOBALS['csstidy']['shorthands'] = array();
    262. 
-
  262. $GLOBALS['csstidy']['shorthands']['border-color'] = array('border-top-color','border-right-color','border-bottom-color','border-left-color');
    263. 
-
  263. $GLOBALS['csstidy']['shorthands']['border-style'] = array('border-top-style','border-right-style','border-bottom-style','border-left-style');
    264. 
-
  264. $GLOBALS['csstidy']['shorthands']['border-width'] = array('border-top-width','border-right-width','border-bottom-width','border-left-width');
    265. 
-
  265. $GLOBALS['csstidy']['shorthands']['margin'] = array('margin-top','margin-right','margin-bottom','margin-left');
    266. 
-
  266. $GLOBALS['csstidy']['shorthands']['padding'] = array('padding-top','padding-right','padding-bottom','padding-left');
    267. 
-
  267. $GLOBALS['csstidy']['shorthands']['-moz-border-radius'] = 0;
    268. 
-
  268.  
    269. 
-
  269. /**
    270. 
-
  270.  * All CSS Properties. Needed for csstidy::property_is_next()
    271. 
-
  271.  *
    272. 
-
  272.  * @global array $GLOBALS['csstidy']['all_properties'] 
    273. 
-
  273.  * @todo Add CSS3 properties
    274. 
-
  274.  * @version 1.0
    275. 
-
  275.  * @see csstidy::property_is_next()
    276. 
-
  276.  */
    277. 
-
  277. $GLOBALS['csstidy']['all_properties'] = array();
    278. 
-
  278. $GLOBALS['csstidy']['all_properties']['background'] = 'CSS1.0,CSS2.0,CSS2.1';
    279. 
-
  279. $GLOBALS['csstidy']['all_properties']['background-color'] = 'CSS1.0,CSS2.0,CSS2.1';
    280. 
-
  280. $GLOBALS['csstidy']['all_properties']['background-image'] = 'CSS1.0,CSS2.0,CSS2.1';
    281. 
-
  281. $GLOBALS['csstidy']['all_properties']['background-repeat'] = 'CSS1.0,CSS2.0,CSS2.1';
    282. 
-
  282. $GLOBALS['csstidy']['all_properties']['background-attachment'] = 'CSS1.0,CSS2.0,CSS2.1';
    283. 
-
  283. $GLOBALS['csstidy']['all_properties']['background-position'] = 'CSS1.0,CSS2.0,CSS2.1';
    284. 
-
  284. $GLOBALS['csstidy']['all_properties']['border'] = 'CSS1.0,CSS2.0,CSS2.1';
    285. 
-
  285. $GLOBALS['csstidy']['all_properties']['border-top'] = 'CSS1.0,CSS2.0,CSS2.1';
    286. 
-
  286. $GLOBALS['csstidy']['all_properties']['border-right'] = 'CSS1.0,CSS2.0,CSS2.1';
    287. 
-
  287. $GLOBALS['csstidy']['all_properties']['border-bottom'] = 'CSS1.0,CSS2.0,CSS2.1';
    288. 
-
  288. $GLOBALS['csstidy']['all_properties']['border-left'] = 'CSS1.0,CSS2.0,CSS2.1';
    289. 
-
  289. $GLOBALS['csstidy']['all_properties']['border-color'] = 'CSS1.0,CSS2.0,CSS2.1';
    290. 
-
  290. $GLOBALS['csstidy']['all_properties']['border-top-color'] = 'CSS2.0,CSS2.1';
    291. 
-
  291. $GLOBALS['csstidy']['all_properties']['border-bottom-color'] = 'CSS2.0,CSS2.1';
    292. 
-
  292. $GLOBALS['csstidy']['all_properties']['border-left-color'] = 'CSS2.0,CSS2.1';
    293. 
-
  293. $GLOBALS['csstidy']['all_properties']['border-right-color'] = 'CSS2.0,CSS2.1';
    294. 
-
  294. $GLOBALS['csstidy']['all_properties']['border-style'] = 'CSS1.0,CSS2.0,CSS2.1';
    295. 
-
  295. $GLOBALS['csstidy']['all_properties']['border-top-style'] = 'CSS2.0,CSS2.1';
    296. 
-
  296. $GLOBALS['csstidy']['all_properties']['border-right-style'] = 'CSS2.0,CSS2.1';
    297. 
-
  297. $GLOBALS['csstidy']['all_properties']['border-left-style'] = 'CSS2.0,CSS2.1';
    298. 
-
  298. $GLOBALS['csstidy']['all_properties']['border-bottom-style'] = 'CSS2.0,CSS2.1';
    299. 
-
  299. $GLOBALS['csstidy']['all_properties']['border-width'] = 'CSS1.0,CSS2.0,CSS2.1';
    300. 
-
  300. $GLOBALS['csstidy']['all_properties']['border-top-width'] = 'CSS1.0,CSS2.0,CSS2.1';
    301. 
-
  301. $GLOBALS['csstidy']['all_properties']['border-right-width'] = 'CSS1.0,CSS2.0,CSS2.1';
    302. 
-
  302. $GLOBALS['csstidy']['all_properties']['border-left-width'] = 'CSS1.0,CSS2.0,CSS2.1';
    303. 
-
  303. $GLOBALS['csstidy']['all_properties']['border-bottom-width'] = 'CSS1.0,CSS2.0,CSS2.1';
    304. 
-
  304. $GLOBALS['csstidy']['all_properties']['border-collapse'] = 'CSS2.0,CSS2.1';
    305. 
-
  305. $GLOBALS['csstidy']['all_properties']['border-spacing'] = 'CSS2.0,CSS2.1';
    306. 
-
  306. $GLOBALS['csstidy']['all_properties']['bottom'] = 'CSS2.0,CSS2.1';
    307. 
-
  307. $GLOBALS['csstidy']['all_properties']['caption-side'] = 'CSS2.0,CSS2.1';
    308. 
-
  308. $GLOBALS['csstidy']['all_properties']['content'] = 'CSS2.0,CSS2.1';
    309. 
-
  309. $GLOBALS['csstidy']['all_properties']['clear'] = 'CSS1.0,CSS2.0,CSS2.1';
    310. 
-
  310. $GLOBALS['csstidy']['all_properties']['clip'] = 'CSS1.0,CSS2.0,CSS2.1';
    311. 
-
  311. $GLOBALS['csstidy']['all_properties']['color'] = 'CSS1.0,CSS2.0,CSS2.1';
    312. 
-
  312. $GLOBALS['csstidy']['all_properties']['counter-reset'] = 'CSS2.0,CSS2.1';
    313. 
-
  313. $GLOBALS['csstidy']['all_properties']['counter-increment'] = 'CSS2.0,CSS2.1';
    314. 
-
  314. $GLOBALS['csstidy']['all_properties']['cursor'] = 'CSS2.0,CSS2.1';
    315. 
-
  315. $GLOBALS['csstidy']['all_properties']['empty-cells'] = 'CSS2.0,CSS2.1';
    316. 
-
  316. $GLOBALS['csstidy']['all_properties']['display'] = 'CSS1.0,CSS2.0,CSS2.1';
    317. 
-
  317. $GLOBALS['csstidy']['all_properties']['direction'] = 'CSS2.0,CSS2.1';
    318. 
-
  318. $GLOBALS['csstidy']['all_properties']['float'] = 'CSS1.0,CSS2.0,CSS2.1';
    319. 
-
  319. $GLOBALS['csstidy']['all_properties']['font'] = 'CSS1.0,CSS2.0,CSS2.1';
    320. 
-
  320. $GLOBALS['csstidy']['all_properties']['font-family'] = 'CSS1.0,CSS2.0,CSS2.1';
    321. 
-
  321. $GLOBALS['csstidy']['all_properties']['font-style'] = 'CSS1.0,CSS2.0,CSS2.1';
    322. 
-
  322. $GLOBALS['csstidy']['all_properties']['font-variant'] = 'CSS1.0,CSS2.0,CSS2.1';
    323. 
-
  323. $GLOBALS['csstidy']['all_properties']['font-weight'] = 'CSS1.0,CSS2.0,CSS2.1';
    324. 
-
  324. $GLOBALS['csstidy']['all_properties']['font-stretch'] = 'CSS2.0';
    325. 
-
  325. $GLOBALS['csstidy']['all_properties']['font-size-adjust'] = 'CSS2.0';
    326. 
-
  326. $GLOBALS['csstidy']['all_properties']['font-size'] = 'CSS1.0,CSS2.0,CSS2.1';
    327. 
-
  327. $GLOBALS['csstidy']['all_properties']['height'] = 'CSS1.0,CSS2.0,CSS2.1';
    328. 
-
  328. $GLOBALS['csstidy']['all_properties']['left'] = 'CSS1.0,CSS2.0,CSS2.1';
    329. 
-
  329. $GLOBALS['csstidy']['all_properties']['line-height'] = 'CSS1.0,CSS2.0,CSS2.1';
    330. 
-
  330. $GLOBALS['csstidy']['all_properties']['list-style'] = 'CSS1.0,CSS2.0,CSS2.1';
    331. 
-
  331. $GLOBALS['csstidy']['all_properties']['list-style-type'] = 'CSS1.0,CSS2.0,CSS2.1';
    332. 
-
  332. $GLOBALS['csstidy']['all_properties']['list-style-image'] = 'CSS1.0,CSS2.0,CSS2.1';
    333. 
-
  333. $GLOBALS['csstidy']['all_properties']['list-style-position'] = 'CSS1.0,CSS2.0,CSS2.1';
    334. 
-
  334. $GLOBALS['csstidy']['all_properties']['margin'] = 'CSS1.0,CSS2.0,CSS2.1';
    335. 
-
  335. $GLOBALS['csstidy']['all_properties']['margin-top'] = 'CSS1.0,CSS2.0,CSS2.1';
    336. 
-
  336. $GLOBALS['csstidy']['all_properties']['margin-right'] = 'CSS1.0,CSS2.0,CSS2.1';
    337. 
-
  337. $GLOBALS['csstidy']['all_properties']['margin-bottom'] = 'CSS1.0,CSS2.0,CSS2.1';
    338. 
-
  338. $GLOBALS['csstidy']['all_properties']['margin-left'] = 'CSS1.0,CSS2.0,CSS2.1';
    339. 
-
  339. $GLOBALS['csstidy']['all_properties']['marks'] = 'CSS1.0,CSS2.0';
    340. 
-
  340. $GLOBALS['csstidy']['all_properties']['marker-offset'] = 'CSS2.0';
    341. 
-
  341. $GLOBALS['csstidy']['all_properties']['max-height'] = 'CSS2.0,CSS2.1';
    342. 
-
  342. $GLOBALS['csstidy']['all_properties']['max-width'] = 'CSS2.0,CSS2.1';
    343. 
-
  343. $GLOBALS['csstidy']['all_properties']['min-height'] = 'CSS2.0,CSS2.1';
    344. 
-
  344. $GLOBALS['csstidy']['all_properties']['min-width'] = 'CSS2.0,CSS2.1';
    345. 
-
  345. $GLOBALS['csstidy']['all_properties']['overflow'] = 'CSS1.0,CSS2.0,CSS2.1';
    346. 
-
  346. $GLOBALS['csstidy']['all_properties']['orphans'] = 'CSS2.0,CSS2.1';
    347. 
-
  347. $GLOBALS['csstidy']['all_properties']['outline'] = 'CSS2.0,CSS2.1';
    348. 
-
  348. $GLOBALS['csstidy']['all_properties']['outline-width'] = 'CSS2.0,CSS2.1';
    349. 
-
  349. $GLOBALS['csstidy']['all_properties']['outline-style'] = 'CSS2.0,CSS2.1';
    350. 
-
  350. $GLOBALS['csstidy']['all_properties']['outline-color'] = 'CSS2.0,CSS2.1';
    351. 
-
  351. $GLOBALS['csstidy']['all_properties']['padding'] = 'CSS1.0,CSS2.0,CSS2.1';
    352. 
-
  352. $GLOBALS['csstidy']['all_properties']['padding-top'] = 'CSS1.0,CSS2.0,CSS2.1';
    353. 
-
  353. $GLOBALS['csstidy']['all_properties']['padding-right'] = 'CSS1.0,CSS2.0,CSS2.1';
    354. 
-
  354. $GLOBALS['csstidy']['all_properties']['padding-bottom'] = 'CSS1.0,CSS2.0,CSS2.1';
    355. 
-
  355. $GLOBALS['csstidy']['all_properties']['padding-left'] = 'CSS1.0,CSS2.0,CSS2.1';
    356. 
-
  356. $GLOBALS['csstidy']['all_properties']['page-break-before'] = 'CSS1.0,CSS2.0,CSS2.1';
    357. 
-
  357. $GLOBALS['csstidy']['all_properties']['page-break-after'] = 'CSS1.0,CSS2.0,CSS2.1';
    358. 
-
  358. $GLOBALS['csstidy']['all_properties']['page-break-inside'] = 'CSS2.0,CSS2.1';
    359. 
-
  359. $GLOBALS['csstidy']['all_properties']['page'] = 'CSS2.0';
    360. 
-
  360. $GLOBALS['csstidy']['all_properties']['position'] = 'CSS1.0,CSS2.0,CSS2.1';
    361. 
-
  361. $GLOBALS['csstidy']['all_properties']['quotes'] = 'CSS2.0,CSS2.1';
    362. 
-
  362. $GLOBALS['csstidy']['all_properties']['right'] = 'CSS2.0,CSS2.1';
    363. 
-
  363. $GLOBALS['csstidy']['all_properties']['size'] = 'CSS1.0,CSS2.0';
    364. 
-
  364. $GLOBALS['csstidy']['all_properties']['speak-header'] = 'CSS2.0,CSS2.1';
    365. 
-
  365. $GLOBALS['csstidy']['all_properties']['table-layout'] = 'CSS2.0,CSS2.1';
    366. 
-
  366. $GLOBALS['csstidy']['all_properties']['top'] = 'CSS1.0,CSS2.0,CSS2.1';
    367. 
-
  367. $GLOBALS['csstidy']['all_properties']['text-indent'] = 'CSS1.0,CSS2.0,CSS2.1';
    368. 
-
  368. $GLOBALS['csstidy']['all_properties']['text-align'] = 'CSS1.0,CSS2.0,CSS2.1';
    369. 
-
  369. $GLOBALS['csstidy']['all_properties']['text-decoration'] = 'CSS1.0,CSS2.0,CSS2.1';
    370. 
-
  370. $GLOBALS['csstidy']['all_properties']['text-shadow'] = 'CSS2.0';
    371. 
-
  371. $GLOBALS['csstidy']['all_properties']['letter-spacing'] = 'CSS1.0,CSS2.0,CSS2.1';
    372. 
-
  372. $GLOBALS['csstidy']['all_properties']['word-spacing'] = 'CSS1.0,CSS2.0,CSS2.1';
    373. 
-
  373. $GLOBALS['csstidy']['all_properties']['text-transform'] = 'CSS1.0,CSS2.0,CSS2.1';
    374. 
-
  374. $GLOBALS['csstidy']['all_properties']['white-space'] = 'CSS1.0,CSS2.0,CSS2.1';
    375. 
-
  375. $GLOBALS['csstidy']['all_properties']['unicode-bidi'] = 'CSS2.0,CSS2.1';
    376. 
-
  376. $GLOBALS['csstidy']['all_properties']['vertical-align'] = 'CSS1.0,CSS2.0,CSS2.1';
    377. 
-
  377. $GLOBALS['csstidy']['all_properties']['visibility'] = 'CSS1.0,CSS2.0,CSS2.1';
    378. 
-
  378. $GLOBALS['csstidy']['all_properties']['width'] = 'CSS1.0,CSS2.0,CSS2.1';
    379. 
-
  379. $GLOBALS['csstidy']['all_properties']['widows'] = 'CSS2.0,CSS2.1';
    380. 
-
  380. $GLOBALS['csstidy']['all_properties']['z-index'] = 'CSS1.0,CSS2.0,CSS2.1';
    381. 
-
  381. /* Speech */
    382. 
-
  382. $GLOBALS['csstidy']['all_properties']['volume'] = 'CSS2.0,CSS2.1';
    383. 
-
  383. $GLOBALS['csstidy']['all_properties']['speak'] = 'CSS2.0,CSS2.1';
    384. 
-
  384. $GLOBALS['csstidy']['all_properties']['pause'] = 'CSS2.0,CSS2.1';
    385. 
-
  385. $GLOBALS['csstidy']['all_properties']['pause-before'] = 'CSS2.0,CSS2.1';
    386. 
-
  386. $GLOBALS['csstidy']['all_properties']['pause-after'] = 'CSS2.0,CSS2.1';
    387. 
-
  387. $GLOBALS['csstidy']['all_properties']['cue'] = 'CSS2.0,CSS2.1';
    388. 
-
  388. $GLOBALS['csstidy']['all_properties']['cue-before'] = 'CSS2.0,CSS2.1';
    389. 
-
  389. $GLOBALS['csstidy']['all_properties']['cue-after'] = 'CSS2.0,CSS2.1';
    390. 
-
  390. $GLOBALS['csstidy']['all_properties']['play-during'] = 'CSS2.0,CSS2.1';
    391. 
-
  391. $GLOBALS['csstidy']['all_properties']['azimuth'] = 'CSS2.0,CSS2.1';
    392. 
-
  392. $GLOBALS['csstidy']['all_properties']['elevation'] = 'CSS2.0,CSS2.1';
    393. 
-
  393. $GLOBALS['csstidy']['all_properties']['speech-rate'] = 'CSS2.0,CSS2.1';
    394. 
-
  394. $GLOBALS['csstidy']['all_properties']['voice-family'] = 'CSS2.0,CSS2.1';
    395. 
-
  395. $GLOBALS['csstidy']['all_properties']['pitch'] = 'CSS2.0,CSS2.1';
    396. 
-
  396. $GLOBALS['csstidy']['all_properties']['pitch-range'] = 'CSS2.0,CSS2.1';
    397. 
-
  397. $GLOBALS['csstidy']['all_properties']['stress'] = 'CSS2.0,CSS2.1';
    398. 
-
  398. $GLOBALS['csstidy']['all_properties']['richness'] = 'CSS2.0,CSS2.1';
    399. 
-
  399. $GLOBALS['csstidy']['all_properties']['speak-punctuation'] = 'CSS2.0,CSS2.1';
    400. 
-
  400. $GLOBALS['csstidy']['all_properties']['speak-numeral'] = 'CSS2.0,CSS2.1';
    401. 
-
  401.  
    402. 
-
  402. /**
    403. 
-
  403.  * An array containing all predefined templates.
    404. 
-
  404.  *
    405. 
-
  405.  * @global array $GLOBALS['csstidy']['predefined_templates'] 
    406. 
-
  406.  * @version 1.0
    407. 
-
  407.  * @see csstidy::load_template()
    408. 
-
  408.  */
    409. 
-
  409. $GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="at">'; //string before @rule
    410. 
-
  410. $GLOBALS['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>'."\n"; //bracket after @-rule
    411. 
-
  411. $GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="selector">'; //string before selector
    412. 
-
  412. $GLOBALS['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>'."\n"; //bracket after selector
    413. 
-
  413. $GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="property">'; //string before property
    414. 
-
  414. $GLOBALS['csstidy']['predefined_templates']['default'][] = '</span><span class="value">'; //string after property+before value
    415. 
-
  415. $GLOBALS['csstidy']['predefined_templates']['default'][] = '</span><span class="format">;</span>'."\n"; //string after value
    416. 
-
  416. $GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="format">}</span>'; //closing bracket - selector
    417. 
-
  417. $GLOBALS['csstidy']['predefined_templates']['default'][] = "\n\n"; //space between blocks {...}
    418. 
-
  418. $GLOBALS['csstidy']['predefined_templates']['default'][] = "\n".'<span class="format">}</span>'. "\n\n"; //closing bracket @-rule
    419. 
-
  419. $GLOBALS['csstidy']['predefined_templates']['default'][] = ''; //indent in @-rule
    420. 
-
  420. $GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="comment">'; // before comment
    421. 
-
  421. $GLOBALS['csstidy']['predefined_templates']['default'][] = '</span>'."\n"; // after comment
    422. 
-
  422. $GLOBALS['csstidy']['predefined_templates']['default'][] = "\n"; // after last line @-rule
    423. 
-
  423.  
    424. 
-
  424. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="at">';
    425. 
-
  425. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span> <span class="format">{</span>'."\n";
    426. 
-
  426. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="selector">';
    427. 
-
  427. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="format">{</span>';
    428. 
-
  428. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="property">';
    429. 
-
  429. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="value">';
    430. 
-
  430. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="format">;</span>';
    431. 
-
  431. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="format">}</span>';
    432. 
-
  432. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n";
    433. 
-
  433. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n". '<span class="format">}'."\n".'</span>';
    434. 
-
  434. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '';
    435. 
-
  435. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="comment">'; // before comment
    436. 
-
  436. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span>'; // after comment
    437. 
-
  437. $GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n";
    438. 
-
  438.  
    439. 
-
  439. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="at">';
    440. 
-
  440. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">{</span>';
    441. 
-
  441. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="selector">';
    442. 
-
  442. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">{</span>';
    443. 
-
  443. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="property">';
    444. 
-
  444. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="value">';
    445. 
-
  445. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span><span class="format">;</span>';
    446. 
-
  446. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="format">}</span>';
    447. 
-
  447. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
    448. 
-
  448. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="format">}</span>';
    449. 
-
  449. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
    450. 
-
  450. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '<span class="comment">'; // before comment
    451. 
-
  451. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '</span>'; // after comment
    452. 
-
  452. $GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
    453. 
-
  453.  
    454. 
-
  454. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="at">';
    455. 
-
  455. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span> <span class="format">{</span>'."\n";
    456. 
-
  456. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="selector">';
    457. 
-
  457. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span>'."\n".'<span class="format">{</span>'."\n";
    458. 
-
  458. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '    <span class="property">';
    459. 
-
  459. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="value">';
    460. 
-
  460. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="format">;</span>'."\n";
    461. 
-
  461. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="format">}</span>';
    462. 
-
  462. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n\n";
    463. 
-
  463. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n".'<span class="format">}</span>'."\n\n";
    464. 
-
  464. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '    ';
    465. 
-
  465. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="comment">'; // before comment
    466. 
-
  466. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span>'."\n"; // after comment
    467. 
-
  467. $GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n";
    468. 
-
  468.  
    469. 
-
  469. ?>
    470. 
-
-
-
-
- Documentation generated on Mon, 15 May 2006 22:56:01 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/classtrees_csstidy.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/classtrees_csstidy.html deleted file mode 100644 index a8717496..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/classtrees_csstidy.html +++ /dev/null @@ -1,62 +0,0 @@ - - -Class Trees for Package csstidy - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- 		-
- -

Class Trees for Package csstidy

-
-
Root class csstidy

- - -
-
Root class csstidy_optimise

- - -
-
Root class csstidy_print

- - -
-
- Documentation generated on Mon, 15 May 2006 22:54:54 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_optimise_php.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_optimise_php.html deleted file mode 100644 index f755d0c4..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_optimise_php.html +++ /dev/null @@ -1,97 +0,0 @@ - - -Docs for page class.csstidy_optimise.php - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- Files:
-
- class.csstidy.php -
- class.csstidy_optimise.php -
- class.csstidy_print.php -
- data.inc.php -
-

- - Classes:
-
- csstidy
- csstidy_optimise
- csstidy_print
-
- 		-
- -

Procedural File: class.csstidy_optimise.php

-Source Location: /class.csstidy_optimise.php

- -
-
- -
-

Classes:

-
csstidy_optimise
-
CSS Optimising Class
-


- -

Page Details:

-CSSTidy - CSS Parser and Optimiser

CSS Optimising Class This class optimises CSS data generated by csstidy.

This file is part of CSSTidy.

CSSTidy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 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 General Public License for more details.

You should have received a copy of the GNU General Public License along with CSSTidy; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA




-

Tags:

-
- - - - - - - - - - -
filesource:  Source Code for this file
author:  Florian Schmitz (floele at gmail dot com) 2005-2006
license:  GNU Public License
-
-

-

-

-
- -
-
- Documentation generated on Mon, 15 May 2006 22:55:16 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_php.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_php.html deleted file mode 100644 index 775f327d..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_php.html +++ /dev/null @@ -1,130 +0,0 @@ - - -Docs for page class.csstidy.php - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- Files:
-
- class.csstidy.php -
- class.csstidy_optimise.php -
- class.csstidy_print.php -
- data.inc.php -
-

- - Classes:
-
- csstidy
- csstidy_optimise
- csstidy_print
-
- 		-
- -

Procedural File: class.csstidy.php

-Source Location: /class.csstidy.php

- -
-
- -
-

Classes:

-
csstidy
-
CSS Parser class
-


- -

Page Details:

-CSSTidy - CSS Parser and Optimiser

CSS Parser class

This file is part of CSSTidy.

CSSTidy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 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 General Public License for more details.

You should have received a copy of the GNU General Public License along with CSSTidy; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA




-

Tags:

-
- - - - - - - - - - -
filesource:  Source Code for this file
author:  Florian Schmitz (floele at gmail dot com) 2005-2006
license:  GNU Public License
-
-

-

Includes:

-
-require('data.inc.php') [line 33]
-Various CSS data needed for correct optimisations etc.



-

Tags:

-
- - - - -
version:  1.2
-
-require('class.csstidy_print.php') [line 40]
-Contains a class for printing CSS code



-

Tags:

-
- - - - -
version:  1.0
-
-require('class.csstidy_optimise.php') [line 47]
-Contains a class for optimising CSS code



-

Tags:

-
- - - - -
version:  1.0
-
-
-

-

-
- -
-
- Documentation generated on Mon, 15 May 2006 22:54:54 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_print_php.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_print_php.html deleted file mode 100644 index d0062b26..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_class_csstidy_print_php.html +++ /dev/null @@ -1,97 +0,0 @@ - - -Docs for page class.csstidy_print.php - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- Files:
-
- class.csstidy.php -
- class.csstidy_optimise.php -
- class.csstidy_print.php -
- data.inc.php -
-

- - Classes:
-
- csstidy
- csstidy_optimise
- csstidy_print
-
- 		-
- -

Procedural File: class.csstidy_print.php

-Source Location: /class.csstidy_print.php

- -
-
- -
-

Classes:

-
csstidy_print
-
CSS Printing class
-


- -

Page Details:

-CSSTidy - CSS Parser and Optimiser

CSS Printing class This class prints CSS data generated by csstidy.

This file is part of CSSTidy.

CSSTidy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 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 General Public License for more details.

You should have received a copy of the GNU General Public License along with CSSTidy; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA




-

Tags:

-
- - - - - - - - - - -
filesource:  Source Code for this file
author:  Florian Schmitz (floele at gmail dot com) 2005-2006
license:  GNU Public License
-
-

-

-

-
- -
-
- Documentation generated on Mon, 15 May 2006 22:55:35 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_data_inc_php.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_data_inc_php.html deleted file mode 100644 index a95e0c82..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/_data_inc_php.html +++ /dev/null @@ -1,483 +0,0 @@ - - -Docs for page data.inc.php - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- Files:
-
- class.csstidy.php -
- class.csstidy_optimise.php -
- class.csstidy_print.php -
- data.inc.php -
-

- - Classes:
-
- csstidy
- csstidy_optimise
- csstidy_print
-
- 		-
- -

Procedural File: data.inc.php

-Source Location: /data.inc.php

- -
-
- - -

Page Details:

-Various CSS Data for CSSTidy

This file is part of CSSTidy.

CSSTidy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 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 General Public License for more details.

You should have received a copy of the GNU General Public License along with CSSTidy; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA




-

Tags:

-
- - - - - - - - - - -
filesource:  Source Code for this file
author:  Florian Schmitz (floele at gmail dot com) 2005
license:  GNU Public License
-
-

-

-
- -

array $GLOBALS['csstidy']['all_properties'] [line 277]

-
- All CSS Properties. Needed for csstidy::property_is_next()



-

Tags:

-
- - - - - - - - - - -
see:  csstidy::property_is_next()
version:  1.0
todo:  Add CSS3 properties
-
- - - - - - -
Default value:  array()
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['at_rules'] [line 66]

-
- Available at-rules



-

Tags:

-
- - - - -
version:  1.0
-
- - - - - - -
Default value:  array('page' => 'is','font-face' => 'is','charset' => 'iv', 'import' => 'iv','namespace' => 'iv','media' => 'at')
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['background_prop_default'] [line 106]

-
- Default values for the background properties



-

Tags:

-
- - - - - - - - - - - - - -
version:  1.0
see:  merge_bg()
see:  dissolve_short_bg()
todo:  Possibly property names will change during CSS3 development
-
- - - - - - -
Default value:  array()
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['color_values'] [line 86]

-
- Properties that allow <color> as value



-

Tags:

-
- - - - - - - - - - -
version:  1.0
see:  compress_numbers();
todo:  CSS3 properties
-
- - - - - - -
Default value:  array()
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['number_values'] [line 76]

-
- Properties that allow <number> as value



-

Tags:

-
- - - - - - - - - - -
version:  1.2
see:  compress_numbers();
todo:  CSS3 properties
-
- - - - - - -
Default value:  array('line-height','pitch-range','richness','speech-rate','stress','volume','font','font-weight','z-index','counter-increment','counter-reset','orphans','widows')
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['predefined_templates'] [line 409]

-
- An array containing all predefined templates.



-

Tags:

-
- - - - - - - -
see:  csstidy::load_template()
version:  1.0
-
- - - - - - -
Default value:  '<span class="at">'
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['replace_colors'] [line 123]

-
- A list of non-W3C color names which get replaced by their hex-codes



-

Tags:

-
- - - - - - - -
version:  1.0
see:  cut_color()
-
- - - - - - -
Default value:  array()
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['shorthands'] [line 261]

-
- A list of all shorthand properties that are devided into four properties and/or have four subvalues



-

Tags:

-
- - - - - - - - - - - - - -
version:  1.0
see:  merge_4value_shorthands()
see:  dissolve_4value_shorthands()
todo:  Are there new ones in CSS3?
-
- - - - - - -
Default value:  array()
-


-
[ Top ]


-
- -

string $GLOBALS['csstidy']['tokens'] [line 49]

-
- All CSS tokens used by csstidy



-

Tags:

-
- - - - -
version:  1.0
-
- - - - - - -
Default value:  '/@}{;:=\'"(,\\!$%&)*+.<>?[]^`|~'
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['units'] [line 58]

-
- All CSS units (CSS 3 units included)



-

Tags:

-
- - - - - - - -
version:  1.0
see:  compress_numbers()
-
- - - - - - -
Default value:  array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','deg','grad','rad','ms','s','khz','hz')
-


-
[ Top ]


-
- -

array $GLOBALS['csstidy']['whitespace'] [line 41]

-
- All whitespace allowed in CSS



-

Tags:

-
- - - - -
version:  1.0
-
- - - - - - -
Default value:  array(' ',"\n","\t","\r","\x0B")
-


-
[ Top ]


-

-
- -

AT_END [line 27]

-
-
-
- AT_END = 2 -
-
- -
-
-
[ Top ]


-
- -

AT_START [line 26]

-
-
-
- AT_START = 1 -
-
- -
-
-
[ Top ]


-
- -

COMMENT [line 32]

-
-
-
- COMMENT = 7 -
-
- -
-
-
[ Top ]


-
- -

DEFAULT_AT [line 33]

-
-
-
- DEFAULT_AT = 41 -
-
- -
-
-
[ Top ]


-
- -

PROPERTY [line 30]

-
-
-
- PROPERTY = 5 -
-
- -
-
-
[ Top ]


-
- -

SEL_END [line 29]

-
-
-
- SEL_END = 4 -
-
- -
-
-
[ Top ]


-
- -

SEL_START [line 28]

-
-
-
- SEL_START = 3 -
-
- -
-
-
[ Top ]


-
- -

VALUE [line 31]

-
-
-
- VALUE = 6 -
-
- -
-
-
[ Top ]


-
- -
-
- Documentation generated on Mon, 15 May 2006 22:55:43 +0200 by phpDocumentor 1.3.0RC3 -
-
-
- - - \ No newline at end of file diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy.html deleted file mode 100644 index e3f92e73..00000000 --- a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy.html +++ /dev/null @@ -1,1550 +0,0 @@ - - -Docs For Class csstidy - - - - - - - - - - - - - -
csstidy
- [ class tree: csstidy ] - [ index: csstidy ] - [ all elements ] -
- - - - - - -
-
-

Todo List

-
- Packages:
- csstidy
-

- Files:
-
- class.csstidy.php -
- class.csstidy_optimise.php -
- class.csstidy_print.php -
- data.inc.php -
-

- - Classes:
-
- csstidy
- csstidy_optimise
- csstidy_print
-
- 		-
- -

Class: csstidy

-Source Location: /class.csstidy.php

- - - - - - - - - - -
- -

Class Overview

-


-
CSS Parser class



-
Author(s):

-
    
-                
  • Florian Schmitz (floele at gmail dot com) 2005-2006
    • 
-      

-
-
-
-
-    
-        
-
Version:

-
    
-  
  • 1.2
    • 
-

-
-
-		
-
Variables

-
-		
-
Methods

-
-

-

-
-
-
-
-
-
-
-
-

-

-
-
-
Class Details

-

-[line 61]

-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




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.2
author:  Florian Schmitz (floele at gmail dot com) 2005-2006

-

-



-
[ Top ]


-
-

-
-
Class Variables

-

-	
-	

-	
$added =  false

-	
[line 233]

-  =true if something has been added to the current selector




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  bool

-	



-	
[ Top ]


-	
-	

-	
$at =  ''

-	
[line 150]

-  Saves the current at rule (@media)




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$charset =  ''

-	
[line 98]

-  Saves the CSS charset (@charset)




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$css = array()

-	
[line 68]

-  Saves the parsed CSS




-
Tags:

-

-
-  
-    
-  
-
access:  public

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  array

-	



-	
[ Top ]


-	
-	

-	
$from =  ''

-	
[line 212]

-  Status from which the parser switched to ic or instr




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$import = array()

-	
[line 105]

-  Saves all @import URLs




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  array

-	



-	
[ Top ]


-	
-	

-	
$invalid_at =  false

-	
[line 226]

-  =true if in invalid at-rule




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  bool

-	



-	
[ Top ]


-	
-	

-	
$line =  1

-	
[line 247]

-  Saves the line number




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  integer

-	



-	
[ Top ]


-	
-	

-	
$log = array()

-	
[line 240]

-  Array which saves the message log




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  array

-	



-	
[ Top ]


-	
-	

-	
$namespace =  ''

-	
[line 112]

-  Saves the namespace




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$optimise = 

-	
[line 91]

-  Optimiser class




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
access:  private
see:  csstidy_optimise

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  object

-	



-	
[ Top ]


-	
-	

-	
$print = 

-	
[line 83]

-  Printer class




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
access:  public
see:  csstidy_print

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  object

-	



-	
[ Top ]


-	
-	

-	
$property =  ''

-	
[line 164]

-  Saves the current property




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$selector =  ''

-	
[line 157]

-  Saves the current selector




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$sel_separate = array()

-	
[line 171]

-  Saves the position of , in selectors




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  array

-	



-	
[ Top ]


-	
-	

-	
$settings = array()

-	
[line 126]

-  Stores the settings




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  array

-	



-	
[ Top ]


-	
-	

-	
$status =  'is'

-	
[line 142]

-  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




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$str_char =  ''

-	
[line 205]

-  Saves the char which opened the last string




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$str_in_str =  false

-	
[line 219]

-  Variable needed to manage string-in-strings, for example url("foo.png")




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$sub_value =  ''

-	
[line 190]

-  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




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$sub_value_arr = array()

-	
[line 198]

-  Array which saves all subvalues for a property.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
access:  private
see:  csstidy::$sub_value

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  array

-	



-	
[ Top ]


-	
-	

-	
$tokens = array()

-	
[line 75]

-  Saves the parsed CSS (raw)




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  array

-	



-	
[ Top ]


-	
-	

-	
$value =  ''

-	
[line 178]

-  Saves the current value




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$version =  '1.2'

-	
[line 119]

-  Contains the version of csstidy




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-


-
-

-
-
Class Methods

-

-  

-	
-	
constructor csstidy [line 254]

-	

-    

-    

-		csstidy csstidy(
-)
-    

-    


-	
-		Loads standard template and sets default settings




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.2
access:  private

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method css_add_property [line 877]

-	

-    

-    

-		void css_add_property(
-string
-$media, string
-$selector, string
-$property, string
-$new_val)
-    

-    


-	
-		Adds a property with value to the existing CSS code




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.2
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $media  
string  $selector  
string  $property  
string  $new_val  

-    


-        
[ Top ]

-  

-  

-	
-	
method escaped [line 863]

-	

-    

-    

-		bool escaped(
-string
-&$string, integer
-$pos)
-    

-    


-	
-		Checks if a character is escaped (and returns true if it is)




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.02
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $string  
integer  $pos  

-    


-        
[ Top ]

-  

-  

-	
-	
method explode_selectors [line 825]

-	

-    

-    

-		void explode_selectors(
-)
-    

-    


-	
-		Explodes selectors




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  private

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method get_cfg [line 283]

-	

-    

-    

-		mixed get_cfg(
-string
-$setting)
-    

-    


-	
-		Get the value of a setting.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $setting  

-    


-        
[ Top ]

-  

-  

-	
-	
method gvw_important [line 933]

-	

-    

-    

-		string gvw_important(
-string
-$value)
-    

-    


-	
-		Returns a value without !important




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $value  

-    


-        
[ Top ]

-  

-  

-	
-	
method is_important [line 921]

-	

-    

-    

-		bool is_important(
-string
-&$value)
-    

-    


-	
-		Checks if $value is !important.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $value  

-    


-        
[ Top ]

-  

-  

-	
-	
method is_token [line 444]

-	

-    

-    

-		void is_token(
-string
-&$string, integer
-$i)
-    

-    


-	
-		Checks if there is a token at the current position




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.11
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $string  
integer  $i  

-    


-        
[ Top ]

-  

-  

-	
-	
method load_template [line 404]

-	

-    

-    

-		void load_template(
-string
-$content, [bool
-$from_file = true])
-    

-    


-	
-		Loads a new template




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-  
-    
-  
-
see:  http://csstidy.sourceforge.net/templates.php
version:  1.1
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $content  either filename (if $from_file == true), content of a template file, "high_compression", "highest_compression", "low_compression", or "default"
bool  $from_file  uses $content as filename if true

-    


-        
[ Top ]

-  

-  

-	
-	
method log [line 332]

-	

-    

-    

-		void log(
-string
-$message, string
-$type, [integer
-$line = -1])
-    

-    


-	
-		Add a message to the message log




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $message  
string  $type  
integer  $line  

-    


-        
[ Top ]

-  

-  

-	
-	
method merge_css_blocks [line 906]

-	

-    

-    

-		void merge_css_blocks(
-string
-$media, string
-$selector, array
-$css_add)
-    

-    


-	
-		Adds CSS to an existing media/selector




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.1
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $media  
string  $selector  
array  $css_add  

-    


-        
[ Top ]

-  

-  

-	
-	
method parse [line 458]

-	

-    

-    

-		bool parse(
-string
-$string)
-    

-    


-	
-		Parses CSS in $string. The code is saved as array in $this->css




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.1
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $string  the CSS code

-    


-        
[ Top ]

-  

-  

-	
-	
method parse_from_url [line 432]

-	

-    

-    

-		void parse_from_url(
-string
-$url)
-    

-    


-	
-		Starts parsing from URL




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $url  

-    


-        
[ Top ]

-  

-  

-	
-	
method property_is_next [line 955]

-	

-    

-    

-		bool property_is_next(
-string
-$istring, integer
-$pos)
-    

-    


-	
-		Checks if the next word in a string from pos is a CSS property




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.2
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $istring  
integer  $pos  

-    


-        
[ Top ]

-  

-  

-	
-	
method property_is_valid [line 980]

-	

-    

-    

-		bool; property_is_valid(
-string
-$property)
-    

-    


-	
-		Checks if a property is valid




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $property  

-    


-        
[ Top ]

-  

-  

-	
-	
method set_cfg [line 300]

-	

-    

-    

-		bool set_cfg(
-string
-$setting, mixed
-$value)
-    

-    


-	
-		Set the value of a setting.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $setting  
mixed  $value  

-    


-        
[ Top ]

-  

-  

-	
-	
method _add_token [line 318]

-	

-    

-    

-		void _add_token(
-mixed
-$type, string
-$data, [bool
-$do = false])
-    

-    


-	
-		Adds a token to $this->tokens




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
mixed  $type  
string  $data  
bool  $do  add a token even if preserve_css is off

-    


-        
[ Top ]

-  

-  

-	
-	
method _unicode [line 354]

-	

-    

-    

-		string _unicode(
-string
-&$string, integer
-&$i)
-    

-    


-	
-		Parse unicode notations and find a replacement character




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.2
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $string  
integer  $i  

-    


-        
[ Top ]

-  

-


-
-
-        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:55:14 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy_optimise.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy_optimise.html
deleted file mode 100644
index 3f72a2f4..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy_optimise.html
+++ /dev/null
@@ -1,705 +0,0 @@
-
-
-Docs For Class csstidy_optimise
-
-
-
-
-
-  
-    
-  
-  
-  
-    
-  
-  
-
csstidy

-  		  [ class tree: csstidy ]
-		  [ index: csstidy ]
-		  [ all elements ]
-    

-
-
-  
-    
-    
-  
-

-	

-			
Todo List

-	

-      Packages:

-              csstidy

-            


-                        Files:

-      	  

-					class.csstidy.php
-		

-					class.csstidy_optimise.php
-		

-					class.csstidy_print.php
-		

-					data.inc.php
-		

-	  



-      
-            Classes:

-        

-		    		csstidy

-	    		csstidy_optimise

-	    		csstidy_print

-	  


-                		
-      

-
-
Class: csstidy_optimise

-Source Location: /class.csstidy_optimise.php


-
-
-
-
-
-
-
-
-
-

-
-
Class Overview

-


-
CSS Optimising Class



-
Author(s):

-
    
-                
  • Florian Schmitz (floele at gmail dot com) 2005-2006
    • 
-      

-
-
-
-
-    
-        
-
Version:

-
    
-  
  • 1.0
    • 
-

-
-
-		
-
Methods

-
-

-

-
-
-
-
-
-
-
-
-

-

-
-
-
Class Details

-

-[line 39]

-CSS Optimising Class

This class optimises CSS data generated by csstidy.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
author:  Florian Schmitz (floele at gmail dot com) 2005-2006

-

-



-
[ Top ]


-
-
-

-
-
Class Methods

-

-  

-	
-	
constructor csstidy_optimise [line 47]

-	

-    

-    

-		csstidy_optimise csstidy_optimise(
-array
-&$css)
-    

-    


-	
-		Constructor




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
array  $css  contains the class csstidy

-    


-        
[ Top ]

-  

-  

-	
-	
method compress_important [line 278]

-	

-    

-    

-		string compress_important(
-string
-&$string)
-    

-    


-	
-		Removes unnecessary whitespace in ! important




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.1
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $string  

-    


-        
[ Top ]

-  

-  

-	
-	
method compress_numbers [line 368]

-	

-    

-    

-		string compress_numbers(
-string
-$subvalue)
-    

-    


-	
-		Compresses numbers (ie. 1.0 becomes 1 or 1.100 becomes 1.1 )




-
Tags:

-

-
-  
-    
-  
-
version:  1.2

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $subvalue  

-    


-        
[ Top ]

-  

-  

-	
-	
method cut_color [line 293]

-	

-    

-    

-		string cut_color(
-string
-$color)
-    

-    


-	
-		Color compression function. Converts all rgb() values to #-values and uses the short-form if possible. Also replaces 4 color names by #-values.




-
Tags:

-

-
-  
-    
-  
-
version:  1.1

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $color  

-    


-        
[ Top ]

-  

-  

-	
-	
method dissolve_4value_shorthands [line 485]

-	

-    

-    

-		array dissolve_4value_shorthands(
-string
-$property, string
-$value)
-    

-    


-	
-		Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;...




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
see:  csstidy_optimise::merge_4value_shorthands()
version:  1.0

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $property  
string  $value  

-    


-        
[ Top ]

-  

-  

-	
-	
method dissolve_short_bg [line 639]

-	

-    

-    

-		array dissolve_short_bg(
-string
-$str_value)
-    

-    


-	
-		Dissolve background property




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-  
-    
-  
-
todo:  full CSS 3 compliance
see:  csstidy_optimise::merge_bg()
version:  1.0

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $str_value  

-    


-        
[ Top ]

-  

-  

-	
-	
method explode_ws [line 543]

-	

-    

-    

-		array explode_ws(
-string
-$sep, string
-$string)
-    

-    


-	
-		Explodes a string as explode() does, however, not if $sep is escaped or within a string.




-
Tags:

-

-
-  
-    
-  
-
version:  1.0

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $sep  seperator
string  $string  

-    


-        
[ Top ]

-  

-  

-	
-	
method merge_4value_shorthands [line 598]

-	

-    

-    

-		array merge_4value_shorthands(
-array
-$array)
-    

-    


-	
-		Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
see:  csstidy_optimise::dissolve_4value_shorthands()
version:  1.2

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
array  $array  

-    


-        
[ Top ]

-  

-  

-	
-	
method merge_bg [line 725]

-	

-    

-    

-		array merge_bg(
-array
-$input_css)
-    

-    


-	
-		Merges all background properties




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-  
-    
-  
-
todo:  full CSS 3 compliance
see:  csstidy_optimise::dissolve_short_bg()
version:  1.0

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
array  $input_css  

-    


-        
[ Top ]

-  

-  

-	
-	
method merge_selectors [line 435]

-	

-    

-    

-		array merge_selectors(
-array
-&$array)
-    

-    


-	
-		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.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.2
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
array  $array  

-    


-        
[ Top ]

-  

-  

-	
-	
method postparse [line 63]

-	

-    

-    

-		void postparse(
-)
-    

-    


-	
-		Optimises $css after parsing




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method shorthand [line 221]

-	

-    

-    

-		string shorthand(
-string
-$value)
-    

-    


-	
-		Compresses shorthand values. Example: margin:1px 1px 1px 1px -> margin:1px




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $value  

-    


-        
[ Top ]

-  

-  

-	
-	
method shorthands [line 130]

-	

-    

-    

-		void shorthands(
-)
-    

-    


-	
-		Optimises shorthands




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method subvalue [line 158]

-	

-    

-    

-		void subvalue(
-)
-    

-    


-	
-		Optimises a sub-value




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method value [line 103]

-	

-    

-    

-		void value(
-)
-    

-    


-	
-		Optimises values




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
[ Top ]

-  

-


-
-
-        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:55:34 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy_print.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy_print.html
deleted file mode 100644
index 665301fe..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/csstidy/csstidy_print.html
+++ /dev/null
@@ -1,617 +0,0 @@
-
-
-Docs For Class csstidy_print
-
-
-
-
-
-  
-    
-  
-  
-  
-    
-  
-  
-
csstidy

-  		  [ class tree: csstidy ]
-		  [ index: csstidy ]
-		  [ all elements ]
-    

-
-
-  
-    
-    
-  
-

-	

-			
Todo List

-	

-      Packages:

-              csstidy

-            


-                        Files:

-      	  

-					class.csstidy.php
-		

-					class.csstidy_optimise.php
-		

-					class.csstidy_print.php
-		

-					data.inc.php
-		

-	  



-      
-            Classes:

-        

-		    		csstidy

-	    		csstidy_optimise

-	    		csstidy_print

-	  


-                		
-      

-
-
Class: csstidy_print

-Source Location: /class.csstidy_print.php


-
-
-
-
-
-
-
-
-
-
-

-
-
Class Overview

-


-
CSS Printing class



-
Author(s):

-
    
-                
  • Florian Schmitz (floele at gmail dot com) 2005-2006
    • 
-      

-
-
-
-
-    
-        
-
Version:

-
    
-  
  • 1.0
    • 
-

-
-
-		
-
Variables

-
-		
-
Methods

-
-

-

-
-
-
-
-
-
-
-
-

-

-
-
-
Class Details

-

-[line 39]

-CSS Printing class

This class prints CSS data generated by csstidy.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
author:  Florian Schmitz (floele at gmail dot com) 2005-2006

-

-



-
[ Top ]


-
-

-
-
Class Variables

-

-	
-	

-	
$input_css =  ''

-	
[line 46]

-  Saves the input CSS string




-
Tags:

-

-
-  
-    
-  
-
access:  private

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$output_css =  ''

-	
[line 53]

-  Saves the formatted CSS string




-
Tags:

-

-
-  
-    
-  
-
access:  public

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-	
-	

-	
$output_css_plain =  ''

-	
[line 60]

-  Saves the formatted CSS string (plain text)




-
Tags:

-

-
-  
-    
-  
-
access:  public

-

-
-  

-	

-  
-    
-      
-      
-    
-      
Type:  string

-	



-	
[ Top ]


-


-
-

-
-
Class Methods

-

-  

-	
-	
constructor csstidy_print [line 68]

-	

-    

-    

-		csstidy_print csstidy_print(
-array
-&$css)
-    

-    


-	
-		Constructor




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
array  $css  contains the class csstidy

-    


-        
[ Top ]

-  

-  

-	
-	
method formatted [line 108]

-	

-    

-    

-		string formatted(
-)
-    

-    


-	
-		Returns the formatted CSS code




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method get_diff [line 313]

-	

-    

-    

-		string get_diff(
-)
-    

-    


-	
-		Get difference between the old and new code in bytes and prints the code if necessary.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.1
access:  public

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method get_ratio [line 299]

-	

-    

-    

-		float get_ratio(
-)
-    

-    


-	
-		Get compression ratio




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.2
access:  public

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method plain [line 96]

-	

-    

-    

-		string plain(
-)
-    

-    


-	
-		Returns the CSS code as plain text




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method size [line 337]

-	

-    

-    

-		integer size(
-[string
-$loc = 'output'])
-    

-    


-	
-		Get the size of either input or output CSS in KB




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  public

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
string  $loc  default is "output"

-    


-        
[ Top ]

-  

-  

-	
-	
method _convert_raw_css [line 244]

-	

-    

-    

-		void _convert_raw_css(
-)
-    

-    


-	
-		Converts $this->css array to a raw array ($this->tokens)




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  private

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method _htmlsp [line 285]

-	

-    

-    

-		string _htmlsp(
-string
-$string, bool
-$plain)
-    

-    


-	
-		Same as htmlspecialchars, only that chars are not replaced if $plain !== true. This makes  print_code() cleaner.




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  private
see:  csstidy_print::_print()

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
string  $string  
bool  $plain  

-    


-        
[ Top ]

-  

-  

-	
-	
method _print [line 120]

-	

-    

-    

-		void _print(
-[bool
-$plain = false])
-    

-    


-	
-		Returns the formatted CSS Code and saves it into $this->output_css and $this->output_css_plain




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  2.0
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-        
bool  $plain  plain text or not

-    


-        
[ Top ]

-  

-  

-	
-	
method _reset [line 84]

-	

-    

-    

-		void _reset(
-)
-    

-    


-	
-		Resets output_css and output_css_plain (new css code)




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-
version:  1.0
access:  private

-

-


-
-
-        
[ Top ]

-  

-  

-	
-	
method _seeknocomment [line 225]

-	

-    

-    

-		mixed _seeknocomment(
-integer
-$key, integer
-$move)
-    

-    


-	
-		Gets the next token type which is $move away from $key, excluding comments




-
Tags:

-

-
-  
-    
-  
-  
-    
-  
-  
-    
-  
-
return:  a token type
version:  1.0
access:  private

-

-


-
-
-        
Parameters:

-    

-    
-          
-        
-        
-        
-      
-          
-        
-        
-        
-      
-        
integer  $key  current position
integer  $move  move this far

-    


-        
[ Top ]

-  

-


-
-
-        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:55:42 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/elementindex.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/elementindex.html
deleted file mode 100644
index a4720e04..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/elementindex.html
+++ /dev/null
@@ -1,386 +0,0 @@
-
-
-Element Index
-
-
-
-
-
-  
-    
-  
-  
-  
-    
-  
-  
-
csstidy

-  		  [ class tree: csstidy ]
-		  [ index: csstidy ]
-		  [ all elements ]
-    

-
-
-  
-    
-    
-  
-

-	

-			
Todo List

-	

-      Packages:

-              csstidy

-            


-                		
-      

-
-
-
Index of all elements

-	[ a ]
-	[ c ]
-	[ d ]
-	[ e ]
-	[ f ]
-	[ g ]
-	[ i ]
-	[ l ]
-	[ m ]
-	[ n ]
-	[ o ]
-	[  ]
-	[ s ]
-	[ t ]
-	[ v ]
-
-  

-	
-	

-		
a

-		

-							
$added

-				
in file class.csstidy.php, variable csstidy::$added
    =true if something has been added to the current selector

-							
$at

-				
in file class.csstidy.php, variable csstidy::$at
    Saves the current at rule (@media)

-							
AT_END

-				
in file data.inc.php, constant AT_END

-							
AT_START

-				
in file data.inc.php, constant AT_START

-					

-	

-	top

-  

-	
-	

-		
c

-		

-							
$charset

-				
in file class.csstidy.php, variable csstidy::$charset
    Saves the CSS charset (@charset)

-							
$css

-				
in file class.csstidy.php, variable csstidy::$css
    Saves the parsed CSS

-							
class.csstidy_optimise.php

-				
procedural page class.csstidy_optimise.php

-							
class.csstidy.php

-				
procedural page class.csstidy.php

-							
class.csstidy_print.php

-				
procedural page class.csstidy_print.php

-							
COMMENT

-				
in file data.inc.php, constant COMMENT

-							
compress_important

-				
in file class.csstidy_optimise.php, method csstidy_optimise::compress_important()
    Removes unnecessary whitespace in ! important

-							
compress_numbers

-				
in file class.csstidy_optimise.php, method csstidy_optimise::compress_numbers()
    Compresses numbers (ie. 1.0 becomes 1 or 1.100 becomes 1.1 )

-							
csstidy

-				
in file class.csstidy.php, method csstidy::csstidy()
    Loads standard template and sets default settings

-							
csstidy

-				
in file class.csstidy.php, class csstidy
    CSS Parser class

-							
csstidy_optimise

-				
in file class.csstidy_optimise.php, class csstidy_optimise
    CSS Optimising Class

-							
csstidy_optimise

-				
in file class.csstidy_optimise.php, method csstidy_optimise::csstidy_optimise()
    Constructor

-							
csstidy_print

-				
in file class.csstidy_print.php, method csstidy_print::csstidy_print()
    Constructor

-							
csstidy_print

-				
in file class.csstidy_print.php, class csstidy_print
    CSS Printing class

-							
css_add_property

-				
in file class.csstidy.php, method csstidy::css_add_property()
    Adds a property with value to the existing CSS code

-							
cut_color

-				
in file class.csstidy_optimise.php, method csstidy_optimise::cut_color()
    Color compression function. Converts all rgb() values to #-values and uses the short-form if possible. Also replaces 4 color names by #-values.

-					

-	

-	top

-  

-	
-	

-		
d

-		

-							
data.inc.php

-				
procedural page data.inc.php

-							
DEFAULT_AT

-				
in file data.inc.php, constant DEFAULT_AT

-							
dissolve_4value_shorthands

-				
in file class.csstidy_optimise.php, method csstidy_optimise::dissolve_4value_shorthands()
    Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;...

-							
dissolve_short_bg

-				
in file class.csstidy_optimise.php, method csstidy_optimise::dissolve_short_bg()
    Dissolve background property

-					

-	

-	top

-  

-	
-	

-		
e

-		

-							
escaped

-				
in file class.csstidy.php, method csstidy::escaped()
    Checks if a character is escaped (and returns true if it is)

-							
explode_selectors

-				
in file class.csstidy.php, method csstidy::explode_selectors()
    Explodes selectors

-							
explode_ws

-				
in file class.csstidy_optimise.php, method csstidy_optimise::explode_ws()
    Explodes a string as explode() does, however, not if $sep is escaped or within a string.

-					

-	

-	top

-  

-	
-	

-		
f

-		

-							
$from

-				
in file class.csstidy.php, variable csstidy::$from
    Status from which the parser switched to ic or instr

-							
formatted

-				
in file class.csstidy_print.php, method csstidy_print::formatted()
    Returns the formatted CSS code

-					

-	

-	top

-  

-	
-	

-		
g

-		

-							
$GLOBALS['csstidy']['all_properties']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['all_properties']
    All CSS Properties. Needed for csstidy::property_is_next()

-							
$GLOBALS['csstidy']['at_rules']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['at_rules']
    Available at-rules

-							
$GLOBALS['csstidy']['background_prop_default']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['background_prop_default']
    Default values for the background properties

-							
$GLOBALS['csstidy']['color_values']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['color_values']
    Properties that allow <color> as value

-							
$GLOBALS['csstidy']['number_values']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['number_values']
    Properties that allow <number> as value

-							
$GLOBALS['csstidy']['predefined_templates']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['predefined_templates']
    An array containing all predefined templates.

-							
$GLOBALS['csstidy']['replace_colors']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['replace_colors']
    A list of non-W3C color names which get replaced by their hex-codes

-							
$GLOBALS['csstidy']['shorthands']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['shorthands']
    A list of all shorthand properties that are devided into four properties and/or have four subvalues

-							
$GLOBALS['csstidy']['tokens']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['tokens']
    All CSS tokens used by csstidy

-							
$GLOBALS['csstidy']['units']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['units']
    All CSS units (CSS 3 units included)

-							
$GLOBALS['csstidy']['whitespace']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['whitespace']
    All whitespace allowed in CSS

-							
get_cfg

-				
in file class.csstidy.php, method csstidy::get_cfg()
    Get the value of a setting.

-							
get_diff

-				
in file class.csstidy_print.php, method csstidy_print::get_diff()
    Get difference between the old and new code in bytes and prints the code if necessary.

-							
get_ratio

-				
in file class.csstidy_print.php, method csstidy_print::get_ratio()
    Get compression ratio

-							
gvw_important

-				
in file class.csstidy.php, method csstidy::gvw_important()
    Returns a value without !important

-					

-	

-	top

-  

-	
-	

-		
i

-		

-							
$import

-				
in file class.csstidy.php, variable csstidy::$import
    Saves all @import URLs

-							
$input_css

-				
in file class.csstidy_print.php, variable csstidy_print::$input_css
    Saves the input CSS string

-							
$invalid_at

-				
in file class.csstidy.php, variable csstidy::$invalid_at
    =true if in invalid at-rule

-							
is_important

-				
in file class.csstidy.php, method csstidy::is_important()
    Checks if $value is !important.

-							
is_token

-				
in file class.csstidy.php, method csstidy::is_token()
    Checks if there is a token at the current position

-					

-	

-	top

-  

-	
-	

-		
l

-		

-							
$line

-				
in file class.csstidy.php, variable csstidy::$line
    Saves the line number

-							
$log

-				
in file class.csstidy.php, variable csstidy::$log
    Array which saves the message log

-							
load_template

-				
in file class.csstidy.php, method csstidy::load_template()
    Loads a new template

-							
log

-				
in file class.csstidy.php, method csstidy::log()
    Add a message to the message log

-					

-	

-	top

-  

-	
-	

-		
m

-		

-							
merge_4value_shorthands

-				
in file class.csstidy_optimise.php, method csstidy_optimise::merge_4value_shorthands()
    Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()

-							
merge_bg

-				
in file class.csstidy_optimise.php, method csstidy_optimise::merge_bg()
    Merges all background properties

-							
merge_css_blocks

-				
in file class.csstidy.php, method csstidy::merge_css_blocks()
    Adds CSS to an existing media/selector

-							
merge_selectors

-				
in file class.csstidy_optimise.php, method csstidy_optimise::merge_selectors()
    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.

-					

-	

-	top

-  

-	
-	

-		
n

-		

-							
$namespace

-				
in file class.csstidy.php, variable csstidy::$namespace
    Saves the namespace

-					

-	

-	top

-  

-	
-	

-		
o

-		

-							
$optimise

-				
in file class.csstidy.php, variable csstidy::$optimise
    Optimiser class

-							
$output_css

-				
in file class.csstidy_print.php, variable csstidy_print::$output_css
    Saves the formatted CSS string

-							
$output_css_plain

-				
in file class.csstidy_print.php, variable csstidy_print::$output_css_plain
    Saves the formatted CSS string (plain text)

-					

-	

-	top

-  

-	
-	

-		
p

-		

-							
$print

-				
in file class.csstidy.php, variable csstidy::$print
    Printer class

-							
$property

-				
in file class.csstidy.php, variable csstidy::$property
    Saves the current property

-							
parse

-				
in file class.csstidy.php, method csstidy::parse()
    Parses CSS in $string. The code is saved as array in $this->css

-							
parse_from_url

-				
in file class.csstidy.php, method csstidy::parse_from_url()
    Starts parsing from URL

-							
plain

-				
in file class.csstidy_print.php, method csstidy_print::plain()
    Returns the CSS code as plain text

-							
postparse

-				
in file class.csstidy_optimise.php, method csstidy_optimise::postparse()
    Optimises $css after parsing

-							
PROPERTY

-				
in file data.inc.php, constant PROPERTY

-							
property_is_next

-				
in file class.csstidy.php, method csstidy::property_is_next()
    Checks if the next word in a string from pos is a CSS property

-							
property_is_valid

-				
in file class.csstidy.php, method csstidy::property_is_valid()
    Checks if a property is valid

-					

-	

-	top

-  

-	
-	

-		
s

-		

-							
$selector

-				
in file class.csstidy.php, variable csstidy::$selector
    Saves the current selector

-							
$sel_separate

-				
in file class.csstidy.php, variable csstidy::$sel_separate
    Saves the position of , in selectors

-							
$settings

-				
in file class.csstidy.php, variable csstidy::$settings
    Stores the settings

-							
$status

-				
in file class.csstidy.php, variable csstidy::$status
    Saves the parser-status.

-							
$str_char

-				
in file class.csstidy.php, variable csstidy::$str_char
    Saves the char which opened the last string

-							
$str_in_str

-				
in file class.csstidy.php, variable csstidy::$str_in_str
    Variable needed to manage string-in-strings, for example url("foo.png")

-							
$sub_value

-				
in file class.csstidy.php, variable csstidy::$sub_value
    Saves the current sub-value

-							
$sub_value_arr

-				
in file class.csstidy.php, variable csstidy::$sub_value_arr
    Array which saves all subvalues for a property.

-							
SEL_END

-				
in file data.inc.php, constant SEL_END

-							
SEL_START

-				
in file data.inc.php, constant SEL_START

-							
set_cfg

-				
in file class.csstidy.php, method csstidy::set_cfg()
    Set the value of a setting.

-							
shorthand

-				
in file class.csstidy_optimise.php, method csstidy_optimise::shorthand()
    Compresses shorthand values. Example: margin:1px 1px 1px 1px -> margin:1px

-							
shorthands

-				
in file class.csstidy_optimise.php, method csstidy_optimise::shorthands()
    Optimises shorthands

-							
size

-				
in file class.csstidy_print.php, method csstidy_print::size()
    Get the size of either input or output CSS in KB

-							
subvalue

-				
in file class.csstidy_optimise.php, method csstidy_optimise::subvalue()
    Optimises a sub-value

-					

-	

-	top

-  

-	
-	

-		
t

-		

-							
$tokens

-				
in file class.csstidy.php, variable csstidy::$tokens
    Saves the parsed CSS (raw)

-					

-	

-	top

-  

-	
-	

-		
v

-		

-							
$value

-				
in file class.csstidy.php, variable csstidy::$value
    Saves the current value

-							
$version

-				
in file class.csstidy.php, variable csstidy::$version
    Contains the version of csstidy

-							
VALUE

-				
in file data.inc.php, constant VALUE

-							
value

-				
in file class.csstidy_optimise.php, method csstidy_optimise::value()
    Optimises values

-					

-	

-	top

-  

-	
-	

-		
_

-		

-							
_add_token

-				
in file class.csstidy.php, method csstidy::_add_token()
    Adds a token to $this->tokens

-							
_convert_raw_css

-				
in file class.csstidy_print.php, method csstidy_print::_convert_raw_css()
    Converts $this->css array to a raw array ($this->tokens)

-							
_htmlsp

-				
in file class.csstidy_print.php, method csstidy_print::_htmlsp()
    Same as htmlspecialchars, only that chars are not replaced if $plain !== true. This makes  print_code() cleaner.

-							
_print

-				
in file class.csstidy_print.php, method csstidy_print::_print()
    Returns the formatted CSS Code and saves it into $this->output_css and $this->output_css_plain

-							
_reset

-				
in file class.csstidy_print.php, method csstidy_print::_reset()
    Resets output_css and output_css_plain (new css code)

-							
_seeknocomment

-				
in file class.csstidy_print.php, method csstidy_print::_seeknocomment()
    Gets the next token type which is $move away from $key, excluding comments

-							
_unicode

-				
in file class.csstidy.php, method csstidy::_unicode()
    Parse unicode notations and find a replacement character

-					

-	

-	top

-        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:54:53 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/elementindex_csstidy.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/elementindex_csstidy.html
deleted file mode 100644
index 4afe24b2..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/elementindex_csstidy.html
+++ /dev/null
@@ -1,405 +0,0 @@
-
-
-Package csstidy Element Index
-
-
-
-
-
-  
-    
-  
-  
-  
-    
-  
-  
-
csstidy

-  		  [ class tree: csstidy ]
-		  [ index: csstidy ]
-		  [ all elements ]
-    

-
-
-  
-    
-    
-  
-

-	

-			
Todo List

-	

-      Packages:

-              csstidy

-            


-                        Files:

-      	  

-					class.csstidy.php
-		

-					class.csstidy_optimise.php
-		

-					class.csstidy_print.php
-		

-					data.inc.php
-		

-	  



-      
-            Classes:

-        

-		    		csstidy

-	    		csstidy_optimise

-	    		csstidy_print

-	  


-                		
-      

-
-
-
Element index for package csstidy

-	[ a ]
-	[ c ]
-	[ d ]
-	[ e ]
-	[ f ]
-	[ g ]
-	[ i ]
-	[ l ]
-	[ m ]
-	[ n ]
-	[ o ]
-	[ p ]
-	[ s ]
-	[ t ]
-	[ v ]
-	[ _ ]
-
-  

-	
-	

-		
_

-		

-							
_add_token

-				
in file class.csstidy.php, method csstidy::_add_token()
    Adds a token to $this->tokens

-							
_convert_raw_css

-				
in file class.csstidy_print.php, method csstidy_print::_convert_raw_css()
    Converts $this->css array to a raw array ($this->tokens)

-							
_htmlsp

-				
in file class.csstidy_print.php, method csstidy_print::_htmlsp()
    Same as htmlspecialchars, only that chars are not replaced if $plain !== true. This makes  print_code() cleaner.

-							
_print

-				
in file class.csstidy_print.php, method csstidy_print::_print()
    Returns the formatted CSS Code and saves it into $this->output_css and $this->output_css_plain

-							
_reset

-				
in file class.csstidy_print.php, method csstidy_print::_reset()
    Resets output_css and output_css_plain (new css code)

-							
_seeknocomment

-				
in file class.csstidy_print.php, method csstidy_print::_seeknocomment()
    Gets the next token type which is $move away from $key, excluding comments

-							
_unicode

-				
in file class.csstidy.php, method csstidy::_unicode()
    Parse unicode notations and find a replacement character

-					

-	

-	top

-  

-	
-	

-		
a

-		

-							
$added

-				
in file class.csstidy.php, variable csstidy::$added
    =true if something has been added to the current selector

-							
$at

-				
in file class.csstidy.php, variable csstidy::$at
    Saves the current at rule (@media)

-							
AT_END

-				
in file data.inc.php, constant AT_END

-							
AT_START

-				
in file data.inc.php, constant AT_START

-					

-	

-	top

-  

-	
-	

-		
c

-		

-							
$charset

-				
in file class.csstidy.php, variable csstidy::$charset
    Saves the CSS charset (@charset)

-							
$css

-				
in file class.csstidy.php, variable csstidy::$css
    Saves the parsed CSS

-							
class.csstidy_optimise.php

-				
procedural page class.csstidy_optimise.php

-							
class.csstidy.php

-				
procedural page class.csstidy.php

-							
class.csstidy_print.php

-				
procedural page class.csstidy_print.php

-							
COMMENT

-				
in file data.inc.php, constant COMMENT

-							
compress_important

-				
in file class.csstidy_optimise.php, method csstidy_optimise::compress_important()
    Removes unnecessary whitespace in ! important

-							
compress_numbers

-				
in file class.csstidy_optimise.php, method csstidy_optimise::compress_numbers()
    Compresses numbers (ie. 1.0 becomes 1 or 1.100 becomes 1.1 )

-							
csstidy

-				
in file class.csstidy.php, method csstidy::csstidy()
    Loads standard template and sets default settings

-							
csstidy

-				
in file class.csstidy.php, class csstidy
    CSS Parser class

-							
csstidy_optimise

-				
in file class.csstidy_optimise.php, class csstidy_optimise
    CSS Optimising Class

-							
csstidy_optimise

-				
in file class.csstidy_optimise.php, method csstidy_optimise::csstidy_optimise()
    Constructor

-							
csstidy_print

-				
in file class.csstidy_print.php, method csstidy_print::csstidy_print()
    Constructor

-							
csstidy_print

-				
in file class.csstidy_print.php, class csstidy_print
    CSS Printing class

-							
css_add_property

-				
in file class.csstidy.php, method csstidy::css_add_property()
    Adds a property with value to the existing CSS code

-							
cut_color

-				
in file class.csstidy_optimise.php, method csstidy_optimise::cut_color()
    Color compression function. Converts all rgb() values to #-values and uses the short-form if possible. Also replaces 4 color names by #-values.

-					

-	

-	top

-  

-	
-	

-		
d

-		

-							
data.inc.php

-				
procedural page data.inc.php

-							
DEFAULT_AT

-				
in file data.inc.php, constant DEFAULT_AT

-							
dissolve_4value_shorthands

-				
in file class.csstidy_optimise.php, method csstidy_optimise::dissolve_4value_shorthands()
    Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;...

-							
dissolve_short_bg

-				
in file class.csstidy_optimise.php, method csstidy_optimise::dissolve_short_bg()
    Dissolve background property

-					

-	

-	top

-  

-	
-	

-		
e

-		

-							
escaped

-				
in file class.csstidy.php, method csstidy::escaped()
    Checks if a character is escaped (and returns true if it is)

-							
explode_selectors

-				
in file class.csstidy.php, method csstidy::explode_selectors()
    Explodes selectors

-							
explode_ws

-				
in file class.csstidy_optimise.php, method csstidy_optimise::explode_ws()
    Explodes a string as explode() does, however, not if $sep is escaped or within a string.

-					

-	

-	top

-  

-	
-	

-		
f

-		

-							
$from

-				
in file class.csstidy.php, variable csstidy::$from
    Status from which the parser switched to ic or instr

-							
formatted

-				
in file class.csstidy_print.php, method csstidy_print::formatted()
    Returns the formatted CSS code

-					

-	

-	top

-  

-	
-	

-		
g

-		

-							
$GLOBALS['csstidy']['all_properties']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['all_properties']
    All CSS Properties. Needed for csstidy::property_is_next()

-							
$GLOBALS['csstidy']['at_rules']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['at_rules']
    Available at-rules

-							
$GLOBALS['csstidy']['background_prop_default']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['background_prop_default']
    Default values for the background properties

-							
$GLOBALS['csstidy']['color_values']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['color_values']
    Properties that allow <color> as value

-							
$GLOBALS['csstidy']['number_values']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['number_values']
    Properties that allow <number> as value

-							
$GLOBALS['csstidy']['predefined_templates']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['predefined_templates']
    An array containing all predefined templates.

-							
$GLOBALS['csstidy']['replace_colors']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['replace_colors']
    A list of non-W3C color names which get replaced by their hex-codes

-							
$GLOBALS['csstidy']['shorthands']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['shorthands']
    A list of all shorthand properties that are devided into four properties and/or have four subvalues

-							
$GLOBALS['csstidy']['tokens']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['tokens']
    All CSS tokens used by csstidy

-							
$GLOBALS['csstidy']['units']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['units']
    All CSS units (CSS 3 units included)

-							
$GLOBALS['csstidy']['whitespace']

-				
in file data.inc.php, global variable $GLOBALS['csstidy']['whitespace']
    All whitespace allowed in CSS

-							
get_cfg

-				
in file class.csstidy.php, method csstidy::get_cfg()
    Get the value of a setting.

-							
get_diff

-				
in file class.csstidy_print.php, method csstidy_print::get_diff()
    Get difference between the old and new code in bytes and prints the code if necessary.

-							
get_ratio

-				
in file class.csstidy_print.php, method csstidy_print::get_ratio()
    Get compression ratio

-							
gvw_important

-				
in file class.csstidy.php, method csstidy::gvw_important()
    Returns a value without !important

-					

-	

-	top

-  

-	
-	

-		
i

-		

-							
$import

-				
in file class.csstidy.php, variable csstidy::$import
    Saves all @import URLs

-							
$input_css

-				
in file class.csstidy_print.php, variable csstidy_print::$input_css
    Saves the input CSS string

-							
$invalid_at

-				
in file class.csstidy.php, variable csstidy::$invalid_at
    =true if in invalid at-rule

-							
is_important

-				
in file class.csstidy.php, method csstidy::is_important()
    Checks if $value is !important.

-							
is_token

-				
in file class.csstidy.php, method csstidy::is_token()
    Checks if there is a token at the current position

-					

-	

-	top

-  

-	
-	

-		
l

-		

-							
$line

-				
in file class.csstidy.php, variable csstidy::$line
    Saves the line number

-							
$log

-				
in file class.csstidy.php, variable csstidy::$log
    Array which saves the message log

-							
load_template

-				
in file class.csstidy.php, method csstidy::load_template()
    Loads a new template

-							
log

-				
in file class.csstidy.php, method csstidy::log()
    Add a message to the message log

-					

-	

-	top

-  

-	
-	

-		
m

-		

-							
merge_4value_shorthands

-				
in file class.csstidy_optimise.php, method csstidy_optimise::merge_4value_shorthands()
    Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()

-							
merge_bg

-				
in file class.csstidy_optimise.php, method csstidy_optimise::merge_bg()
    Merges all background properties

-							
merge_css_blocks

-				
in file class.csstidy.php, method csstidy::merge_css_blocks()
    Adds CSS to an existing media/selector

-							
merge_selectors

-				
in file class.csstidy_optimise.php, method csstidy_optimise::merge_selectors()
    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.

-					

-	

-	top

-  

-	
-	

-		
n

-		

-							
$namespace

-				
in file class.csstidy.php, variable csstidy::$namespace
    Saves the namespace

-					

-	

-	top

-  

-	
-	

-		
o

-		

-							
$optimise

-				
in file class.csstidy.php, variable csstidy::$optimise
    Optimiser class

-							
$output_css

-				
in file class.csstidy_print.php, variable csstidy_print::$output_css
    Saves the formatted CSS string

-							
$output_css_plain

-				
in file class.csstidy_print.php, variable csstidy_print::$output_css_plain
    Saves the formatted CSS string (plain text)

-					

-	

-	top

-  

-	
-	

-		
p

-		

-							
$print

-				
in file class.csstidy.php, variable csstidy::$print
    Printer class

-							
$property

-				
in file class.csstidy.php, variable csstidy::$property
    Saves the current property

-							
parse

-				
in file class.csstidy.php, method csstidy::parse()
    Parses CSS in $string. The code is saved as array in $this->css

-							
parse_from_url

-				
in file class.csstidy.php, method csstidy::parse_from_url()
    Starts parsing from URL

-							
plain

-				
in file class.csstidy_print.php, method csstidy_print::plain()
    Returns the CSS code as plain text

-							
postparse

-				
in file class.csstidy_optimise.php, method csstidy_optimise::postparse()
    Optimises $css after parsing

-							
PROPERTY

-				
in file data.inc.php, constant PROPERTY

-							
property_is_next

-				
in file class.csstidy.php, method csstidy::property_is_next()
    Checks if the next word in a string from pos is a CSS property

-							
property_is_valid

-				
in file class.csstidy.php, method csstidy::property_is_valid()
    Checks if a property is valid

-					

-	

-	top

-  

-	
-	

-		
s

-		

-							
$selector

-				
in file class.csstidy.php, variable csstidy::$selector
    Saves the current selector

-							
$sel_separate

-				
in file class.csstidy.php, variable csstidy::$sel_separate
    Saves the position of , in selectors

-							
$settings

-				
in file class.csstidy.php, variable csstidy::$settings
    Stores the settings

-							
$status

-				
in file class.csstidy.php, variable csstidy::$status
    Saves the parser-status.

-							
$str_char

-				
in file class.csstidy.php, variable csstidy::$str_char
    Saves the char which opened the last string

-							
$str_in_str

-				
in file class.csstidy.php, variable csstidy::$str_in_str
    Variable needed to manage string-in-strings, for example url("foo.png")

-							
$sub_value

-				
in file class.csstidy.php, variable csstidy::$sub_value
    Saves the current sub-value

-							
$sub_value_arr

-				
in file class.csstidy.php, variable csstidy::$sub_value_arr
    Array which saves all subvalues for a property.

-							
SEL_END

-				
in file data.inc.php, constant SEL_END

-							
SEL_START

-				
in file data.inc.php, constant SEL_START

-							
set_cfg

-				
in file class.csstidy.php, method csstidy::set_cfg()
    Set the value of a setting.

-							
shorthand

-				
in file class.csstidy_optimise.php, method csstidy_optimise::shorthand()
    Compresses shorthand values. Example: margin:1px 1px 1px 1px -> margin:1px

-							
shorthands

-				
in file class.csstidy_optimise.php, method csstidy_optimise::shorthands()
    Optimises shorthands

-							
size

-				
in file class.csstidy_print.php, method csstidy_print::size()
    Get the size of either input or output CSS in KB

-							
subvalue

-				
in file class.csstidy_optimise.php, method csstidy_optimise::subvalue()
    Optimises a sub-value

-					

-	

-	top

-  

-	
-	

-		
t

-		

-							
$tokens

-				
in file class.csstidy.php, variable csstidy::$tokens
    Saves the parsed CSS (raw)

-					

-	

-	top

-  

-	
-	

-		
v

-		

-							
$value

-				
in file class.csstidy.php, variable csstidy::$value
    Saves the current value

-							
$version

-				
in file class.csstidy.php, variable csstidy::$version
    Contains the version of csstidy

-							
VALUE

-				
in file data.inc.php, constant VALUE

-							
value

-				
in file class.csstidy_optimise.php, method csstidy_optimise::value()
    Optimises values

-					

-	

-	top

-        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:54:53 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/errors.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/errors.html
deleted file mode 100644
index 1e6fc99e..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/errors.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-phpDocumentor Parser Errors and Warnings
-
-
-
-
-
-  
-    
-  
-  
-  
-    
-  
-  
-
csstidy

-  		  [ class tree: csstidy ]
-		  [ index: csstidy ]
-		  [ all elements ]
-    

-
-
-  
-    
-    
-  
-

-	

-			
Todo List

-	

-      Packages:

-              csstidy

-            


-                		
-      

-
-Post-parsing

-
-
data.inc.php

-
Warnings:


-Warning on line 25 - Page-level DocBlock precedes "define AT_START", use another DocBlock to document the source element

-        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:56:01 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/index.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/index.html
deleted file mode 100644
index c355d441..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-CSSTidy Documentation
-
-
-
-
-
-  
-    
-  
-  
-  
-    
-  
-  
-
csstidy

-  		  [ class tree: csstidy ]
-		  [ index: csstidy ]
-		  [ all elements ]
-    

-
-
-  
-    
-    
-  
-

-	

-			
Todo List

-	

-      Packages:

-              csstidy

-            


-                        Files:

-      	  

-					class.csstidy.php
-		

-					class.csstidy_optimise.php
-		

-					class.csstidy_print.php
-		

-					data.inc.php
-		

-	  



-      
-            Classes:

-        

-		    		csstidy

-	    		csstidy_optimise

-	    		csstidy_print

-	  


-                		
-      

-
-
CSSTidy Documentation

-Welcome to csstidy!

-

-This documentation was generated by phpDocumentor v1.3.0RC3

-
        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:54:54 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/li_csstidy.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/li_csstidy.html
deleted file mode 100644
index 76fbaf7b..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/li_csstidy.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-CSSTidy Documentation
-
-
-
-
-
-  
-    
-  
-  
-  
-    
-  
-  
-
csstidy

-  		  [ class tree: csstidy ]
-		  [ index: csstidy ]
-		  [ all elements ]
-    

-
-
-  
-    
-    
-  
-

-	

-			
Todo List

-	

-      Packages:

-              csstidy

-            


-                        Files:

-      	  

-					class.csstidy.php
-		

-					class.csstidy_optimise.php
-		

-					class.csstidy_print.php
-		

-					data.inc.php
-		

-	  



-      
-            Classes:

-        

-		    		csstidy

-	    		csstidy_optimise

-	    		csstidy_print

-	  


-                		
-      

-
-
CSSTidy Documentation

-Welcome to csstidy!

-

-This documentation was generated by phpDocumentor v1.3.0RC3

-
        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:54:53 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/media/background.png b/www/plugins-dist/compresseur/lib/csstidy/Docs/media/background.png
deleted file mode 100644
index d6f36f6068d30005864e49d371606d39dbac3be6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^CxKXmgBeH)?09($NNJb2MwB=gr6!hS=I1GdWag$a
zl;L41_usi$G7`mY9E|l(K3^3(}Yz5wYCnP1)Tp+R!$e1@pO+j=b55=
cOIuv|iyatv1txKu0`)U^y85}Sb4q9e01EU+A^-pY

diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/media/empty.png b/www/plugins-dist/compresseur/lib/csstidy/Docs/media/empty.png
deleted file mode 100644
index a9f29bb161a7b1efd9cc85043bc235e1a5060780..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx3?wy9o9qTs+9j?LCC){ui6xo&c?uz!xv320
z`3gqn3VHcu3PuJ7Mhb>zR)*$Q#>NWT28IR({)IOifZEtgJbhi+FL6ur3u;#0rMq>1fPyUPj=qiz3>*8o|0J>k`OE=6A+G=b|6hJY`UH^6SQ6wH
o%;50sMjDXA<>}%WQgJIe0mx=zV0@~64`c#^r>mdKI;Vst04^Iepa1{>

diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/media/style.css b/www/plugins-dist/compresseur/lib/csstidy/Docs/media/style.css
deleted file mode 100644
index 9419ca62..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/media/style.css
+++ /dev/null
@@ -1,197 +0,0 @@
-.php {
-	padding: 1em;
-}
-/* This will not be executed by IE, so now we have a fix! */
-*[class="php-src"], *[class="php"], *[class="listing"] {
-	line-height:    0px;
-}
-
-body
-{
-  color:              #000000;
-  background-color:   #ffffff;
-  background-image:   url("background.png");
-  background-repeat:  repeat-y;
-  font-family:        tahoma, verdana, arial, sans-serif;
-  font-size:          10pt;
-  margin:             0;
-  padding:            0;
-}
-
-a
-{
-  color:              #000099;
-  background-color:   transparent;
-  text-decoration:    none;
-}
-
-a:hover
-{
-  text-decoration:    underline;
-}
-
-a.menu
-{
-  color:              #ffffff;
-  background-color:   transparent;
-}
-
-td
-{
-  font-size:          10pt;
-}
-
-td.header_top
-{
-  color:              #ffffff;
-  background-color:   #9999cc;
-  font-size:          16pt;
-  font-weight:        bold;
-  text-align:         right;
-  padding:            10px;
-}
-
-td.header_line
-{
-  color:              #ffffff;
-  background-color:   #333366;
-}
-
-td.header_menu
-{
-  color:              #ffffff;
-  background-color:   #666699;
-  font-size:          8pt;
-  text-align:         right;
-  padding:            2px;
-  padding-right:      5px;
-}
-
-td.menu
-{
-  padding:            2px;
-  padding-left:       5px;
-}
-
-td.code_border
-{
-  color:              #000000;
-  background-color:   #c0c0c0;
-}
-
-td.code
-{
-  color:              #000000;
-  background-color:   #f0f0f0;
-}
-
-td.type
-{
-  font-style:         italic;
-}
-
-div.credit
-{
-  font-size:          8pt;
-  text-align:         center;
-}
-
-div.package
-{
-  padding-left:       5px;
-}
-
-div.tags
-{
-  padding-left:       15px;
-}
-
-div.function
-{
-  padding-left:       15px;
-}
-
-div.top
-{
-  font-size:          8pt;
-}
-
-div.warning
-{
-  color:              #ff0000;
-  background-color:   transparent;
-}
-
-div.description
-{
-  padding-left:       15px;
-}
-
-hr
-{
-  height:             1px;
-  border-style:       solid;
-  border-color:       #c0c0c0;
-  margin-top:         10px;
-  margin-bottom:      10px;
-}
-
-span.smalllinenumber
-{
-  font-size:          8pt;
-}
-
-ul {
-	margin-left:		0px;
-	padding-left:		8px;
-}
-/* Syntax highlighting */
-
-.src-code { background-color: #f5f5f5; border: 1px solid #ccc9a4; padding: 0px; margin : 0px}
-/*.src-code pre {	}*/
-
-.src-comm { color: green; }
-.src-id {  }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors {  }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box {  }
-.ref-title {  }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis {  }
-.title { font-weight: bold; margin: 1em 0em 0em 0em; padding: .25em; border: 2px solid #999999; background-color: #9999CC  }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
diff --git a/www/plugins-dist/compresseur/lib/csstidy/Docs/todolist.html b/www/plugins-dist/compresseur/lib/csstidy/Docs/todolist.html
deleted file mode 100644
index 2c02a787..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/Docs/todolist.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-Todo List
-
-
-
-
-
-  
-    
-  
-  
-  
-    
-  
-  
-
csstidy

-  		  [ class tree: csstidy ]
-		  [ index: csstidy ]
-		  [ all elements ]
-    

-
-
-  
-    
-    
-  
-

-	

-			
Todo List

-	

-      Packages:

-              csstidy

-            


-                  
-                		
-      

-
-
Todo List

-
csstidy

-
$GLOBALS['csstidy']['all_properties']

-
    
-    
  • Add CSS3 properties
    • 
-

-
$GLOBALS['csstidy']['background_prop_default']

-
    
-    
  • Possibly property names will change during CSS3 development
    • 
-

-
$GLOBALS['csstidy']['color_values']

-
    
-    
  • CSS3 properties
    • 
-

-
$GLOBALS['csstidy']['number_values']

-
    
-    
  • CSS3 properties
    • 
-

-
$GLOBALS['csstidy']['shorthands']

-
    
-    
  • Are there new ones in CSS3?
    • 
-

-
csstidy_optimise::dissolve_short_bg()

-
    
-    
  • full CSS 3 compliance
    • 
-

-
csstidy_optimise::merge_bg()

-
    
-    
  • full CSS 3 compliance
    • 
-

-        

-		    

-		    Documentation generated on Mon, 15 May 2006 22:56:01 +0200 by phpDocumentor 1.3.0RC3
-	      

-      

-    

-
-
-
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/README b/www/plugins-dist/compresseur/lib/csstidy/README
index 17cf0f7d..9c904999 100644
--- a/www/plugins-dist/compresseur/lib/csstidy/README
+++ b/www/plugins-dist/compresseur/lib/csstidy/README
@@ -2,13 +2,17 @@ CSSTidy
 ---
 
 CSSTidy is a CSS minifier 
-Since the original project (http://csstidy.sourceforge.net/index.php) has been suspended
-here is the import of https://csstidy.svn.sourceforge.net/svnroot/csstidy on 2010-11-14
+
+v1.5.2
+  is PHP 5.4+ compliant, removes use of GLOBALS, fixes some bugs, integrates CSS3 units
+  and now available on https://packagist.org/packages/cerdic/css-tidy
 
 v1.4 is the new version coming from master branch (corresponds to the initial trunk of svn repository) after beeing stabilized
 
 v1.3 branch corresponds to the last stable relase published by the author.
 It integrates some bugfixes and a 1.3.1 version has been taged
+Since the original project (http://csstidy.sourceforge.net/index.php) has been suspended
+here is the import of https://csstidy.svn.sourceforge.net/svnroot/csstidy on 2010-11-14
 
 Only PHP version is here maintained
 
diff --git a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy.php b/www/plugins-dist/compresseur/lib/csstidy/class.csstidy.php
index 8cfd7e6a..29b84790 100644
--- a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy.php
+++ b/www/plugins-dist/compresseur/lib/csstidy/class.csstidy.php
@@ -29,20 +29,41 @@
  * @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 ctype functions if required
- *
+ * @todo make them methods of csstidy class
  * @version 1.0
  */
-require_once('class.csstidy_ctype.php');
+if (!function_exists('ctype_space')) {
+	/* ctype_space  Check for whitespace character(s) */
+	function ctype_space($text) {
+		return!preg_match("/[^\s\r\n\t\f]/", $text);
+	}
+
+}
+if (!function_exists('ctype_alpha')) {
+	/* ctype_alpha  Check for alphabetic character(s) */
+	function ctype_alpha($text) {
+		return preg_match("/[a-zA-Z]/", $text);
+	}
+
+}
 
 /**
- * Various CSS data needed for correct optimisations etc.
- *
- * @version 1.3
+ * Defines constants
+ * @todo //TODO: make them class constants of csstidy
  */
-require('data.inc.php');
+define('AT_START',    1);
+define('AT_END',      2);
+define('SEL_START',   3);
+define('SEL_END',     4);
+define('PROPERTY',    5);
+define('VALUE',       6);
+define('COMMENT',     7);
+define('DEFAULT_AT', 41);
 
 /**
  * Contains a class for printing CSS code
@@ -61,7 +82,6 @@ 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.
@@ -69,7 +89,7 @@ require('class.csstidy_optimise.php');
  * 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.4.0
+ * @version 1.5.2
  */
 class csstidy {
 
@@ -78,57 +98,57 @@ class csstidy {
 	 * @var array
 	 * @access public
 	 */
-	var $css = array();
+	public $css = array();
 	/**
 	 * Saves the parsed CSS (raw)
 	 * @var array
 	 * @access private
 	 */
-	var $tokens = array();
+	public $tokens = array();
 	/**
 	 * Printer class
 	 * @see csstidy_print
 	 * @var object
 	 * @access public
 	 */
-	var $print;
+	public $print;
 	/**
 	 * Optimiser class
 	 * @see csstidy_optimise
 	 * @var object
 	 * @access private
 	 */
-	var $optimise;
+	public $optimise;
 	/**
 	 * Saves the CSS charset (@charset)
 	 * @var string
 	 * @access private
 	 */
-	var $charset = '';
+	public $charset = '';
 	/**
 	 * Saves all @import URLs
 	 * @var array
 	 * @access private
 	 */
-	var $import = array();
+	public $import = array();
 	/**
 	 * Saves the namespace
 	 * @var string
 	 * @access private
 	 */
-	var $namespace = '';
+	public $namespace = '';
 	/**
 	 * Contains the version of csstidy
 	 * @var string
 	 * @access private
 	 */
-	var $version = '1.3';
+	public $version = '1.5.2';
 	/**
 	 * Stores the settings
 	 * @var array
 	 * @access private
 	 */
-	var $settings = array();
+	public $settings = array();
 	/**
 	 * Saves the parser-status.
 	 *
@@ -143,44 +163,44 @@ class csstidy {
 	 * @var string
 	 * @access private
 	 */
-	var $status = 'is';
+	public $status = 'is';
 	/**
 	 * Saves the current at rule (@media)
 	 * @var string
 	 * @access private
 	 */
-	var $at = '';
+	public $at = '';
 	/**
 	 * Saves the at rule for next selector (during @font-face or other @)
 	 * @var string
 	 * @access private
 	 */
-	var $next_selector_at = '';
+	public $next_selector_at = '';
 
 	/**
 	 * Saves the current selector
 	 * @var string
 	 * @access private
 	 */
-	var $selector = '';
+	public $selector = '';
 	/**
 	 * Saves the current property
 	 * @var string
 	 * @access private
 	 */
-	var $property = '';
+	public $property = '';
 	/**
 	 * Saves the position of , in selectors
 	 * @var array
 	 * @access private
 	 */
-	var $sel_separate = array();
+	public $sel_separate = array();
 	/**
 	 * Saves the current value
 	 * @var string
 	 * @access private
 	 */
-	var $value = '';
+	public $value = '';
 	/**
 	 * Saves the current sub-value
 	 *
@@ -191,78 +211,89 @@ class csstidy {
 	 * @var string
 	 * @access private
 	 */
-	var $sub_value = '';
+	public $sub_value = '';
 	/**
 	 * Array which saves all subvalues for a property.
 	 * @var array
 	 * @see sub_value
 	 * @access private
 	 */
-	var $sub_value_arr = array();
+	public $sub_value_arr = array();
 	/**
 	 * Saves the stack of characters that opened the current strings
 	 * @var array
 	 * @access private
 	 */
-	var $str_char = array();
-	var $cur_string = array();
+	public $str_char = array();
+	public $cur_string = array();
 	/**
 	 * Status from which the parser switched to ic or instr
 	 * @var array
 	 * @access private
 	 */
-	var $from = array();
+	public $from = array();
 	/**
 	/**
 	 * =true if in invalid at-rule
 	 * @var bool
 	 * @access private
 	 */
-	var $invalid_at = false;
+	public $invalid_at = false;
 	/**
 	 * =true if something has been added to the current selector
 	 * @var bool
 	 * @access private
 	 */
-	var $added = false;
+	public $added = false;
 	/**
 	 * Array which saves the message log
 	 * @var array
 	 * @access private
 	 */
-	var $log = array();
+	public $log = array();
 	/**
 	 * Saves the line number
 	 * @var integer
 	 * @access private
 	 */
-	var $line = 1;
+	public $line = 1;
 	/**
 	 * Marks if we need to leave quotes for a string
 	 * @var array
 	 * @access private
 	 */
-	var $quoted_string = array();
+	public $quoted_string = array();
 
 	/**
 	 * List of tokens
 	 * @var string
 	 */
-	var $tokens_list = "";
+	public $tokens_list = "";
+
+	/**
+	 * Various CSS Data for CSSTidy
+	 * @var array
+	 */
+	public $data = array();
+
 	/**
 	 * Loads standard template and sets default settings
 	 * @access private
 	 * @version 1.3
 	 */
-	function csstidy() {
+	public function __construct() {
+		$data = array();
+		include('data.inc.php');
+		$this->data = $data;
+
 		$this->settings['remove_bslash'] = true;
 		$this->settings['compress_colors'] = true;
 		$this->settings['compress_font-weight'] = true;
 		$this->settings['lowercase_s'] = false;
 		/*
-		  1 common shorthands optimization
-		  2 + font property optimization
-		  3 + background property optimization
+			1 common shorthands optimization
+			2 + font property optimization
+			3 + background property optimization
 		 */
 		$this->settings['optimise_shorthands'] = 1;
 		$this->settings['remove_last_;'] = true;
@@ -273,9 +304,9 @@ class csstidy {
 		 */
 		$this->settings['sort_properties'] = false;
 		/*
-		  1, 3, 5, etc -- enable sorting selectors inside @media: a{}b{}c{}
-		  2, 5, 8, etc -- enable sorting selectors inside one CSS declaration: a,b,c{}
-		  preserve order by default cause it can break functionnality
+			1, 3, 5, etc -- enable sorting selectors inside @media: a{}b{}c{}
+			2, 5, 8, etc -- enable sorting selectors inside one CSS declaration: a,b,c{}
+			preserve order by default cause it can break functionnality
 		 */
 		$this->settings['sort_selectors'] = 0;
 		/* is dangeroues to be used: CSS is broken sometimes */
@@ -290,7 +321,7 @@ class csstidy {
 		$this->set_cfg('template','default'); // call load_template
 		$this->optimise = new csstidy_optimise($this);
 
-		$this->tokens_list = & $GLOBALS['csstidy']['tokens'];
+		$this->tokens_list = & $this->data['csstidy']['tokens'];
 	}
 
 	/**
@@ -300,7 +331,7 @@ class csstidy {
 	 * @return mixed
 	 * @version 1.0
 	 */
-	function get_cfg($setting) {
+	public function get_cfg($setting) {
 		if (isset($this->settings[$setting])) {
 			return $this->settings[$setting];
 		}
@@ -313,7 +344,7 @@ class csstidy {
 	 * @access private
 	 * @version 1.4
 	 */
-	function _load_template($template) {
+	public function _load_template($template) {
 		switch ($template) {
 			case 'default':
 				$this->load_template('default');
@@ -345,7 +376,7 @@ class csstidy {
 	 * @return bool
 	 * @version 1.0
 	 */
-	function set_cfg($setting, $value=null) {
+	public function set_cfg($setting, $value=null) {
 		if (is_array($setting) && $value === null) {
 			foreach ($setting as $setprop => $setval) {
 				$this->settings[$setprop] = $setval;
@@ -354,7 +385,7 @@ class csstidy {
 				$this->_load_template($this->settings['template']);
 			}
 			return true;
-		} else if (isset($this->settings[$setting]) && $value !== '') {
+		} elseif (isset($this->settings[$setting]) && $value !== '') {
 			$this->settings[$setting] = $value;
 			if ($setting === 'template') {
 				$this->_load_template($this->settings['template']);
@@ -372,7 +403,7 @@ class csstidy {
 	 * @access private
 	 * @version 1.0
 	 */
-	function _add_token($type, $data, $do = false) {
+	public function _add_token($type, $data, $do = false) {
 		if ($this->get_cfg('preserve_css') || $do) {
 			$this->tokens[] = array($type, ($type == COMMENT) ? $data : trim($data));
 		}
@@ -386,7 +417,7 @@ class csstidy {
 	 * @access private
 	 * @version 1.0
 	 */
-	function log($message, $type, $line = -1) {
+	public function log($message, $type, $line = -1) {
 		if ($line === -1) {
 			$line = $this->line;
 		}
@@ -405,7 +436,7 @@ class csstidy {
 	 * @return string
 	 * @version 1.2
 	 */
-	function _unicode(&$string, &$i) {
+	public function _unicode(&$string, &$i) {
 		++$i;
 		$add = '';
 		$replaced = false;
@@ -452,7 +483,7 @@ class csstidy {
 	 * @access public
 	 * @version 1.4
 	 */
-	function write_page($filename, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
+	public function write_page($filename, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
 		$this->write($filename, true);
 	}
 
@@ -468,7 +499,7 @@ class csstidy {
 	 * @access public
 	 * @version 1.4
 	 */
-	function write($filename, $formatted=false, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en', $pre_code=true) {
+	public function write($filename, $formatted=false, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en', $pre_code=true) {
 		$filename .= ( $formatted) ? '.xhtml' : '.css';
 
 		if (!is_dir('temp')) {
@@ -497,8 +528,8 @@ class csstidy {
 	 * @version 1.1
 	 * @see http://csstidy.sourceforge.net/templates.php
 	 */
-	function load_template($content, $from_file=true) {
-		$predefined_templates = & $GLOBALS['csstidy']['predefined_templates'];
+	public function load_template($content, $from_file=true) {
+		$predefined_templates = & $this->data['csstidy']['predefined_templates'];
 		if ($content === 'high_compression' || $content === 'default' || $content === 'highest_compression' || $content === 'low_compression') {
 			$this->template = $predefined_templates[$content];
 			return;
@@ -522,7 +553,7 @@ class csstidy {
 	 * @access public
 	 * @version 1.0
 	 */
-	function parse_from_url($url) {
+	public function parse_from_url($url) {
 		return $this->parse(@file_get_contents($url));
 	}
 
@@ -533,8 +564,8 @@ class csstidy {
 	 * @access public
 	 * @version 1.11
 	 */
-	function is_token(&$string, $i) {
-		return (strpos($this->tokens_list, $string{$i}) !== false && !csstidy::escaped($string, $i));
+	public function is_token(&$string, $i) {
+		return (strpos($this->tokens_list, $string{$i}) !== false && !$this->escaped($string, $i));
 	}
 
 	/**
@@ -544,7 +575,7 @@ class csstidy {
 	 * @return bool
 	 * @version 1.1
 	 */
-	function parse($string) {
+	public function parse($string) {
 		// Temporarily set locale to en_US in order to handle floats properly
 		$old = @setlocale(LC_ALL, 0);
 		@setlocale(LC_ALL, 'C');
@@ -553,9 +584,9 @@ class csstidy {
 		$this->print = new csstidy_print($this);
 		$this->optimise = new csstidy_optimise($this);
 
-		$all_properties = & $GLOBALS['csstidy']['all_properties'];
-		$at_rules = & $GLOBALS['csstidy']['at_rules'];
-		$quoted_string_properties = & $GLOBALS['csstidy']['quoted_string_properties'];
+		$all_properties = & $this->data['csstidy']['all_properties'];
+		$at_rules = & $this->data['csstidy']['at_rules'];
+		$quoted_string_properties = & $this->data['csstidy']['quoted_string_properties'];
 
 		$this->css = array();
 		$this->print->input_css = $string;
@@ -570,7 +601,7 @@ class csstidy {
 			switch ($this->status) {
 				/* Case in at-block */
 				case 'at':
-					if (csstidy::is_token($string, $i)) {
+					if ($this->is_token($string, $i)) {
 						if ($string{$i} === '/' && @$string{$i + 1} === '*') {
 							$this->status = 'ic';
 							++$i;
@@ -590,7 +621,7 @@ class csstidy {
 						}
 					} else {
 						$lastpos = strlen($this->at) - 1;
-						if (!( (ctype_space($this->at{$lastpos}) || csstidy::is_token($this->at, $lastpos) && $this->at{$lastpos} === ',') && ctype_space($string{$i}))) {
+						if (!( (ctype_space($this->at{$lastpos}) || $this->is_token($this->at, $lastpos) && $this->at{$lastpos} === ',') && ctype_space($string{$i}))) {
 							$this->at .= $string{$i};
 						}
 					}
@@ -598,7 +629,7 @@ class csstidy {
 
 				/* Case in-selector */
 				case 'is':
-					if (csstidy::is_token($string, $i)) {
+					if ($this->is_token($string, $i)) {
 						if ($string{$i} === '/' && @$string{$i + 1} === '*' && trim($this->selector) == '') {
 							$this->status = 'ic';
 							++$i;
@@ -609,10 +640,10 @@ class csstidy {
 							foreach ($at_rules as $name => $type) {
 								if (!strcasecmp(substr($string, $i + 1, strlen($name)), $name)) {
 									($type === 'at') ? $this->at = '@' . $name : $this->selector = '@' . $name;
-									if ($type === "atis"){
+									if ($type === 'atis') {
 										$this->next_selector_at = ($this->next_selector_at?$this->next_selector_at:($this->at?$this->at:DEFAULT_AT));
 										$this->at = $this->css_new_media_section(' ');
-										$type = "is";
+										$type = 'is';
 									}
 									$this->status = $type;
 									$i += strlen($name);
@@ -637,17 +668,17 @@ class csstidy {
 							$this->str_char[] = $string{$i};
 							$this->from[] = 'is';
 							/* fixing CSS3 attribute selectors, i.e. a[href$=".mp3" */
-							$this->quoted_string[] = ($string{$i - 1} == '=' );
+							$this->quoted_string[] = ($string{$i - 1} === '=' );
 						} elseif ($this->invalid_at && $string{$i} === ';') {
 							$this->invalid_at = false;
 							$this->status = 'is';
-							if($this->next_selector_at){
+							if ($this->next_selector_at) {
 								$this->at = $this->css_new_media_section($this->next_selector_at);
 								$this->next_selector_at = '';
 							}
 						} elseif ($string{$i} === '{') {
 							$this->status = 'ip';
-							if($this->at == '') {
+							if ($this->at == '') {
 								$this->at = $this->css_new_media_section(DEFAULT_AT);
 							}
 							$this->selector = $this->css_new_selector($this->at,$this->selector);
@@ -670,7 +701,7 @@ class csstidy {
 						}
 					} else {
 						$lastpos = strlen($this->selector) - 1;
-						if ($lastpos == -1 || !( (ctype_space($this->selector{$lastpos}) || csstidy::is_token($this->selector, $lastpos) && $this->selector{$lastpos} === ',') && ctype_space($string{$i}))) {
+						if ($lastpos == -1 || !( (ctype_space($this->selector{$lastpos}) || $this->is_token($this->selector, $lastpos) && $this->selector{$lastpos} === ',') && ctype_space($string{$i}))) {
 							$this->selector .= $string{$i};
 						}
 					}
@@ -678,10 +709,10 @@ class csstidy {
 
 				/* Case in-property */
 				case 'ip':
-					if (csstidy::is_token($string, $i)) {
+					if ($this->is_token($string, $i)) {
 						if (($string{$i} === ':' || $string{$i} === '=') && $this->property != '') {
 							$this->status = 'iv';
-							if (!$this->get_cfg('discard_invalid_properties') || csstidy::property_is_valid($this->property)) {
+							if (!$this->get_cfg('discard_invalid_properties') || $this->property_is_valid($this->property)) {
 								$this->property = $this->css_new_property($this->at,$this->selector,$this->property);
 								$this->_add_token(PROPERTY, $this->property);
 							}
@@ -696,7 +727,7 @@ class csstidy {
 							$this->_add_token(SEL_END, $this->selector);
 							$this->selector = '';
 							$this->property = '';
-							if($this->next_selector_at){
+							if ($this->next_selector_at) {
 								$this->at = $this->css_new_media_section($this->next_selector_at);
 								$this->next_selector_at = '';
 							}
@@ -707,12 +738,11 @@ class csstidy {
 						}
 						// else this is dumb IE a hack, keep it
 						// including //
-						elseif (($this->property=='' AND !ctype_space($string{$i}))
-						  OR ($this->property=='/' OR $string{$i}=="/")) {
+						elseif (($this->property === '' && !ctype_space($string{$i}))
+							|| ($this->property === '/' || $string{$i} === '/')) {
 							$this->property .= $string{$i};
 						}
-					}
-					elseif (!ctype_space($string{$i})) {
+					} elseif (!ctype_space($string{$i})) {
 						$this->property .= $string{$i};
 					}
 					break;
@@ -720,7 +750,7 @@ class csstidy {
 				/* Case in-value */
 				case 'iv':
 					$pn = (($string{$i} === "\n" || $string{$i} === "\r") && $this->property_is_next($string, $i + 1) || $i == strlen($string) - 1);
-					if (csstidy::is_token($string, $i) || $pn) {
+					if ($this->is_token($string, $i) || $pn) {
 						if ($string{$i} === '/' && @$string{$i + 1} === '*') {
 							$this->status = 'ic';
 							++$i;
@@ -762,7 +792,7 @@ class csstidy {
 							$this->sub_value .= $string{$i};
 						}
 						if (($string{$i} === '}' || $string{$i} === ';' || $pn) && !empty($this->selector)) {
-							if($this->at == ''){
+							if ($this->at == '') {
 								$this->at = $this->css_new_media_section(DEFAULT_AT);
 							}
 
@@ -779,19 +809,19 @@ class csstidy {
 							}
 
 							$this->value = '';
-							while(count($this->sub_value_arr)){
+							while (count($this->sub_value_arr)) {
 								$sub = array_shift($this->sub_value_arr);
-								if (strstr($this->selector, "font-face")){
+								if (strstr($this->selector, 'font-face')) {
 									$sub = $this->quote_font_format($sub);
 								}
 
 								if ($sub != '')
-									$this->value .= ((!strlen($this->value) OR substr($this->value,-1,1)==',')?'':' ').$sub;
+									$this->value .= ((!strlen($this->value) || substr($this->value,-1,1) === ',')?'':' ').$sub;
 							}
 
 							$this->optimise->value();
 
-							$valid = csstidy::property_is_valid($this->property);
+							$valid = $this->property_is_valid($this->property);
 							if ((!$this->invalid_at || $this->get_cfg('preserve_css')) && (!$this->get_cfg('discard_invalid_properties') || $valid)) {
 								$this->css_add_property($this->at, $this->selector, $this->property, $this->value);
 								$this->_add_token(VALUE, $this->value);
@@ -815,7 +845,7 @@ class csstidy {
 							$this->status = 'is';
 							$this->invalid_at = false;
 							$this->selector = '';
-							if($this->next_selector_at){
+							if ($this->next_selector_at) {
 								$this->at = $this->css_new_media_section($this->next_selector_at);
 								$this->next_selector_at = '';
 							}
@@ -840,27 +870,27 @@ class csstidy {
 					$_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 
+					// Add another string to the stack. Strings can't be nested inside of quotes, only parentheses, but
 					// parentheticals can be nested more than once.
-					if ($_str_char === ")" && ($string{$i} === "(" || $string{$i} === '"' || $string{$i} === '\'') && !csstidy::escaped($string, $i)) {
+					if ($_str_char === ")" && ($string{$i} === "(" || $string{$i} === '"' || $string{$i} === '\'') && !$this->escaped($string, $i)) {
 						$this->cur_string[] = $string{$i};
-						$this->str_char[] = $string{$i} == "(" ? ")" : $string{$i};
+						$this->str_char[] = $string{$i} === '(' ? ')' : $string{$i};
 						$this->from[] = 'instr';
-						$this->quoted_string[] = ($_str_char === ")" AND $string{$i} !== "(" AND trim($_cur_string)=="(")?$_quoted_string:!($string{$i} === "(");
+						$this->quoted_string[] = ($_str_char === ')' && $string{$i} !== '(' && trim($_cur_string)==='(')?$_quoted_string:!($string{$i} === '(');
 						continue;
 					}
 
-					if ($_str_char !== ")" && ($string{$i} === "\n" || $string{$i} === "\r") && !($string{$i - 1} === '\\' && !csstidy::escaped($string, $i - 1))) {
+					if ($_str_char !== ")" && ($string{$i} === "\n" || $string{$i} === "\r") && !($string{$i - 1} === '\\' && !$this->escaped($string, $i - 1))) {
 						$temp_add = "\\A";
 						$this->log('Fixed incorrect newline in string', 'Warning');
 					}
 
 					$_cur_string .= $temp_add;
 
-					if ($string{$i} === $_str_char && !csstidy::escaped($string, $i)) {
+					if ($string{$i} === $_str_char && !$this->escaped($string, $i)) {
 						$this->status = array_pop($this->from);
 
-						if (!preg_match('|[' . implode('', $GLOBALS['csstidy']['whitespace']) . ']|uis', $_cur_string) && $this->property !== 'content') {
+						if (!preg_match('|[' . implode('', $this->data['csstidy']['whitespace']) . ']|uis', $_cur_string) && $this->property !== 'content') {
 							if (!$_quoted_string) {
 								if ($_str_char !== ')') {
 									// Convert properties like
@@ -882,18 +912,18 @@ class csstidy {
 						array_pop($this->quoted_string);
 						array_pop($this->str_char);
 
-						if ($_str_char === ")") {
-							$_cur_string = "(" . trim(substr($_cur_string, 1, -1)) . ")";
+						if ($_str_char === ')') {
+							$_cur_string = '(' . trim(substr($_cur_string, 1, -1)) . ')';
 						}
 
 						if ($this->status === 'iv') {
-							if (!$_quoted_string){
-								if (strpos($_cur_string,',')!==false)
+							if (!$_quoted_string) {
+								if (strpos($_cur_string,',') !== false)
 									// we can on only remove space next to ','
-									$_cur_string = implode(',',array_map('trim',explode(',',$_cur_string)));
+									$_cur_string = implode(',', array_map('trim', explode(',',$_cur_string)));
 								// and multiple spaces (too expensive)
-								if (strpos($_cur_string,'  ')!==false)
-									$_cur_string = preg_replace(",\s+,"," ",$_cur_string);
+								if (strpos($_cur_string, '  ') !== false)
+									$_cur_string = preg_replace(",\s+,", ' ', $_cur_string);
 							}
 							$this->sub_value .= $_cur_string;
 						} elseif ($this->status === 'is') {
@@ -901,8 +931,7 @@ class csstidy {
 						} elseif ($this->status === 'instr') {
 							$this->cur_string[count($this->cur_string)-1] .= $_cur_string;
 						}
-					}
-					else {
+					} else {
 						$this->cur_string[count($this->cur_string)-1] = $_cur_string;
 					}
 					break;
@@ -937,16 +966,15 @@ class csstidy {
 	 * @param $value
 	 * @return string
 	 */
-	function quote_font_format($value){
-		if (strncmp($value,'format',6)==0) {
-			$p = strrpos($value,")");
+	public function quote_font_format($value) {
+		if (strncmp($value,'format',6) == 0) {
+			$p = strpos($value,')',7);
 			$end = substr($value,$p);
-			$format_strings = csstidy::parse_string_list(substr($value, 7, $p-7));
+			$format_strings = $this->parse_string_list(substr($value, 7, $p-7));
 			if (!$format_strings) {
-				$value = "";
-			}
-			else {
-				$value = "format(";
+				$value = '';
+			} else {
+				$value = 'format(';
 
 				foreach ($format_strings as $format_string) {
 					$value .= '"' . str_replace('"', '\\"', $format_string) . '",';
@@ -963,7 +991,7 @@ class csstidy {
 	 * @access private
 	 * @version 1.0
 	 */
-	function explode_selectors() {
+	public function explode_selectors() {
 		// Explode multiple selectors
 		if ($this->get_cfg('merge_selectors') === 1) {
 			$new_sels = array();
@@ -1011,14 +1039,14 @@ class csstidy {
 	 * @access private
 	 * @version 1.2
 	 */
-	function css_add_property($media, $selector, $property, $new_val) {
+	public function css_add_property($media, $selector, $property, $new_val) {
 		if ($this->get_cfg('preserve_css') || trim($new_val) == '') {
 			return;
 		}
 
 		$this->added = true;
 		if (isset($this->css[$media][$selector][$property])) {
-			if ((csstidy::is_important($this->css[$media][$selector][$property]) && csstidy::is_important($new_val)) || !csstidy::is_important($this->css[$media][$selector][$property])) {
+			if (($this->is_important($this->css[$media][$selector][$property]) && $this->is_important($new_val)) || !$this->is_important($this->css[$media][$selector][$property])) {
 				$this->css[$media][$selector][$property] = trim($new_val);
 			}
 		} else {
@@ -1035,26 +1063,26 @@ class csstidy {
 	 * @param string $media
 	 * @return string
 	 */
-	function css_new_media_section($media){
-		if($this->get_cfg('preserve_css')) {
+	public function css_new_media_section($media) {
+		if ($this->get_cfg('preserve_css')) {
 			return $media;
 		}
 
 		// if the last @media is the same as this
 		// keep it
-		if (!$this->css OR !is_array($this->css) OR empty($this->css)){
+		if (!$this->css || !is_array($this->css) || empty($this->css)) {
 			return $media;
 		}
 		end($this->css);
 		list($at,) = each($this->css);
-		if ($at == $media){
+		if ($at == $media) {
 			return $media;
 		}
 		while (isset($this->css[$media]))
 			if (is_numeric($media))
 				$media++;
 			else
-				$media .= " ";
+				$media .= ' ';
 		return $media;
 	}
 
@@ -1071,28 +1099,28 @@ class csstidy {
 	 * @param string $selector
 	 * @return string
 	 */
-	function css_new_selector($media,$selector){
-		if($this->get_cfg('preserve_css')) {
+	public function css_new_selector($media,$selector) {
+		if ($this->get_cfg('preserve_css')) {
 			return $selector;
 		}
 		$selector = trim($selector);
-		if (strncmp($selector,"@font-face",10)!=0){
+		if (strncmp($selector,'@font-face',10)!=0) {
 			if ($this->settings['merge_selectors'] != false)
 				return $selector;
 
-			if (!$this->css OR !isset($this->css[$media]) OR !$this->css[$media])
+			if (!$this->css || !isset($this->css[$media]) || !$this->css[$media])
 				return $selector;
 
 			// if last is the same, keep it
 			end($this->css[$media]);
 			list($sel,) = each($this->css[$media]);
-			if ($sel == $selector){
+			if ($sel == $selector) {
 				return $selector;
 			}
 		}
 
 		while (isset($this->css[$media][$selector]))
-			$selector .= " ";
+			$selector .= ' ';
 		return $selector;
 	}
 
@@ -1106,15 +1134,15 @@ class csstidy {
 	 * @param string $property
 	 * @return string
 	 */
-	function css_new_property($media, $selector, $property){
-		if($this->get_cfg('preserve_css')) {
+	public function css_new_property($media, $selector, $property) {
+		if ($this->get_cfg('preserve_css')) {
 			return $property;
 		}
-		if (!$this->css OR !isset($this->css[$media][$selector]) OR !$this->css[$media][$selector])
+		if (!$this->css || !isset($this->css[$media][$selector]) || !$this->css[$media][$selector])
 			return $property;
 
 		while (isset($this->css[$media][$selector][$property]))
-			$property .= " ";
+			$property .= ' ';
 
 		return $property;
 	}
@@ -1127,7 +1155,7 @@ class csstidy {
 	 * @access private
 	 * @version 1.1
 	 */
-	function merge_css_blocks($media, $selector, $css_add) {
+	public function merge_css_blocks($media, $selector, $css_add) {
 		foreach ($css_add as $property => $value) {
 			$this->css_add_property($media, $selector, $property, $value, false);
 		}
@@ -1140,10 +1168,10 @@ class csstidy {
 	 * @access public
 	 * @version 1.0
 	 */
-	static function is_important(&$value) {
+	public function is_important(&$value) {
 		return (
-			strpos($value,"!")!==false // quick test
-		  AND !strcasecmp(substr(str_replace($GLOBALS['csstidy']['whitespace'], '', $value), -10, 10), '!important'));
+			strpos($value, '!') !== false // quick test
+			AND !strcasecmp(substr(str_replace($this->data['csstidy']['whitespace'], '', $value), -10, 10), '!important'));
 	}
 
 	/**
@@ -1153,8 +1181,8 @@ class csstidy {
 	 * @access public
 	 * @version 1.0
 	 */
-	static function gvw_important($value) {
-		if (csstidy::is_important($value)) {
+	public function gvw_important($value) {
+		if ($this->is_important($value)) {
 			$value = trim($value);
 			$value = substr($value, 0, -9);
 			$value = trim($value);
@@ -1173,8 +1201,8 @@ class csstidy {
 	 * @access private
 	 * @version 1.2
 	 */
-	function property_is_next($istring, $pos) {
-		$all_properties = & $GLOBALS['csstidy']['all_properties'];
+	public function property_is_next($istring, $pos) {
+		$all_properties = & $this->data['csstidy']['all_properties'];
 		$istring = substr($istring, $pos, strlen($istring) - $pos);
 		$pos = strpos($istring, ':');
 		if ($pos === false) {
@@ -1195,9 +1223,9 @@ class csstidy {
 	 * @access public
 	 * @version 1.0
 	 */
-	function property_is_valid($property) {
-		if (in_array(trim($property), $GLOBALS['csstidy']['multiple_properties'])) $property = trim($property);
-		$all_properties = & $GLOBALS['csstidy']['all_properties'];
+	public function property_is_valid($property) {
+		if (in_array(trim($property), $this->data['csstidy']['multiple_properties'])) $property = trim($property);
+		$all_properties = & $this->data['csstidy']['all_properties'];
 		return (isset($all_properties[$property]) && strpos($all_properties[$property], strtoupper($this->get_cfg('css_level'))) !== false );
 	}
 
@@ -1216,7 +1244,7 @@ class csstidy {
 	 * @return array
 	 */
 
-	function parse_string_list($value) {
+	public function parse_string_list($value) {
 		$value = trim($value);
 
 		// Case: empty
@@ -1225,30 +1253,26 @@ class csstidy {
 		$strings = array();
 
 		$in_str = false;
-		$current_string = "";
+		$current_string = '';
 
 		for ($i = 0, $_len = strlen($value); $i < $_len; $i++) {
-			if (($value{$i} == "," || $value{$i} === " ") && $in_str === true) {
+			if (($value{$i} === ',' || $value{$i} === ' ') && $in_str === true) {
 				$in_str = false;
 				$strings[] = $current_string;
-				$current_string = "";
-			}
-			else if ($value{$i} == '"' || $value{$i} == "'"){
+				$current_string = '';
+			} elseif ($value{$i} === '"' || $value{$i} === "'") {
 				if ($in_str === $value{$i}) {
 					$strings[] = $current_string;
 					$in_str = false;
-					$current_string = "";
+					$current_string = '';
 					continue;
-				}
-				else if (!$in_str) {
+				} elseif (!$in_str) {
 					$in_str = $value{$i};
 				}
-			}
-			else {
-				if ($in_str){
+			} else {
+				if ($in_str) {
 					$current_string .= $value{$i};
-				}
-				else {
+				} else {
 					if (!preg_match("/[\s,]/", $value{$i})) {
 						$in_str = true;
 						$current_string = $value{$i};
diff --git a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_ctype.php b/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_ctype.php
deleted file mode 100644
index 7960956e..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_ctype.php
+++ /dev/null
@@ -1,45 +0,0 @@
-.
  *
@@ -42,14 +42,20 @@
  */
 class csstidy_optimise {
 
+	/**
+	 * csstidy object
+	 * @var object
+	 */
+	public $parser;
+
 	/**
 	 * Constructor
 	 * @param array $css contains the class csstidy
 	 * @access private
 	 * @version 1.0
 	 */
-	function csstidy_optimise(&$css) {
-		$this->parser = & $css;
+	public function __construct($css) {
+		$this->parser = $css;
 		$this->css = & $css->css;
 		$this->sub_value = & $css->sub_value;
 		$this->at = & $css->at;
@@ -63,7 +69,7 @@ class csstidy_optimise {
 	 * @access public
 	 * @version 1.0
 	 */
-	function postparse() {
+	public function postparse() {
 		if ($this->parser->get_cfg('preserve_css')) {
 			return;
 		}
@@ -83,19 +89,19 @@ class csstidy_optimise {
 		if ($this->parser->get_cfg('optimise_shorthands') > 0) {
 			foreach ($this->css as $medium => $value) {
 				foreach ($value as $selector => $value1) {
-					$this->css[$medium][$selector] = csstidy_optimise::merge_4value_shorthands($this->css[$medium][$selector]);
+					$this->css[$medium][$selector] = $this->merge_4value_shorthands($this->css[$medium][$selector]);
 
 					if ($this->parser->get_cfg('optimise_shorthands') < 2) {
 						continue;
 					}
 
-					$this->css[$medium][$selector] = csstidy_optimise::merge_font($this->css[$medium][$selector]);
+					$this->css[$medium][$selector] = $this->merge_font($this->css[$medium][$selector]);
 
 					if ($this->parser->get_cfg('optimise_shorthands') < 3) {
 						continue;
 					}
 
-					$this->css[$medium][$selector] = csstidy_optimise::merge_bg($this->css[$medium][$selector]);
+					$this->css[$medium][$selector] = $this->merge_bg($this->css[$medium][$selector]);
 					if (empty($this->css[$medium][$selector])) {
 						unset($this->css[$medium][$selector]);
 					}
@@ -109,12 +115,12 @@ class csstidy_optimise {
 	 * @access public
 	 * @version 1.0
 	 */
-	function value() {
-		$shorthands = & $GLOBALS['csstidy']['shorthands'];
+	public function value() {
+		$shorthands = & $this->parser->data['csstidy']['shorthands'];
 
 		// optimise shorthand properties
 		if (isset($shorthands[$this->property])) {
-			$temp = csstidy_optimise::shorthand($this->value); // FIXME - move
+			$temp = $this->shorthand($this->value); // FIXME - move
 			if ($temp != $this->value) {
 				$this->parser->log('Optimised shorthand notation (' . $this->property . '): Changed "' . $this->value . '" to "' . $temp . '"', 'Information');
 			}
@@ -132,8 +138,8 @@ class csstidy_optimise {
 	 * @access public
 	 * @version 1.0
 	 */
-	function shorthands() {
-		$shorthands = & $GLOBALS['csstidy']['shorthands'];
+	public function shorthands() {
+		$shorthands = & $this->parser->data['csstidy']['shorthands'];
 
 		if (!$this->parser->get_cfg('optimise_shorthands') || $this->parser->get_cfg('preserve_css')) {
 			return;
@@ -141,14 +147,14 @@ class csstidy_optimise {
 
 		if ($this->property === 'font' && $this->parser->get_cfg('optimise_shorthands') > 1) {
 			$this->css[$this->at][$this->selector]['font']='';
-			$this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_short_font($this->value));
+			$this->parser->merge_css_blocks($this->at, $this->selector, $this->dissolve_short_font($this->value));
 		}
 		if ($this->property === 'background' && $this->parser->get_cfg('optimise_shorthands') > 2) {
 			$this->css[$this->at][$this->selector]['background']='';
-			$this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_short_bg($this->value));
+			$this->parser->merge_css_blocks($this->at, $this->selector, $this->dissolve_short_bg($this->value));
 		}
 		if (isset($shorthands[$this->property])) {
-			$this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_4value_shorthands($this->property, $this->value));
+			$this->parser->merge_css_blocks($this->at, $this->selector, $this->dissolve_4value_shorthands($this->property, $this->value));
 			if (is_array($shorthands[$this->property])) {
 				$this->css[$this->at][$this->selector][$this->property] = '';
 			}
@@ -160,8 +166,8 @@ class csstidy_optimise {
 	 * @access public
 	 * @version 1.0
 	 */
-	function subvalue() {
-		$replace_colors = & $GLOBALS['csstidy']['replace_colors'];
+	public function subvalue() {
+		$replace_colors = & $this->parser->data['csstidy']['replace_colors'];
 
 		$this->sub_value = trim($this->sub_value);
 		if ($this->sub_value == '') { // caution : '0'
@@ -169,17 +175,17 @@ class csstidy_optimise {
 		}
 
 		$important = '';
-		if (csstidy::is_important($this->sub_value)) {
+		if ($this->parser->is_important($this->sub_value)) {
 			$important = '!important';
 		}
-		$this->sub_value = csstidy::gvw_important($this->sub_value);
+		$this->sub_value = $this->parser->gvw_important($this->sub_value);
 
 		// Compress font-weight
 		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');
-			} else if ($this->sub_value === 'normal') {
+			} elseif ($this->sub_value === 'normal') {
 				$this->sub_value = '400';
 				$this->parser->log('Optimised font-weight: Changed "normal" to "400"', 'Information');
 			}
@@ -215,10 +221,10 @@ class csstidy_optimise {
 	 * @return string
 	 * @version 1.0
 	 */
-	function shorthand($value) {
+	public function shorthand($value) {
 		$important = '';
-		if (csstidy::is_important($value)) {
-			$values = csstidy::gvw_important($value);
+		if ($this->parser->is_important($value)) {
+			$values = $this->parser->gvw_important($value);
 			$important = '!important';
 		}
 		else
@@ -261,9 +267,9 @@ class csstidy_optimise {
 	 * @access public
 	 * @version 1.1
 	 */
-	function compress_important(&$string) {
-		if (csstidy::is_important($string)) {
-			$string = csstidy::gvw_important($string) . '!important';
+	public function compress_important(&$string) {
+		if ($this->parser->is_important($string)) {
+			$string = $this->parser->gvw_important($string) . '!important';
 		}
 		return $string;
 	}
@@ -274,28 +280,28 @@ class csstidy_optimise {
 	 * @return string
 	 * @version 1.1
 	 */
-	function cut_color($color) {
-		$replace_colors = & $GLOBALS['csstidy']['replace_colors'];
+	public function cut_color($color) {
+		$replace_colors = & $this->parser->data['csstidy']['replace_colors'];
 
 		// if it's a string, don't touch !
-		if (strncmp($color,"'",1)==0 OR strncmp($color,'"',1)==0)
+		if (strncmp($color, "'", 1) == 0 || strncmp($color, '"', 1) == 0)
 			return $color;
 
 		/* expressions complexes de type gradient */
-		if (strpos($color,"(")!==false AND strncmp($color,'rgb(',4)!=0){
+		if (strpos($color, '(') !== false && strncmp($color, 'rgb(' ,4) != 0) {
 			// on ne touche pas aux couleurs dans les expression ms, c'est trop sensible
-			if (stripos($color,"progid:")!==false)
+			if (stripos($color, 'progid:') !== false)
 				return $color;
-			preg_match_all(",rgb\([^)]+\),i",$color,$matches,PREG_SET_ORDER);
-			if (count($matches)){
-				foreach ($matches as $m){
-					$color = str_replace($m[0],$this->cut_color($m[0]),$color);
+			preg_match_all(",rgb\([^)]+\),i", $color, $matches, PREG_SET_ORDER);
+			if (count($matches)) {
+				foreach ($matches as $m) {
+					$color = str_replace($m[0], $this->cut_color($m[0]), $color);
 				}
 			}
-			preg_match_all(",#[0-9a-f]{6}(?=[^0-9a-f]),i",$color,$matches,PREG_SET_ORDER);
-			if (count($matches)){
-				foreach ($matches as $m){
-					$color = str_replace($m[0],$this->cut_color($m[0]),$color);
+			preg_match_all(",#[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;
@@ -365,9 +371,9 @@ class csstidy_optimise {
 	 * @return string
 	 * @version 1.2
 	 */
-	function compress_numbers($subvalue) {
-		$unit_values = & $GLOBALS['csstidy']['unit_values'];
-		$color_values = & $GLOBALS['csstidy']['color_values'];
+	public function compress_numbers($subvalue) {
+		$unit_values = & $this->parser->data['csstidy']['unit_values'];
+		$color_values = & $this->parser->data['csstidy']['color_values'];
 
 		// for font:1em/1em sans-serif...;
 		if ($this->property === 'font') {
@@ -375,6 +381,7 @@ class csstidy_optimise {
 		} 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]);
@@ -408,13 +415,13 @@ class csstidy_optimise {
 	 * @param string $string
 	 * @return array ('unit' if unit is found or '' if no unit exists, number value) or false if no number
 	 */
-	function AnalyseCssNumber($string) {
+	public function AnalyseCssNumber($string) {
 		// most simple checks first
 		if (strlen($string) == 0 || ctype_alpha($string{0})) {
 			return false;
 		}
 
-		$units = & $GLOBALS['csstidy']['units'];
+		$units = & $this->parser->data['csstidy']['units'];
 		$return = array(0, '');
 
 		$return[0] = floatval($string);
@@ -453,7 +460,7 @@ class csstidy_optimise {
 	 * @access public
 	 * @version 1.2
 	 */
-	function merge_selectors(&$array) {
+	public function merge_selectors(&$array) {
 		$css = $array;
 		foreach ($css as $key => $value) {
 			if (!isset($css[$key])) {
@@ -494,7 +501,7 @@ class csstidy_optimise {
 	 * regular expression
 	 * @version 1.4
 	 */
-	function discard_invalid_selectors(&$array) {
+	public function discard_invalid_selectors(&$array) {
 		$invalid = array('+' => true, '~' => true, ',' => true, '>' => true);
 		foreach ($array as $selector => $decls) {
 			$ok = true;
@@ -521,16 +528,16 @@ class csstidy_optimise {
 	 * @version 1.0
 	 * @see merge_4value_shorthands()
 	 */
-	function dissolve_4value_shorthands($property, $value) {
-		$shorthands = & $GLOBALS['csstidy']['shorthands'];
+	public function dissolve_4value_shorthands($property, $value) {
+		$shorthands = & $this->parser->data['csstidy']['shorthands'];
 		if (!is_array($shorthands[$property])) {
 			$return[$property] = $value;
 			return $return;
 		}
 
 		$important = '';
-		if (csstidy::is_important($value)) {
-			$value = csstidy::gvw_important($value);
+		if ($this->parser->is_important($value)) {
+			$value = $this->parser->gvw_important($value);
 			$important = '!important';
 		}
 		$values = explode(' ', $value);
@@ -566,7 +573,7 @@ class csstidy_optimise {
 	 * @return array
 	 * @version 1.0
 	 */
-	function explode_ws($sep, $string) {
+	public function explode_ws($sep, $string) {
 		$status = 'st';
 		$to = '';
 
@@ -575,9 +582,9 @@ class csstidy_optimise {
 		for ($i = 0, $len = strlen($string); $i < $len; $i++) {
 			switch ($status) {
 				case 'st':
-					if ($string{$i} == $sep && !csstidy::escaped($string, $i)) {
+					if ($string{$i} == $sep && !$this->parser->escaped($string, $i)) {
 						++$num;
-					} elseif ($string{$i} === '"' || $string{$i} === '\'' || $string{$i} === '(' && !csstidy::escaped($string, $i)) {
+					} elseif ($string{$i} === '"' || $string{$i} === '\'' || $string{$i} === '(' && !$this->parser->escaped($string, $i)) {
 						$status = 'str';
 						$to = ($string{$i} === '(') ? ')' : $string{$i};
 						(isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
@@ -587,7 +594,7 @@ class csstidy_optimise {
 					break;
 
 				case 'str':
-					if ($string{$i} == $to && !csstidy::escaped($string, $i)) {
+					if ($string{$i} == $to && !$this->parser->escaped($string, $i)) {
 						$status = 'st';
 					}
 					(isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
@@ -609,9 +616,9 @@ class csstidy_optimise {
 	 * @version 1.2
 	 * @see dissolve_4value_shorthands()
 	 */
-	function merge_4value_shorthands($array) {
+	public function merge_4value_shorthands($array) {
 		$return = $array;
-		$shorthands = & $GLOBALS['csstidy']['shorthands'];
+		$shorthands = & $this->parser->data['csstidy']['shorthands'];
 
 		foreach ($shorthands as $key => $value) {
 			if (isset($array[$value[0]]) && isset($array[$value[1]])
@@ -621,15 +628,15 @@ class csstidy_optimise {
 				$important = '';
 				for ($i = 0; $i < 4; $i++) {
 					$val = $array[$value[$i]];
-					if (csstidy::is_important($val)) {
+					if ($this->parser->is_important($val)) {
 						$important = '!important';
-						$return[$key] .= csstidy::gvw_important($val) . ' ';
+						$return[$key] .= $this->parser->gvw_important($val) . ' ';
 					} else {
 						$return[$key] .= $val . ' ';
 					}
 					unset($return[$value[$i]]);
 				}
-				$return[$key] = csstidy_optimise::shorthand(trim($return[$key] . $important));
+				$return[$key] = $this->shorthand(trim($return[$key] . $important));
 			}
 		}
 		return $return;
@@ -643,12 +650,12 @@ class csstidy_optimise {
 	 * @see merge_bg()
 	 * @todo full CSS 3 compliance
 	 */
-	function dissolve_short_bg($str_value) {
+	public function dissolve_short_bg($str_value) {
 		// don't try to explose background gradient !
-		if (stripos($str_value, "gradient(")!==FALSE)
+		if (stripos($str_value, 'gradient(')!== false)
 			return array('background'=>$str_value);
-		
-		$background_prop_default = & $GLOBALS['csstidy']['background_prop_default'];
+
+		$background_prop_default = & $this->parser->data['csstidy']['background_prop_default'];
 		$repeat = array('repeat', 'repeat-x', 'repeat-y', 'no-repeat', 'space');
 		$attachment = array('scroll', 'fixed', 'local');
 		$clip = array('border', 'padding');
@@ -657,12 +664,12 @@ class csstidy_optimise {
 		$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 (csstidy::is_important($str_value)) {
+		if ($this->parser->is_important($str_value)) {
 			$important = ' !important';
-			$str_value = csstidy::gvw_important($str_value);
+			$str_value = $this->parser->gvw_important($str_value);
 		}
 
-		$str_value = csstidy_optimise::explode_ws(',', $str_value);
+		$str_value = $this->explode_ws(',', $str_value);
 		for ($i = 0; $i < count($str_value); $i++) {
 			$have['clip'] = false;
 			$have['pos'] = false;
@@ -672,7 +679,7 @@ class csstidy_optimise {
 			if (is_array($str_value[$i])) {
 				$str_value[$i] = $str_value[$i][0];
 			}
-			$str_value[$i] = csstidy_optimise::explode_ws(' ', trim($str_value[$i]));
+			$str_value[$i] = $this->explode_ws(' ', trim($str_value[$i]));
 
 			for ($j = 0; $j < count($str_value[$i]); $j++) {
 				if ($have['bg'] === false && (substr($str_value[$i][$j], 0, 4) === 'url(' || $str_value[$i][$j] === 'none')) {
@@ -695,8 +702,7 @@ class csstidy_optimise {
 						$return['background-position'] .= ' '; else
 						$return['background-position'].= ',';
 					$have['pos'] = true;
-				}
-				elseif (!$have['color']) {
+				} elseif (!$have['color']) {
 					$return['background-color'] .= $str_value[$i][$j] . ',';
 					$have['color'] = true;
 				}
@@ -721,19 +727,19 @@ class csstidy_optimise {
 	 * @see dissolve_short_bg()
 	 * @todo full CSS 3 compliance
 	 */
-	function merge_bg($input_css) {
-		$background_prop_default = & $GLOBALS['csstidy']['background_prop_default'];
+	public function merge_bg($input_css) {
+		$background_prop_default = & $this->parser->data['csstidy']['background_prop_default'];
 		// Max number of background images. CSS3 not yet fully implemented
-		$number_of_values = @max(count(csstidy_optimise::explode_ws(',', $input_css['background-image'])), count(csstidy_optimise::explode_ws(',', $input_css['background-color'])), 1);
+		$number_of_values = @max(count($this->explode_ws(',', $input_css['background-image'])), count($this->explode_ws(',', $input_css['background-color'])), 1);
 		// Array with background images to check if BG image exists
-		$bg_img_array = @csstidy_optimise::explode_ws(',', csstidy::gvw_important($input_css['background-image']));
+		$bg_img_array = @$this->explode_ws(',', $this->parser->gvw_important($input_css['background-image']));
 		$new_bg_value = '';
 		$important = '';
 
 		// if background properties is here and not empty, don't try anything
-		if (isset($input_css['background']) AND $input_css['background'])
+		if (isset($input_css['background']) && $input_css['background'])
 			return $input_css;
-		
+
 		for ($i = 0; $i < $number_of_values; $i++) {
 			foreach ($background_prop_default as $bg_property => $default_value) {
 				// Skip if property does not exist
@@ -743,7 +749,7 @@ class csstidy_optimise {
 
 				$cur_value = $input_css[$bg_property];
 				// skip all optimisation if gradient() somewhere
-				if (stripos($cur_value, "gradient(")!==FALSE)
+				if (stripos($cur_value, 'gradient(') !== false)
 					return $input_css;
 
 				// Skip some properties if there is no background image
@@ -754,9 +760,9 @@ class csstidy_optimise {
 				}
 
 				// Remove !important
-				if (csstidy::is_important($cur_value)) {
+				if ($this->parser->is_important($cur_value)) {
 					$important = ' !important';
-					$cur_value = csstidy::gvw_important($cur_value);
+					$cur_value = $this->parser->gvw_important($cur_value);
 				}
 
 				// Do not add default values
@@ -764,7 +770,7 @@ class csstidy_optimise {
 					continue;
 				}
 
-				$temp = csstidy_optimise::explode_ws(',', $cur_value);
+				$temp = $this->explode_ws(',', $cur_value);
 
 				if (isset($temp[$i])) {
 					if ($bg_property === 'background-size') {
@@ -801,17 +807,17 @@ class csstidy_optimise {
 	 * @version 1.3
 	 * @see merge_font()
 	 */
-	function dissolve_short_font($str_value) {
-		$font_prop_default = & $GLOBALS['csstidy']['font_prop_default'];
+	public function dissolve_short_font($str_value) {
+		$font_prop_default = & $this->parser->data['csstidy']['font_prop_default'];
 		$font_weight = array('normal', 'bold', 'bolder', 'lighter', 100, 200, 300, 400, 500, 600, 700, 800, 900);
 		$font_variant = array('normal', 'small-caps');
 		$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 (csstidy::is_important($str_value)) {
+		if ($this->parser->is_important($str_value)) {
 			$important = '!important';
-			$str_value = csstidy::gvw_important($str_value);
+			$str_value = $this->parser->gvw_important($str_value);
 		}
 
 		$have['style'] = false;
@@ -822,9 +828,9 @@ class csstidy_optimise {
 		$multiwords = false;
 
 		// Workaround with multiple font-family
-		$str_value = csstidy_optimise::explode_ws(',', trim($str_value));
+		$str_value = $this->explode_ws(',', trim($str_value));
 
-		$str_value[0] = csstidy_optimise::explode_ws(' ', trim($str_value[0]));
+		$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)) {
@@ -837,7 +843,7 @@ class csstidy_optimise {
 				$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 = csstidy_optimise::explode_ws('/', trim($str_value[0][$j]));
+				$size = $this->explode_ws('/', trim($str_value[0][$j]));
 				$return['font-size'] = $size[0];
 				if (isset($size[1])) {
 					$return['line-height'] = $size[1];
@@ -888,27 +894,27 @@ class csstidy_optimise {
 	 * @version 1.3
 	 * @see dissolve_short_font()
 	 */
-	function merge_font($input_css) {
-		$font_prop_default = & $GLOBALS['csstidy']['font_prop_default'];
+	public function merge_font($input_css) {
+		$font_prop_default = & $this->parser->data['csstidy']['font_prop_default'];
 		$new_font_value = '';
 		$important = '';
 		// Skip if not font-family and font-size set
 		if (isset($input_css['font-family']) && isset($input_css['font-size'])) {
 			// fix several words in font-family - add quotes
 			if (isset($input_css['font-family'])) {
-				$families = explode(",", $input_css['font-family']);
+				$families = explode(',', $input_css['font-family']);
 				$result_families = array();
 				foreach ($families as $family) {
 					$family = trim($family);
 					$len = strlen($family);
-					if (strpos($family, " ") &&
-									!(($family{0} == '"' && $family{$len - 1} == '"') ||
-									($family{0} == "'" && $family{$len - 1} == "'"))) {
+					if (strpos($family, ' ') &&
+									!(($family{0} === '"' && $family{$len - 1} === '"') ||
+									($family{0} === "'" && $family{$len - 1} === "'"))) {
 						$family = '"' . $family . '"';
 					}
 					$result_families[] = $family;
 				}
-				$input_css['font-family'] = implode(",", $result_families);
+				$input_css['font-family'] = implode(',', $result_families);
 			}
 			foreach ($font_prop_default as $font_property => $default_value) {
 
@@ -925,9 +931,9 @@ class csstidy_optimise {
 				}
 
 				// Remove !important
-				if (csstidy::is_important($cur_value)) {
+				if ($this->parser->is_important($cur_value)) {
 					$important = '!important';
-					$cur_value = csstidy::gvw_important($cur_value);
+					$cur_value = $this->parser->gvw_important($cur_value);
 				}
 
 				$new_font_value .= $cur_value;
@@ -940,7 +946,7 @@ class csstidy_optimise {
 
 			// Delete all font-properties
 			foreach ($font_prop_default as $font_property => $default_value) {
-				if ($font_property!=='font' OR !$new_font_value)
+				if ($font_property !== 'font' || !$new_font_value)
 					unset($input_css[$font_property]);
 			}
 
diff --git a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_print.php b/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_print.php
index 9897fbd1..48aa8974 100644
--- a/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_print.php
+++ b/www/plugins-dist/compresseur/lib/csstidy/class.csstidy_print.php
@@ -19,7 +19,7 @@
  *   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 .
  *
@@ -41,24 +41,30 @@
  */
 class csstidy_print {
 
+	/**
+	 * csstidy object
+	 * @var object
+	 */
+	public $parser;
+
 	/**
 	 * Saves the input CSS string
 	 * @var string
 	 * @access private
 	 */
-	var $input_css = '';
+	public $input_css = '';
 	/**
 	 * Saves the formatted CSS string
 	 * @var string
 	 * @access public
 	 */
-	var $output_css = '';
+	public $output_css = '';
 	/**
 	 * Saves the formatted CSS string (plain text)
 	 * @var string
 	 * @access public
 	 */
-	var $output_css_plain = '';
+	public $output_css_plain = '';
 
 	/**
 	 * Constructor
@@ -66,8 +72,8 @@ class csstidy_print {
 	 * @access private
 	 * @version 1.0
 	 */
-	function csstidy_print(&$css) {
-		$this->parser = & $css;
+	public function __construct($css) {
+		$this->parser = $css;
 		$this->css = & $css->css;
 		$this->template = & $css->template;
 		$this->tokens = & $css->tokens;
@@ -81,7 +87,7 @@ class csstidy_print {
 	 * @access private
 	 * @version 1.0
 	 */
-	function _reset() {
+	public function _reset() {
 		$this->output_css = '';
 		$this->output_css_plain = '';
 	}
@@ -93,7 +99,7 @@ class csstidy_print {
 	 * @access public
 	 * @version 1.0
 	 */
-	function plain($default_media='') {
+	public function plain($default_media='') {
 		$this->_print(true, $default_media);
 		return $this->output_css_plain;
 	}
@@ -105,7 +111,7 @@ class csstidy_print {
 	 * @access public
 	 * @version 1.0
 	 */
-	function formatted($default_media='') {
+	public function formatted($default_media='') {
 		$this->_print(false, $default_media);
 		return $this->output_css;
 	}
@@ -120,9 +126,12 @@ class csstidy_print {
 	 * @access public
 	 * @version 1.4
 	 */
-	function formatted_page($doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
+	public function formatted_page($doctype='html5', $externalcss=true, $title='', $lang='en') {
 		switch ($doctype) {
-			case 'xhtml1.0strict':
+			case 'html5':
+				$doctype_output = '';
+				break;
+				case 'xhtml1.0strict':
 				$doctype_output = '';
 				break;
@@ -147,7 +156,6 @@ class csstidy_print {
 			$output .= "\n";
 		} else {
 			$output .= "\n" . '    ';
-//			}
 		}
 		$output .= "\n\n";
 		$output .= $this->formatted();
@@ -162,7 +170,7 @@ class csstidy_print {
 	 * @access private
 	 * @version 2.0
 	 */
-	function _print($plain = false, $default_media='') {
+	public function _print($plain = false, $default_media='') {
 		if ($this->output_css && $this->output_css_plain) {
 			return;
 		}
@@ -278,7 +286,7 @@ class csstidy_print {
 	 * @access private
 	 * @version 1.0
 	 */
-	function _seeknocomment($key, $move) {
+	public function _seeknocomment($key, $move) {
 		$go = ($move > 0) ? 1 : -1;
 		for ($i = $key + 1; abs($key - $i) - 1 < abs($move); $i += $go) {
 			if (!isset($this->tokens[$i])) {
@@ -298,7 +306,7 @@ class csstidy_print {
 	 * @access private
 	 * @version 1.0
 	 */
-	function _convert_raw_css($default_media='') {
+	public function _convert_raw_css($default_media='') {
 		$this->tokens = array();
 		$sort_selectors = $this->parser->get_cfg('sort_selectors');
 		$sort_properties = $this->parser->get_cfg('sort_properties');
@@ -308,14 +316,13 @@ class csstidy_print {
 				ksort($val);
 			if (intval($medium) < DEFAULT_AT) {
 				// un medium vide (contenant @font-face ou autre @) ne produit aucun conteneur
-				if (strlen(trim($medium))){
+				if (strlen(trim($medium))) {
 					$this->parser->_add_token(AT_START, $medium, true);
 				}
-			}
-			elseif ($default_media) {
+			} elseif ($default_media) {
 				$this->parser->_add_token(AT_START, $default_media, true);
 			}
-			
+
 			foreach ($val as $selector => $vali) {
 				if ($sort_properties)
 					ksort($vali);
@@ -328,7 +335,7 @@ class csstidy_print {
 					'-' => array()  // IE6 hacks
 				);
 				foreach ($vali as $property => $valj) {
-					if (strncmp($property,"//",2)!==0){
+					if (strncmp($property,"//",2)!==0) {
 						$matches = array();
 						if ($sort_properties && preg_match('/^(\*|_|\/|-)(?!(ms|moz|o\b|xv|atsc|wap|khtml|webkit|ah|hp|ro|rim|tc)-)/', $property, $matches)) {
 							$invalid[$matches[1]][$property] = $valj;
@@ -349,11 +356,10 @@ class csstidy_print {
 
 			if (intval($medium) < DEFAULT_AT) {
 				// un medium vide (contenant @font-face ou autre @) ne produit aucun conteneur
-				if (strlen(trim($medium))){
+				if (strlen(trim($medium))) {
 					$this->parser->_add_token(AT_END, $medium, true);
 				}
-			}
-			elseif ($default_media) {
+			} elseif ($default_media) {
 				$this->parser->_add_token(AT_END, $default_media, true);
 			}
 		}
@@ -368,7 +374,7 @@ class csstidy_print {
 	 * @access private
 	 * @version 1.0
 	 */
-	function _htmlsp($string, $plain) {
+	public function _htmlsp($string, $plain) {
 		if (!$plain) {
 			return htmlspecialchars($string, ENT_QUOTES, 'utf-8');
 		}
@@ -381,7 +387,7 @@ class csstidy_print {
 	 * @return float
 	 * @version 1.2
 	 */
-	function get_ratio() {
+	public function get_ratio() {
 		if (!$this->output_css_plain) {
 			$this->formatted();
 		}
@@ -394,7 +400,7 @@ class csstidy_print {
 	 * @return string
 	 * @version 1.1
 	 */
-	function get_diff() {
+	public function get_diff() {
 		if (!$this->output_css_plain) {
 			$this->formatted();
 		}
@@ -417,7 +423,7 @@ class csstidy_print {
 	 * @return integer
 	 * @version 1.0
 	 */
-	function size($loc = 'output') {
+	public function size($loc = 'output') {
 		if ($loc === 'output' && !$this->output_css) {
 			$this->formatted();
 		}
diff --git a/www/plugins-dist/compresseur/lib/csstidy/cssparse.css b/www/plugins-dist/compresseur/lib/csstidy/cssparse.css
deleted file mode 100644
index 38fc40b4..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/cssparse.css
+++ /dev/null
@@ -1,118 +0,0 @@
-@import url("cssparsed.css");
-
-html, body {
-font:0.8em Verdana,Helvetica,sans-serif;
-background:#F8F8F6;
-}
-
-code {
-font-size:1.2em;
-}
-
-div#rightcol {
-padding-left:32em;
-}
-
-fieldset {
-display:block;
-margin:0.5em 0;
-padding:1em;
-border:solid #7284AB 2px;
-}
-fieldset.code_output {
-display:inline;
-}
-
-h1 {
-font-size:2em;
-}
-
-small {
-font-size:0.7em;
-}
-
-fieldset#field_input {
-float:left;
-margin:0 0.5em 1em 0;
-}
-
-fieldset#options,fieldset#code_layout {
-width:31em;
-}
-
-input#submit {
-clear:both;
-display:block;
-margin:1em;
-}
-
-select {
-margin:2px 0 0;
-}
-
-label.block {
-display:block;
-}
-
-legend {
-background:#c4E1C3;
-padding:2px 4px;
-border:dashed 1px;
-}
-
-textarea#css_text {
-width:27em;
-height:370px;
-display:block;
-margin-right:1em;
-}
-
-.help {
-cursor:help;
-}
-
-p.important {
-border:solid 1px red;
-font-weight:bold;
-padding:1em;
-background:white;
-}
-
-p {
-margin:1em 0;
-}
-
-dl {
-padding-left:0.5em;
-}
-
-dt {
-font-weight:bold;
-margin:0;
-float:left;
-clear:both;
-height:1.5em;
-}
-
-dd {
-margin:0 0 0 4em;
-height:1.5em;
-}
-
-fieldset#messages {
-background:white;
-padding:0 0 0 1em;
-}
-
-fieldset#messages div {
-height:10em;
-overflow:auto;
-}
-
-dd.Warning {
-color:orange;
-}
-
-dd.Information {
-color:green;
-}
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/cssparsed.css b/www/plugins-dist/compresseur/lib/csstidy/cssparsed.css
deleted file mode 100644
index ca28b9bd..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/cssparsed.css
+++ /dev/null
@@ -1,29 +0,0 @@
-code#copytext {
-	white-space: pre;
-	font-family: Verdana;
-}
-
-.at {
-color:darkblue;
-}
-
-.format {
-color:gray;
-}
-
-.property {
-color:green;
-}
-
-.selector {
-color:blue;
-}
-
-.value {
-color:red;
-left: 500px;
-}
-
-.comment {
-color:orange;
-}
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/lib/csstidy/data.inc.php b/www/plugins-dist/compresseur/lib/csstidy/data.inc.php
index 9ec79412..ec1322ed 100644
--- a/www/plugins-dist/compresseur/lib/csstidy/data.inc.php
+++ b/www/plugins-dist/compresseur/lib/csstidy/data.inc.php
@@ -1,5 +1,4 @@
 ?[]^`|~';
+$data['csstidy']['tokens'] = '/@}{;:=\'"(,\\!$%&)*+.<>?[]^`|~';
 
 /**
  * All CSS units (CSS 3 units included)
  *
  * @see compress_numbers()
- * @global array $GLOBALS['csstidy']['units']
+ * @global array $data['csstidy']['units']
  * @version 1.0
  */
-$GLOBALS['csstidy']['units'] = array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','deg','grad','rad','ms','s','khz','hz');
+$data['csstidy']['units'] = array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','deg','grad','rad','turn','ms','s','khz','hz','ch','vmin','vmax','dpi','dpcm','dppx');
 
 /**
  * Available at-rules
  *
- * @global array $GLOBALS['csstidy']['at_rules']
+ * @global array $data['csstidy']['at_rules']
  * @version 1.1
  */
-$GLOBALS['csstidy']['at_rules'] = array('page' => 'is','font-face' => 'atis','charset' => 'iv', 'import' => 'iv','namespace' => 'iv','media' => 'at','keyframes' => 'at');
+$data['csstidy']['at_rules'] = array('page' => 'is','font-face' => 'atis','charset' => 'iv', 'import' => 'iv','namespace' => 'iv','media' => 'at','keyframes' => 'at','-moz-keyframes' => 'at','-o-keyframes' => 'at','-webkit-keyframes' => 'at','-ms-keyframes' => 'at');
 
  /**
  * Properties that need a value with unit
  *
  * @todo CSS3 properties
  * @see compress_numbers();
- * @global array $GLOBALS['csstidy']['unit_values']
+ * @global array $data['csstidy']['unit_values']
  * @version 1.2
  */
-$GLOBALS['csstidy']['unit_values'] = array ('background', 'background-position', 'background-size', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-width',
-                                            'border-top-width', 'border-right-width', 'border-left-width', 'border-bottom-width', 'bottom', 'border-spacing', 'column-gap', 'column-width',
+$data['csstidy']['unit_values'] = array ('background', 'background-position', 'background-size', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-width',
+											'border-top-width', 'border-right-width', 'border-left-width', 'border-bottom-width', 'bottom', 'border-spacing', 'column-gap', 'column-width',
 											'font-size', 'height', 'left', 'margin', 'margin-top', 'margin-right', 'margin-bottom', 'margin-left', 'max-height',
-											'max-width', 'min-height', 'min-width', 'outline', 'outline-width', 'padding', 'padding-top', 'padding-right', 
+											'max-width', 'min-height', 'min-width', 'outline', 'outline-width', 'padding', 'padding-top', 'padding-right',
 											'padding-bottom', 'padding-left', 'perspective', 'right', 'top', 'text-indent', 'letter-spacing', 'word-spacing', 'width');
 
 /**
@@ -86,571 +76,571 @@ $GLOBALS['csstidy']['unit_values'] = array ('background', 'background-position',
  *
  * @todo CSS3 properties
  * @see compress_numbers();
- * @global array $GLOBALS['csstidy']['color_values']
+ * @global array $data['csstidy']['color_values']
  * @version 1.0
  */
-$GLOBALS['csstidy']['color_values'] = array();
-$GLOBALS['csstidy']['color_values'][] = 'background-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-top-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-right-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-bottom-color';
-$GLOBALS['csstidy']['color_values'][] = 'border-left-color';
-$GLOBALS['csstidy']['color_values'][] = 'color';
-$GLOBALS['csstidy']['color_values'][] = 'outline-color';
-$GLOBALS['csstidy']['color_values'][] = 'column-rule-color';
+$data['csstidy']['color_values'] = array();
+$data['csstidy']['color_values'][] = 'background-color';
+$data['csstidy']['color_values'][] = 'border-color';
+$data['csstidy']['color_values'][] = 'border-top-color';
+$data['csstidy']['color_values'][] = 'border-right-color';
+$data['csstidy']['color_values'][] = 'border-bottom-color';
+$data['csstidy']['color_values'][] = 'border-left-color';
+$data['csstidy']['color_values'][] = 'color';
+$data['csstidy']['color_values'][] = 'outline-color';
+$data['csstidy']['color_values'][] = 'column-rule-color';
 
 /**
  * Default values for the background properties
  *
  * @todo Possibly property names will change during CSS3 development
- * @global array $GLOBALS['csstidy']['background_prop_default']
+ * @global array $data['csstidy']['background_prop_default']
  * @see dissolve_short_bg()
  * @see merge_bg()
  * @version 1.0
  */
-$GLOBALS['csstidy']['background_prop_default'] = array();
-$GLOBALS['csstidy']['background_prop_default']['background-image'] = 'none';
-$GLOBALS['csstidy']['background_prop_default']['background-size'] = 'auto';
-$GLOBALS['csstidy']['background_prop_default']['background-repeat'] = 'repeat';
-$GLOBALS['csstidy']['background_prop_default']['background-position'] = '0 0';
-$GLOBALS['csstidy']['background_prop_default']['background-attachment'] = 'scroll';
-$GLOBALS['csstidy']['background_prop_default']['background-clip'] = 'border';
-$GLOBALS['csstidy']['background_prop_default']['background-origin'] = 'padding';
-$GLOBALS['csstidy']['background_prop_default']['background-color'] = 'transparent';
+$data['csstidy']['background_prop_default'] = array();
+$data['csstidy']['background_prop_default']['background-image'] = 'none';
+$data['csstidy']['background_prop_default']['background-size'] = 'auto';
+$data['csstidy']['background_prop_default']['background-repeat'] = 'repeat';
+$data['csstidy']['background_prop_default']['background-position'] = '0 0';
+$data['csstidy']['background_prop_default']['background-attachment'] = 'scroll';
+$data['csstidy']['background_prop_default']['background-clip'] = 'border';
+$data['csstidy']['background_prop_default']['background-origin'] = 'padding';
+$data['csstidy']['background_prop_default']['background-color'] = 'transparent';
 
 /**
  * Default values for the font properties
  *
- * @global array $GLOBALS['csstidy']['font_prop_default']
+ * @global array $data['csstidy']['font_prop_default']
  * @see merge_fonts()
  * @version 1.3
  */
-$GLOBALS['csstidy']['font_prop_default'] = array();
-$GLOBALS['csstidy']['font_prop_default']['font-style'] = 'normal';
-$GLOBALS['csstidy']['font_prop_default']['font-variant'] = 'normal';
-$GLOBALS['csstidy']['font_prop_default']['font-weight'] = 'normal';
-$GLOBALS['csstidy']['font_prop_default']['font-size'] = '';
-$GLOBALS['csstidy']['font_prop_default']['line-height'] = '';
-$GLOBALS['csstidy']['font_prop_default']['font-family'] = '';
+$data['csstidy']['font_prop_default'] = array();
+$data['csstidy']['font_prop_default']['font-style'] = 'normal';
+$data['csstidy']['font_prop_default']['font-variant'] = 'normal';
+$data['csstidy']['font_prop_default']['font-weight'] = 'normal';
+$data['csstidy']['font_prop_default']['font-size'] = '';
+$data['csstidy']['font_prop_default']['line-height'] = '';
+$data['csstidy']['font_prop_default']['font-family'] = '';
 
 /**
  * A list of non-W3C color names which get replaced by their hex-codes
  *
- * @global array $GLOBALS['csstidy']['replace_colors']
+ * @global array $data['csstidy']['replace_colors']
  * @see cut_color()
  * @version 1.0
  */
-$GLOBALS['csstidy']['replace_colors'] = array();
-$GLOBALS['csstidy']['replace_colors']['aliceblue'] = '#f0f8ff';
-$GLOBALS['csstidy']['replace_colors']['antiquewhite'] = '#faebd7';
-$GLOBALS['csstidy']['replace_colors']['aquamarine'] = '#7fffd4';
-$GLOBALS['csstidy']['replace_colors']['azure'] = '#f0ffff';
-$GLOBALS['csstidy']['replace_colors']['beige'] = '#f5f5dc';
-$GLOBALS['csstidy']['replace_colors']['bisque'] = '#ffe4c4';
-$GLOBALS['csstidy']['replace_colors']['blanchedalmond'] = '#ffebcd';
-$GLOBALS['csstidy']['replace_colors']['blueviolet'] = '#8a2be2';
-$GLOBALS['csstidy']['replace_colors']['brown'] = '#a52a2a';
-$GLOBALS['csstidy']['replace_colors']['burlywood'] = '#deb887';
-$GLOBALS['csstidy']['replace_colors']['cadetblue'] = '#5f9ea0';
-$GLOBALS['csstidy']['replace_colors']['chartreuse'] = '#7fff00';
-$GLOBALS['csstidy']['replace_colors']['chocolate'] = '#d2691e';
-$GLOBALS['csstidy']['replace_colors']['coral'] = '#ff7f50';
-$GLOBALS['csstidy']['replace_colors']['cornflowerblue'] = '#6495ed';
-$GLOBALS['csstidy']['replace_colors']['cornsilk'] = '#fff8dc';
-$GLOBALS['csstidy']['replace_colors']['crimson'] = '#dc143c';
-$GLOBALS['csstidy']['replace_colors']['cyan'] = '#00ffff';
-$GLOBALS['csstidy']['replace_colors']['darkblue'] = '#00008b';
-$GLOBALS['csstidy']['replace_colors']['darkcyan'] = '#008b8b';
-$GLOBALS['csstidy']['replace_colors']['darkgoldenrod'] = '#b8860b';
-$GLOBALS['csstidy']['replace_colors']['darkgray'] = '#a9a9a9';
-$GLOBALS['csstidy']['replace_colors']['darkgreen'] = '#006400';
-$GLOBALS['csstidy']['replace_colors']['darkkhaki'] = '#bdb76b';
-$GLOBALS['csstidy']['replace_colors']['darkmagenta'] = '#8b008b';
-$GLOBALS['csstidy']['replace_colors']['darkolivegreen'] = '#556b2f';
-$GLOBALS['csstidy']['replace_colors']['darkorange'] = '#ff8c00';
-$GLOBALS['csstidy']['replace_colors']['darkorchid'] = '#9932cc';
-$GLOBALS['csstidy']['replace_colors']['darkred'] = '#8b0000';
-$GLOBALS['csstidy']['replace_colors']['darksalmon'] = '#e9967a';
-$GLOBALS['csstidy']['replace_colors']['darkseagreen'] = '#8fbc8f';
-$GLOBALS['csstidy']['replace_colors']['darkslateblue'] = '#483d8b';
-$GLOBALS['csstidy']['replace_colors']['darkslategray'] = '#2f4f4f';
-$GLOBALS['csstidy']['replace_colors']['darkturquoise'] = '#00ced1';
-$GLOBALS['csstidy']['replace_colors']['darkviolet'] = '#9400d3';
-$GLOBALS['csstidy']['replace_colors']['deeppink'] = '#ff1493';
-$GLOBALS['csstidy']['replace_colors']['deepskyblue'] = '#00bfff';
-$GLOBALS['csstidy']['replace_colors']['dimgray'] = '#696969';
-$GLOBALS['csstidy']['replace_colors']['dodgerblue'] = '#1e90ff';
-$GLOBALS['csstidy']['replace_colors']['feldspar'] = '#d19275';
-$GLOBALS['csstidy']['replace_colors']['firebrick'] = '#b22222';
-$GLOBALS['csstidy']['replace_colors']['floralwhite'] = '#fffaf0';
-$GLOBALS['csstidy']['replace_colors']['forestgreen'] = '#228b22';
-$GLOBALS['csstidy']['replace_colors']['gainsboro'] = '#dcdcdc';
-$GLOBALS['csstidy']['replace_colors']['ghostwhite'] = '#f8f8ff';
-$GLOBALS['csstidy']['replace_colors']['gold'] = '#ffd700';
-$GLOBALS['csstidy']['replace_colors']['goldenrod'] = '#daa520';
-$GLOBALS['csstidy']['replace_colors']['greenyellow'] = '#adff2f';
-$GLOBALS['csstidy']['replace_colors']['honeydew'] = '#f0fff0';
-$GLOBALS['csstidy']['replace_colors']['hotpink'] = '#ff69b4';
-$GLOBALS['csstidy']['replace_colors']['indianred'] = '#cd5c5c';
-$GLOBALS['csstidy']['replace_colors']['indigo'] = '#4b0082';
-$GLOBALS['csstidy']['replace_colors']['ivory'] = '#fffff0';
-$GLOBALS['csstidy']['replace_colors']['khaki'] = '#f0e68c';
-$GLOBALS['csstidy']['replace_colors']['lavender'] = '#e6e6fa';
-$GLOBALS['csstidy']['replace_colors']['lavenderblush'] = '#fff0f5';
-$GLOBALS['csstidy']['replace_colors']['lawngreen'] = '#7cfc00';
-$GLOBALS['csstidy']['replace_colors']['lemonchiffon'] = '#fffacd';
-$GLOBALS['csstidy']['replace_colors']['lightblue'] = '#add8e6';
-$GLOBALS['csstidy']['replace_colors']['lightcoral'] = '#f08080';
-$GLOBALS['csstidy']['replace_colors']['lightcyan'] = '#e0ffff';
-$GLOBALS['csstidy']['replace_colors']['lightgoldenrodyellow'] = '#fafad2';
-$GLOBALS['csstidy']['replace_colors']['lightgrey'] = '#d3d3d3';
-$GLOBALS['csstidy']['replace_colors']['lightgreen'] = '#90ee90';
-$GLOBALS['csstidy']['replace_colors']['lightpink'] = '#ffb6c1';
-$GLOBALS['csstidy']['replace_colors']['lightsalmon'] = '#ffa07a';
-$GLOBALS['csstidy']['replace_colors']['lightseagreen'] = '#20b2aa';
-$GLOBALS['csstidy']['replace_colors']['lightskyblue'] = '#87cefa';
-$GLOBALS['csstidy']['replace_colors']['lightslateblue'] = '#8470ff';
-$GLOBALS['csstidy']['replace_colors']['lightslategray'] = '#778899';
-$GLOBALS['csstidy']['replace_colors']['lightsteelblue'] = '#b0c4de';
-$GLOBALS['csstidy']['replace_colors']['lightyellow'] = '#ffffe0';
-$GLOBALS['csstidy']['replace_colors']['limegreen'] = '#32cd32';
-$GLOBALS['csstidy']['replace_colors']['linen'] = '#faf0e6';
-$GLOBALS['csstidy']['replace_colors']['magenta'] = '#ff00ff';
-$GLOBALS['csstidy']['replace_colors']['mediumaquamarine'] = '#66cdaa';
-$GLOBALS['csstidy']['replace_colors']['mediumblue'] = '#0000cd';
-$GLOBALS['csstidy']['replace_colors']['mediumorchid'] = '#ba55d3';
-$GLOBALS['csstidy']['replace_colors']['mediumpurple'] = '#9370d8';
-$GLOBALS['csstidy']['replace_colors']['mediumseagreen'] = '#3cb371';
-$GLOBALS['csstidy']['replace_colors']['mediumslateblue'] = '#7b68ee';
-$GLOBALS['csstidy']['replace_colors']['mediumspringgreen'] = '#00fa9a';
-$GLOBALS['csstidy']['replace_colors']['mediumturquoise'] = '#48d1cc';
-$GLOBALS['csstidy']['replace_colors']['mediumvioletred'] = '#c71585';
-$GLOBALS['csstidy']['replace_colors']['midnightblue'] = '#191970';
-$GLOBALS['csstidy']['replace_colors']['mintcream'] = '#f5fffa';
-$GLOBALS['csstidy']['replace_colors']['mistyrose'] = '#ffe4e1';
-$GLOBALS['csstidy']['replace_colors']['moccasin'] = '#ffe4b5';
-$GLOBALS['csstidy']['replace_colors']['navajowhite'] = '#ffdead';
-$GLOBALS['csstidy']['replace_colors']['oldlace'] = '#fdf5e6';
-$GLOBALS['csstidy']['replace_colors']['olivedrab'] = '#6b8e23';
-$GLOBALS['csstidy']['replace_colors']['orangered'] = '#ff4500';
-$GLOBALS['csstidy']['replace_colors']['orchid'] = '#da70d6';
-$GLOBALS['csstidy']['replace_colors']['palegoldenrod'] = '#eee8aa';
-$GLOBALS['csstidy']['replace_colors']['palegreen'] = '#98fb98';
-$GLOBALS['csstidy']['replace_colors']['paleturquoise'] = '#afeeee';
-$GLOBALS['csstidy']['replace_colors']['palevioletred'] = '#d87093';
-$GLOBALS['csstidy']['replace_colors']['papayawhip'] = '#ffefd5';
-$GLOBALS['csstidy']['replace_colors']['peachpuff'] = '#ffdab9';
-$GLOBALS['csstidy']['replace_colors']['peru'] = '#cd853f';
-$GLOBALS['csstidy']['replace_colors']['pink'] = '#ffc0cb';
-$GLOBALS['csstidy']['replace_colors']['plum'] = '#dda0dd';
-$GLOBALS['csstidy']['replace_colors']['powderblue'] = '#b0e0e6';
-$GLOBALS['csstidy']['replace_colors']['rosybrown'] = '#bc8f8f';
-$GLOBALS['csstidy']['replace_colors']['royalblue'] = '#4169e1';
-$GLOBALS['csstidy']['replace_colors']['saddlebrown'] = '#8b4513';
-$GLOBALS['csstidy']['replace_colors']['salmon'] = '#fa8072';
-$GLOBALS['csstidy']['replace_colors']['sandybrown'] = '#f4a460';
-$GLOBALS['csstidy']['replace_colors']['seagreen'] = '#2e8b57';
-$GLOBALS['csstidy']['replace_colors']['seashell'] = '#fff5ee';
-$GLOBALS['csstidy']['replace_colors']['sienna'] = '#a0522d';
-$GLOBALS['csstidy']['replace_colors']['skyblue'] = '#87ceeb';
-$GLOBALS['csstidy']['replace_colors']['slateblue'] = '#6a5acd';
-$GLOBALS['csstidy']['replace_colors']['slategray'] = '#708090';
-$GLOBALS['csstidy']['replace_colors']['snow'] = '#fffafa';
-$GLOBALS['csstidy']['replace_colors']['springgreen'] = '#00ff7f';
-$GLOBALS['csstidy']['replace_colors']['steelblue'] = '#4682b4';
-$GLOBALS['csstidy']['replace_colors']['tan'] = '#d2b48c';
-$GLOBALS['csstidy']['replace_colors']['thistle'] = '#d8bfd8';
-$GLOBALS['csstidy']['replace_colors']['tomato'] = '#ff6347';
-$GLOBALS['csstidy']['replace_colors']['turquoise'] = '#40e0d0';
-$GLOBALS['csstidy']['replace_colors']['violet'] = '#ee82ee';
-$GLOBALS['csstidy']['replace_colors']['violetred'] = '#d02090';
-$GLOBALS['csstidy']['replace_colors']['wheat'] = '#f5deb3';
-$GLOBALS['csstidy']['replace_colors']['whitesmoke'] = '#f5f5f5';
-$GLOBALS['csstidy']['replace_colors']['yellowgreen'] = '#9acd32';
+$data['csstidy']['replace_colors'] = array();
+$data['csstidy']['replace_colors']['aliceblue'] = '#f0f8ff';
+$data['csstidy']['replace_colors']['antiquewhite'] = '#faebd7';
+$data['csstidy']['replace_colors']['aquamarine'] = '#7fffd4';
+$data['csstidy']['replace_colors']['azure'] = '#f0ffff';
+$data['csstidy']['replace_colors']['beige'] = '#f5f5dc';
+$data['csstidy']['replace_colors']['bisque'] = '#ffe4c4';
+$data['csstidy']['replace_colors']['blanchedalmond'] = '#ffebcd';
+$data['csstidy']['replace_colors']['blueviolet'] = '#8a2be2';
+$data['csstidy']['replace_colors']['brown'] = '#a52a2a';
+$data['csstidy']['replace_colors']['burlywood'] = '#deb887';
+$data['csstidy']['replace_colors']['cadetblue'] = '#5f9ea0';
+$data['csstidy']['replace_colors']['chartreuse'] = '#7fff00';
+$data['csstidy']['replace_colors']['chocolate'] = '#d2691e';
+$data['csstidy']['replace_colors']['coral'] = '#ff7f50';
+$data['csstidy']['replace_colors']['cornflowerblue'] = '#6495ed';
+$data['csstidy']['replace_colors']['cornsilk'] = '#fff8dc';
+$data['csstidy']['replace_colors']['crimson'] = '#dc143c';
+$data['csstidy']['replace_colors']['cyan'] = '#00ffff';
+$data['csstidy']['replace_colors']['darkblue'] = '#00008b';
+$data['csstidy']['replace_colors']['darkcyan'] = '#008b8b';
+$data['csstidy']['replace_colors']['darkgoldenrod'] = '#b8860b';
+$data['csstidy']['replace_colors']['darkgray'] = '#a9a9a9';
+$data['csstidy']['replace_colors']['darkgreen'] = '#006400';
+$data['csstidy']['replace_colors']['darkkhaki'] = '#bdb76b';
+$data['csstidy']['replace_colors']['darkmagenta'] = '#8b008b';
+$data['csstidy']['replace_colors']['darkolivegreen'] = '#556b2f';
+$data['csstidy']['replace_colors']['darkorange'] = '#ff8c00';
+$data['csstidy']['replace_colors']['darkorchid'] = '#9932cc';
+$data['csstidy']['replace_colors']['darkred'] = '#8b0000';
+$data['csstidy']['replace_colors']['darksalmon'] = '#e9967a';
+$data['csstidy']['replace_colors']['darkseagreen'] = '#8fbc8f';
+$data['csstidy']['replace_colors']['darkslateblue'] = '#483d8b';
+$data['csstidy']['replace_colors']['darkslategray'] = '#2f4f4f';
+$data['csstidy']['replace_colors']['darkturquoise'] = '#00ced1';
+$data['csstidy']['replace_colors']['darkviolet'] = '#9400d3';
+$data['csstidy']['replace_colors']['deeppink'] = '#ff1493';
+$data['csstidy']['replace_colors']['deepskyblue'] = '#00bfff';
+$data['csstidy']['replace_colors']['dimgray'] = '#696969';
+$data['csstidy']['replace_colors']['dodgerblue'] = '#1e90ff';
+$data['csstidy']['replace_colors']['feldspar'] = '#d19275';
+$data['csstidy']['replace_colors']['firebrick'] = '#b22222';
+$data['csstidy']['replace_colors']['floralwhite'] = '#fffaf0';
+$data['csstidy']['replace_colors']['forestgreen'] = '#228b22';
+$data['csstidy']['replace_colors']['gainsboro'] = '#dcdcdc';
+$data['csstidy']['replace_colors']['ghostwhite'] = '#f8f8ff';
+$data['csstidy']['replace_colors']['gold'] = '#ffd700';
+$data['csstidy']['replace_colors']['goldenrod'] = '#daa520';
+$data['csstidy']['replace_colors']['greenyellow'] = '#adff2f';
+$data['csstidy']['replace_colors']['honeydew'] = '#f0fff0';
+$data['csstidy']['replace_colors']['hotpink'] = '#ff69b4';
+$data['csstidy']['replace_colors']['indianred'] = '#cd5c5c';
+$data['csstidy']['replace_colors']['indigo'] = '#4b0082';
+$data['csstidy']['replace_colors']['ivory'] = '#fffff0';
+$data['csstidy']['replace_colors']['khaki'] = '#f0e68c';
+$data['csstidy']['replace_colors']['lavender'] = '#e6e6fa';
+$data['csstidy']['replace_colors']['lavenderblush'] = '#fff0f5';
+$data['csstidy']['replace_colors']['lawngreen'] = '#7cfc00';
+$data['csstidy']['replace_colors']['lemonchiffon'] = '#fffacd';
+$data['csstidy']['replace_colors']['lightblue'] = '#add8e6';
+$data['csstidy']['replace_colors']['lightcoral'] = '#f08080';
+$data['csstidy']['replace_colors']['lightcyan'] = '#e0ffff';
+$data['csstidy']['replace_colors']['lightgoldenrodyellow'] = '#fafad2';
+$data['csstidy']['replace_colors']['lightgrey'] = '#d3d3d3';
+$data['csstidy']['replace_colors']['lightgreen'] = '#90ee90';
+$data['csstidy']['replace_colors']['lightpink'] = '#ffb6c1';
+$data['csstidy']['replace_colors']['lightsalmon'] = '#ffa07a';
+$data['csstidy']['replace_colors']['lightseagreen'] = '#20b2aa';
+$data['csstidy']['replace_colors']['lightskyblue'] = '#87cefa';
+$data['csstidy']['replace_colors']['lightslateblue'] = '#8470ff';
+$data['csstidy']['replace_colors']['lightslategray'] = '#778899';
+$data['csstidy']['replace_colors']['lightsteelblue'] = '#b0c4de';
+$data['csstidy']['replace_colors']['lightyellow'] = '#ffffe0';
+$data['csstidy']['replace_colors']['limegreen'] = '#32cd32';
+$data['csstidy']['replace_colors']['linen'] = '#faf0e6';
+$data['csstidy']['replace_colors']['magenta'] = '#ff00ff';
+$data['csstidy']['replace_colors']['mediumaquamarine'] = '#66cdaa';
+$data['csstidy']['replace_colors']['mediumblue'] = '#0000cd';
+$data['csstidy']['replace_colors']['mediumorchid'] = '#ba55d3';
+$data['csstidy']['replace_colors']['mediumpurple'] = '#9370d8';
+$data['csstidy']['replace_colors']['mediumseagreen'] = '#3cb371';
+$data['csstidy']['replace_colors']['mediumslateblue'] = '#7b68ee';
+$data['csstidy']['replace_colors']['mediumspringgreen'] = '#00fa9a';
+$data['csstidy']['replace_colors']['mediumturquoise'] = '#48d1cc';
+$data['csstidy']['replace_colors']['mediumvioletred'] = '#c71585';
+$data['csstidy']['replace_colors']['midnightblue'] = '#191970';
+$data['csstidy']['replace_colors']['mintcream'] = '#f5fffa';
+$data['csstidy']['replace_colors']['mistyrose'] = '#ffe4e1';
+$data['csstidy']['replace_colors']['moccasin'] = '#ffe4b5';
+$data['csstidy']['replace_colors']['navajowhite'] = '#ffdead';
+$data['csstidy']['replace_colors']['oldlace'] = '#fdf5e6';
+$data['csstidy']['replace_colors']['olivedrab'] = '#6b8e23';
+$data['csstidy']['replace_colors']['orangered'] = '#ff4500';
+$data['csstidy']['replace_colors']['orchid'] = '#da70d6';
+$data['csstidy']['replace_colors']['palegoldenrod'] = '#eee8aa';
+$data['csstidy']['replace_colors']['palegreen'] = '#98fb98';
+$data['csstidy']['replace_colors']['paleturquoise'] = '#afeeee';
+$data['csstidy']['replace_colors']['palevioletred'] = '#d87093';
+$data['csstidy']['replace_colors']['papayawhip'] = '#ffefd5';
+$data['csstidy']['replace_colors']['peachpuff'] = '#ffdab9';
+$data['csstidy']['replace_colors']['peru'] = '#cd853f';
+$data['csstidy']['replace_colors']['pink'] = '#ffc0cb';
+$data['csstidy']['replace_colors']['plum'] = '#dda0dd';
+$data['csstidy']['replace_colors']['powderblue'] = '#b0e0e6';
+$data['csstidy']['replace_colors']['rosybrown'] = '#bc8f8f';
+$data['csstidy']['replace_colors']['royalblue'] = '#4169e1';
+$data['csstidy']['replace_colors']['saddlebrown'] = '#8b4513';
+$data['csstidy']['replace_colors']['salmon'] = '#fa8072';
+$data['csstidy']['replace_colors']['sandybrown'] = '#f4a460';
+$data['csstidy']['replace_colors']['seagreen'] = '#2e8b57';
+$data['csstidy']['replace_colors']['seashell'] = '#fff5ee';
+$data['csstidy']['replace_colors']['sienna'] = '#a0522d';
+$data['csstidy']['replace_colors']['skyblue'] = '#87ceeb';
+$data['csstidy']['replace_colors']['slateblue'] = '#6a5acd';
+$data['csstidy']['replace_colors']['slategray'] = '#708090';
+$data['csstidy']['replace_colors']['snow'] = '#fffafa';
+$data['csstidy']['replace_colors']['springgreen'] = '#00ff7f';
+$data['csstidy']['replace_colors']['steelblue'] = '#4682b4';
+$data['csstidy']['replace_colors']['tan'] = '#d2b48c';
+$data['csstidy']['replace_colors']['thistle'] = '#d8bfd8';
+$data['csstidy']['replace_colors']['tomato'] = '#ff6347';
+$data['csstidy']['replace_colors']['turquoise'] = '#40e0d0';
+$data['csstidy']['replace_colors']['violet'] = '#ee82ee';
+$data['csstidy']['replace_colors']['violetred'] = '#d02090';
+$data['csstidy']['replace_colors']['wheat'] = '#f5deb3';
+$data['csstidy']['replace_colors']['whitesmoke'] = '#f5f5f5';
+$data['csstidy']['replace_colors']['yellowgreen'] = '#9acd32';
 
 /**
  * A list of all shorthand properties that are devided into four properties and/or have four subvalues
  *
- * @global array $GLOBALS['csstidy']['shorthands']
+ * @global array $data['csstidy']['shorthands']
  * @todo Are there new ones in CSS3?
  * @see dissolve_4value_shorthands()
  * @see merge_4value_shorthands()
  * @version 1.0
  */
-$GLOBALS['csstidy']['shorthands'] = array();
-$GLOBALS['csstidy']['shorthands']['border-color'] = array('border-top-color','border-right-color','border-bottom-color','border-left-color');
-$GLOBALS['csstidy']['shorthands']['border-style'] = array('border-top-style','border-right-style','border-bottom-style','border-left-style');
-$GLOBALS['csstidy']['shorthands']['border-width'] = array('border-top-width','border-right-width','border-bottom-width','border-left-width');
-$GLOBALS['csstidy']['shorthands']['margin'] = array('margin-top','margin-right','margin-bottom','margin-left');
-$GLOBALS['csstidy']['shorthands']['padding'] = array('padding-top','padding-right','padding-bottom','padding-left');
-$GLOBALS['csstidy']['shorthands']['-moz-border-radius'] = 0;
+$data['csstidy']['shorthands'] = array();
+$data['csstidy']['shorthands']['border-color'] = array('border-top-color','border-right-color','border-bottom-color','border-left-color');
+$data['csstidy']['shorthands']['border-style'] = array('border-top-style','border-right-style','border-bottom-style','border-left-style');
+$data['csstidy']['shorthands']['border-width'] = array('border-top-width','border-right-width','border-bottom-width','border-left-width');
+$data['csstidy']['shorthands']['margin'] = array('margin-top','margin-right','margin-bottom','margin-left');
+$data['csstidy']['shorthands']['padding'] = array('padding-top','padding-right','padding-bottom','padding-left');
+$data['csstidy']['shorthands']['-moz-border-radius'] = 0;
 
 /**
  * All CSS Properties. Needed for csstidy::property_is_next()
  *
- * @global array $GLOBALS['csstidy']['all_properties']
+ * @global array $data['csstidy']['all_properties']
  * @version 1.1
  * @see csstidy::property_is_next()
  */
-$GLOBALS['csstidy']['all_properties']['alignment-adjust'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['alignment-baseline'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-delay'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-direction'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-duration'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-iteration-count'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-name'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-play-state'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['animation-timing-function'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['appearance'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['azimuth'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['backface-visibility'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-attachment'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-clip'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-image'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-origin'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-position'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-repeat'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['background-size'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['baseline-shift'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['binding'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bleed'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bookmark-label'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bookmark-level'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bookmark-state'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bookmark-target'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-left-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-right-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-bottom-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-collapse'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-outset'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-repeat'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-slice'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-source'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-image-width'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-left-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-left-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-left-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-right-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-right-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-right-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-spacing'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-left-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-right-radius'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-top-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['border-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['bottom'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['box-decoration-break'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['box-shadow'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['box-sizing'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['break-after'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['break-before'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['break-inside'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['caption-side'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['clear'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['clip'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['color-profile'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-count'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-fill'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-gap'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-rule'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-rule-color'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-rule-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-rule-width'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-span'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['column-width'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['columns'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['content'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['counter-increment'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['counter-reset'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['crop'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['cue'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['cue-after'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['cue-before'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['cursor'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['direction'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['display'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['dominant-baseline'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-after-adjust'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-after-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-before-adjust'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-before-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-size'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['drop-initial-value'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['elevation'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['empty-cells'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['fit'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['fit-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-flow'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-line-pack'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-order'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['flex-pack'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['float'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['float-offset'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-family'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-size'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-size-adjust'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-stretch'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-variant'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['font-weight'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['grid-columns'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['grid-rows'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hanging-punctuation'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['height'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-after'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-before'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-character'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-lines'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphenate-resource'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['hyphens'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['icon'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['image-orientation'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['image-rendering'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['image-resolution'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['inline-box-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['left'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['letter-spacing'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-break'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-height'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-stacking'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-stacking-ruby'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-stacking-shift'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['line-stacking-strategy'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['list-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['list-style-image'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['list-style-position'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['list-style-type'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['margin-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marker-offset'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marks'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-direction'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-loop'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-play-count'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-speed'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['marquee-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['max-height'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['max-width'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['min-height'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['min-width'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['move-to'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-down'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-index'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-left'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-right'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['nav-up'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['opacity'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['orphans'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline-color'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline-offset'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline-style'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['outline-width'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow-wrap'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow-x'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['overflow-y'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['padding-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page-break-after'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page-break-before'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page-break-inside'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['page-policy'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pause'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pause-after'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pause-before'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['perspective'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['perspective-origin'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['phonemes'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pitch'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['pitch-range'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['play-during'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['position'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['presentation-level'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['punctuation-trim'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['quotes'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rendering-intent'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['resize'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rest'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rest-after'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rest-before'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['richness'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['right'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rotation'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['rotation-point'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['ruby-align'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['ruby-overhang'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['ruby-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['ruby-span'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['size'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speak'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speak-header'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speak-numeral'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speak-punctuation'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['speech-rate'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['src'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['stress'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['string-set'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['tab-size'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['table-layout'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['target'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['target-name'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['target-new'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['target-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-align'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-align-last'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration-color'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration-line'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration-skip'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-decoration-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-emphasis'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-emphasis-color'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-emphasis-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-emphasis-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-height'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-indent'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-justify'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-outline'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-shadow'] = 'CSS2.0,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-space-collapse'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-transform'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-underline-position'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['text-wrap'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['top'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transform'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transform-origin'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transform-style'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition-delay'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition-duration'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition-property'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['transition-timing-function'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['unicode-bidi'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['vertical-align'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['visibility'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-balance'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-duration'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-family'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-pitch'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-pitch-range'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-rate'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-stress'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['voice-volume'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['volume'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['white-space'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['widows'] = 'CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['word-break'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['word-spacing'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
-$GLOBALS['csstidy']['all_properties']['word-wrap'] = 'CSS3.0';
-$GLOBALS['csstidy']['all_properties']['z-index'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['alignment-adjust'] = 'CSS3.0';
+$data['csstidy']['all_properties']['alignment-baseline'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-delay'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-direction'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-duration'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-iteration-count'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-name'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-play-state'] = 'CSS3.0';
+$data['csstidy']['all_properties']['animation-timing-function'] = 'CSS3.0';
+$data['csstidy']['all_properties']['appearance'] = 'CSS3.0';
+$data['csstidy']['all_properties']['azimuth'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['backface-visibility'] = 'CSS3.0';
+$data['csstidy']['all_properties']['background'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-attachment'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-clip'] = 'CSS3.0';
+$data['csstidy']['all_properties']['background-color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-image'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-origin'] = 'CSS3.0';
+$data['csstidy']['all_properties']['background-position'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-repeat'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['background-size'] = 'CSS3.0';
+$data['csstidy']['all_properties']['baseline-shift'] = 'CSS3.0';
+$data['csstidy']['all_properties']['binding'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bleed'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bookmark-label'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bookmark-level'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bookmark-state'] = 'CSS3.0';
+$data['csstidy']['all_properties']['bookmark-target'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-left-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-right-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-bottom-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-collapse'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-image'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-outset'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-repeat'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-slice'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-source'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-image-width'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-left-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-left-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-left-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-right-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-right-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-right-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-spacing'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-top-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-top-left-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-top-right-radius'] = 'CSS3.0';
+$data['csstidy']['all_properties']['border-top-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-top-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['border-width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['bottom'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['box-decoration-break'] = 'CSS3.0';
+$data['csstidy']['all_properties']['box-shadow'] = 'CSS3.0';
+$data['csstidy']['all_properties']['box-sizing'] = 'CSS3.0';
+$data['csstidy']['all_properties']['break-after'] = 'CSS3.0';
+$data['csstidy']['all_properties']['break-before'] = 'CSS3.0';
+$data['csstidy']['all_properties']['break-inside'] = 'CSS3.0';
+$data['csstidy']['all_properties']['caption-side'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['clear'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['clip'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['color'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['color-profile'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-count'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-fill'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-gap'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-rule'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-rule-color'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-rule-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-rule-width'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-span'] = 'CSS3.0';
+$data['csstidy']['all_properties']['column-width'] = 'CSS3.0';
+$data['csstidy']['all_properties']['columns'] = 'CSS3.0';
+$data['csstidy']['all_properties']['content'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['counter-increment'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['counter-reset'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['crop'] = 'CSS3.0';
+$data['csstidy']['all_properties']['cue'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['cue-after'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['cue-before'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['cursor'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['direction'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['display'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['dominant-baseline'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-after-adjust'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-after-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-before-adjust'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-before-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-size'] = 'CSS3.0';
+$data['csstidy']['all_properties']['drop-initial-value'] = 'CSS3.0';
+$data['csstidy']['all_properties']['elevation'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['empty-cells'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['fit'] = 'CSS3.0';
+$data['csstidy']['all_properties']['fit-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-flow'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-line-pack'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-order'] = 'CSS3.0';
+$data['csstidy']['all_properties']['flex-pack'] = 'CSS3.0';
+$data['csstidy']['all_properties']['float'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['float-offset'] = 'CSS3.0';
+$data['csstidy']['all_properties']['font'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-family'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-size'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-size-adjust'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['font-stretch'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['font-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-variant'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['font-weight'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['grid-columns'] = 'CSS3.0';
+$data['csstidy']['all_properties']['grid-rows'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hanging-punctuation'] = 'CSS3.0';
+$data['csstidy']['all_properties']['height'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-after'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-before'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-character'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-lines'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphenate-resource'] = 'CSS3.0';
+$data['csstidy']['all_properties']['hyphens'] = 'CSS3.0';
+$data['csstidy']['all_properties']['icon'] = 'CSS3.0';
+$data['csstidy']['all_properties']['image-orientation'] = 'CSS3.0';
+$data['csstidy']['all_properties']['image-rendering'] = 'CSS3.0';
+$data['csstidy']['all_properties']['image-resolution'] = 'CSS3.0';
+$data['csstidy']['all_properties']['inline-box-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['left'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['letter-spacing'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['line-break'] = 'CSS3.0';
+$data['csstidy']['all_properties']['line-height'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['line-stacking'] = 'CSS3.0';
+$data['csstidy']['all_properties']['line-stacking-ruby'] = 'CSS3.0';
+$data['csstidy']['all_properties']['line-stacking-shift'] = 'CSS3.0';
+$data['csstidy']['all_properties']['line-stacking-strategy'] = 'CSS3.0';
+$data['csstidy']['all_properties']['list-style'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['list-style-image'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['list-style-position'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['list-style-type'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['margin-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['marker-offset'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['marks'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['marquee-direction'] = 'CSS3.0';
+$data['csstidy']['all_properties']['marquee-loop'] = 'CSS3.0';
+$data['csstidy']['all_properties']['marquee-play-count'] = 'CSS3.0';
+$data['csstidy']['all_properties']['marquee-speed'] = 'CSS3.0';
+$data['csstidy']['all_properties']['marquee-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['max-height'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['max-width'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['min-height'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['min-width'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['move-to'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-down'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-index'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-left'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-right'] = 'CSS3.0';
+$data['csstidy']['all_properties']['nav-up'] = 'CSS3.0';
+$data['csstidy']['all_properties']['opacity'] = 'CSS3.0';
+$data['csstidy']['all_properties']['orphans'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['outline'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['outline-color'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['outline-offset'] = 'CSS3.0';
+$data['csstidy']['all_properties']['outline-style'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['outline-width'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['overflow'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['overflow-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['overflow-wrap'] = 'CSS3.0';
+$data['csstidy']['all_properties']['overflow-x'] = 'CSS3.0';
+$data['csstidy']['all_properties']['overflow-y'] = 'CSS3.0';
+$data['csstidy']['all_properties']['padding'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['padding-bottom'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['padding-left'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['padding-right'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['padding-top'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['page'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['page-break-after'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['page-break-before'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['page-break-inside'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['page-policy'] = 'CSS3.0';
+$data['csstidy']['all_properties']['pause'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['pause-after'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['pause-before'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['perspective'] = 'CSS3.0';
+$data['csstidy']['all_properties']['perspective-origin'] = 'CSS3.0';
+$data['csstidy']['all_properties']['phonemes'] = 'CSS3.0';
+$data['csstidy']['all_properties']['pitch'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['pitch-range'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['play-during'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['position'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['presentation-level'] = 'CSS3.0';
+$data['csstidy']['all_properties']['punctuation-trim'] = 'CSS3.0';
+$data['csstidy']['all_properties']['quotes'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['rendering-intent'] = 'CSS3.0';
+$data['csstidy']['all_properties']['resize'] = 'CSS3.0';
+$data['csstidy']['all_properties']['rest'] = 'CSS3.0';
+$data['csstidy']['all_properties']['rest-after'] = 'CSS3.0';
+$data['csstidy']['all_properties']['rest-before'] = 'CSS3.0';
+$data['csstidy']['all_properties']['richness'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['right'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['rotation'] = 'CSS3.0';
+$data['csstidy']['all_properties']['rotation-point'] = 'CSS3.0';
+$data['csstidy']['all_properties']['ruby-align'] = 'CSS3.0';
+$data['csstidy']['all_properties']['ruby-overhang'] = 'CSS3.0';
+$data['csstidy']['all_properties']['ruby-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['ruby-span'] = 'CSS3.0';
+$data['csstidy']['all_properties']['size'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['speak'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['speak-header'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['speak-numeral'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['speak-punctuation'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['speech-rate'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['src'] = 'CSS3.0';
+$data['csstidy']['all_properties']['stress'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['string-set'] = 'CSS3.0';
+$data['csstidy']['all_properties']['tab-size'] = 'CSS3.0';
+$data['csstidy']['all_properties']['table-layout'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['target'] = 'CSS3.0';
+$data['csstidy']['all_properties']['target-name'] = 'CSS3.0';
+$data['csstidy']['all_properties']['target-new'] = 'CSS3.0';
+$data['csstidy']['all_properties']['target-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-align'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['text-align-last'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-decoration'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['text-decoration-color'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-decoration-line'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-decoration-skip'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-decoration-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-emphasis'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-emphasis-color'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-emphasis-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-emphasis-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-height'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-indent'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['text-justify'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-outline'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-shadow'] = 'CSS2.0,CSS3.0';
+$data['csstidy']['all_properties']['text-space-collapse'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-transform'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['text-underline-position'] = 'CSS3.0';
+$data['csstidy']['all_properties']['text-wrap'] = 'CSS3.0';
+$data['csstidy']['all_properties']['top'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['transform'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transform-origin'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transform-style'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition-delay'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition-duration'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition-property'] = 'CSS3.0';
+$data['csstidy']['all_properties']['transition-timing-function'] = 'CSS3.0';
+$data['csstidy']['all_properties']['unicode-bidi'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['vertical-align'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['visibility'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['voice-balance'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-duration'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-family'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['voice-pitch'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-pitch-range'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-rate'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-stress'] = 'CSS3.0';
+$data['csstidy']['all_properties']['voice-volume'] = 'CSS3.0';
+$data['csstidy']['all_properties']['volume'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['white-space'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['widows'] = 'CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['width'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['word-break'] = 'CSS3.0';
+$data['csstidy']['all_properties']['word-spacing'] = 'CSS1.0,CSS2.0,CSS2.1,CSS3.0';
+$data['csstidy']['all_properties']['word-wrap'] = 'CSS3.0';
+$data['csstidy']['all_properties']['z-index'] = 'CSS2.0,CSS2.1,CSS3.0';
 
 /**
  * An array containing all properties that can accept a quoted string as a value.
  *
- * @global array $GLOBALS['csstidy']['quoted_string_properties']
+ * @global array $data['csstidy']['quoted_string_properties']
  */
-$GLOBALS['csstidy']['quoted_string_properties'] = array('content', 'font-family', 'quotes');
+$data['csstidy']['quoted_string_properties'] = array('content', 'font-family', 'quotes');
 
 /**
  * An array containing all properties that can be defined multiple times without being overwritten.
  *
- * @global array $GLOBALS['csstidy']['quoted_string_properties']
+ * @global array $data['csstidy']['quoted_string_properties']
  */
-$GLOBALS['csstidy']['multiple_properties'] = array('background', 'background-image');
+$data['csstidy']['multiple_properties'] = array('background', 'background-image');
 
 /**
  * An array containing all predefined templates.
  *
- * @global array $GLOBALS['csstidy']['predefined_templates']
+ * @global array $data['csstidy']['predefined_templates']
  * @version 1.0
  * @see csstidy::load_template()
  */
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ''; //string before @rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ' {'."\n"; //bracket after @-rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ''; //string before selector
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ' {'."\n"; //bracket after selector
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ''; //string before property
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ''; //string after property+before value
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ';'."\n"; //string after value
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '}'; //closing bracket - selector
-$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n\n"; //space between blocks {...}
-$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n".'}'. "\n\n"; //closing bracket @-rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ''; //indent in @-rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ''; // before comment
-$GLOBALS['csstidy']['predefined_templates']['default'][] = ''."\n"; // after comment
-$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n"; // after each line @-rule
+$data['csstidy']['predefined_templates']['default'][] = ''; //string before @rule
+$data['csstidy']['predefined_templates']['default'][] = ' {'."\n"; //bracket after @-rule
+$data['csstidy']['predefined_templates']['default'][] = ''; //string before selector
+$data['csstidy']['predefined_templates']['default'][] = ' {'."\n"; //bracket after selector
+$data['csstidy']['predefined_templates']['default'][] = ''; //string before property
+$data['csstidy']['predefined_templates']['default'][] = ''; //string after property+before value
+$data['csstidy']['predefined_templates']['default'][] = ';'."\n"; //string after value
+$data['csstidy']['predefined_templates']['default'][] = '}'; //closing bracket - selector
+$data['csstidy']['predefined_templates']['default'][] = "\n\n"; //space between blocks {...}
+$data['csstidy']['predefined_templates']['default'][] = "\n".'}'. "\n\n"; //closing bracket @-rule
+$data['csstidy']['predefined_templates']['default'][] = ''; //indent in @-rule
+$data['csstidy']['predefined_templates']['default'][] = ''; // before comment
+$data['csstidy']['predefined_templates']['default'][] = ''."\n"; // after comment
+$data['csstidy']['predefined_templates']['default'][] = "\n"; // after each line @-rule
 
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = ' {'."\n";
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '{';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = ';';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '}';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n";
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n". '}'."\n".'';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = ''; // before comment
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = ''; // after comment
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n";
+$data['csstidy']['predefined_templates']['high_compression'][] = '';
+$data['csstidy']['predefined_templates']['high_compression'][] = ' {'."\n";
+$data['csstidy']['predefined_templates']['high_compression'][] = '';
+$data['csstidy']['predefined_templates']['high_compression'][] = '{';
+$data['csstidy']['predefined_templates']['high_compression'][] = '';
+$data['csstidy']['predefined_templates']['high_compression'][] = '';
+$data['csstidy']['predefined_templates']['high_compression'][] = ';';
+$data['csstidy']['predefined_templates']['high_compression'][] = '}';
+$data['csstidy']['predefined_templates']['high_compression'][] = "\n";
+$data['csstidy']['predefined_templates']['high_compression'][] = "\n". '}'."\n".'';
+$data['csstidy']['predefined_templates']['high_compression'][] = '';
+$data['csstidy']['predefined_templates']['high_compression'][] = ''; // before comment
+$data['csstidy']['predefined_templates']['high_compression'][] = ''; // after comment
+$data['csstidy']['predefined_templates']['high_compression'][] = "\n";
 
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '{';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '{';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = ';';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '}';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '}';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = ''; // before comment
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = ''; // after comment
-$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '{';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '{';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = ';';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '}';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '}';
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
+$data['csstidy']['predefined_templates']['highest_compression'][] = ''; // before comment
+$data['csstidy']['predefined_templates']['highest_compression'][] = ''; // after comment
+$data['csstidy']['predefined_templates']['highest_compression'][] = '';
 
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = ' {'."\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = ''."\n".'{'."\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '	';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = ';'."\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '}';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n".'}'."\n\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '	';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = ''; // before comment
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = ''."\n"; // after comment
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '';
+$data['csstidy']['predefined_templates']['low_compression'][] = ' {'."\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '';
+$data['csstidy']['predefined_templates']['low_compression'][] = ''."\n".'{'."\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '	';
+$data['csstidy']['predefined_templates']['low_compression'][] = '';
+$data['csstidy']['predefined_templates']['low_compression'][] = ';'."\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '}';
+$data['csstidy']['predefined_templates']['low_compression'][] = "\n\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = "\n".'}'."\n\n";
+$data['csstidy']['predefined_templates']['low_compression'][] = '	';
+$data['csstidy']['predefined_templates']['low_compression'][] = ''; // before comment
+$data['csstidy']['predefined_templates']['low_compression'][] = ''."\n"; // after comment
+$data['csstidy']['predefined_templates']['low_compression'][] = "\n";
diff --git a/www/plugins-dist/compresseur/lib/csstidy/template.tpl b/www/plugins-dist/compresseur/lib/csstidy/template.tpl
deleted file mode 100644
index 731985ee..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/template.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-| {
-|| {
-|||;
-|}|
-
-|
-}
-
-|||
-|
diff --git a/www/plugins-dist/compresseur/lib/csstidy/template1.tpl b/www/plugins-dist/compresseur/lib/csstidy/template1.tpl
deleted file mode 100644
index 2f6cd4d0..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/template1.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-| {
-||
-{
-|	||;
-|}|
-
-|
-
-}
-
-|	||
-|
diff --git a/www/plugins-dist/compresseur/lib/csstidy/template2.tpl b/www/plugins-dist/compresseur/lib/csstidy/template2.tpl
deleted file mode 100644
index dc2903c6..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/template2.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-| {
-||{|||;|}|
-|
-}
-||||
diff --git a/www/plugins-dist/compresseur/lib/csstidy/template3.tpl b/www/plugins-dist/compresseur/lib/csstidy/template3.tpl
deleted file mode 100644
index ac752c9f..00000000
--- a/www/plugins-dist/compresseur/lib/csstidy/template3.tpl
+++ /dev/null
@@ -1 +0,0 @@
-|{||{|||;|}||}||||
\ No newline at end of file
diff --git a/www/plugins-dist/compresseur/paquet.xml b/www/plugins-dist/compresseur/paquet.xml
index 3bb9d721..81b16c87 100644
--- a/www/plugins-dist/compresseur/paquet.xml
+++ b/www/plugins-dist/compresseur/paquet.xml
@@ -1,7 +1,7 @@
 
diff --git a/www/plugins-dist/forum/paquet.xml b/www/plugins-dist/forum/paquet.xml
index fbbf4b03..84473332 100644
--- a/www/plugins-dist/forum/paquet.xml
+++ b/www/plugins-dist/forum/paquet.xml
@@ -1,7 +1,7 @@
 
 				[(#ENV{repondre,'oui'}|=={non}|non)
-				[
<:forum:repondre_message:>
]
+					[(#AUTORISER{participerforumprive,#OBJET,#ID_OBJET}|oui)
+						[
<:forum:repondre_message:>
]
+					]
 				]
 			
 		
diff --git a/www/plugins-dist/forum/prive/objets/liste/participer_forum_thread.html b/www/plugins-dist/forum/prive/objets/liste/participer_forum_thread.html
index d46870aa..80185a42 100644
--- a/www/plugins-dist/forum/prive/objets/liste/participer_forum_thread.html
+++ b/www/plugins-dist/forum/prive/objets/liste/participer_forum_thread.html
@@ -39,7 +39,9 @@ la premiere fois qu'un message est poste (cf. inc/invalideur). ]
 				})]
 				
 
-				[
<:forum:repondre_message:>
]
+				[(#AUTORISER{participerforumprive,#OBJET,#ID_OBJET}|oui)
+					[
<:forum:repondre_message:>
]
+				]
 			
 		
 
@@ -73,7 +75,9 @@ la premiere fois qu'un message est poste (cf. inc/invalideur). ]
 				
 
 
-						[
<:forum:repondre_message:>
]
+						[(#AUTORISER{participerforumprive,#OBJET,#ID_OBJET}|oui)
+							[
<:forum:repondre_message:>
]
+						]
 					
 				
 
diff --git a/www/plugins-dist/forum/prive/squelettes/inclure/discuter_forum.html b/www/plugins-dist/forum/prive/squelettes/inclure/discuter_forum.html
index 3e56b716..852f980f 100644
--- a/www/plugins-dist/forum/prive/squelettes/inclure/discuter_forum.html
+++ b/www/plugins-dist/forum/prive/squelettes/inclure/discuter_forum.html
@@ -1,9 +1,10 @@
 [(#ENV{repondre}|oui)
 [(#INCLURE{fond=prive/repondre_forum, env})]
 ][(#ENV{repondre}|non)
-
-[(#SELF|parametre_url{repondre,new}|icone{<:forum:icone_poster_message:>,#STATUT|=={privadm}|?{forum-interne-24.png,forum-interne-24.png},#LANG_RIGHT,'',ajax})
-

-]
-[(#INCLURE{fond=prive/objets/liste/participer_forum_thread, env})]
+	[(#AUTORISER{participerforumprive,#ENV{objet},#ENV{id_objet}}|oui)
+		[(#SELF|parametre_url{repondre,new}|icone{<:forum:icone_poster_message:>,#STATUT|=={privadm}|?{forum-interne-24.png,forum-interne-24.png},#LANG_RIGHT,'',ajax})
+		

+		]
+	]
+	[(#INCLURE{fond=prive/objets/liste/participer_forum_thread, env})]
 ]
\ No newline at end of file
diff --git a/www/plugins-dist/medias/modeles/image.html b/www/plugins-dist/medias/modeles/image.html
index 4d7183f9..2cd9ba70 100644
--- a/www/plugins-dist/medias/modeles/image.html
+++ b/www/plugins-dist/medias/modeles/image.html
@@ -6,10 +6,11 @@
 [
 	][(#TITRE|attribut_html)][(#ENV{lien}|?{})]
+		class="(#ENV{lien_class})"]>][(#TITRE|attribut_html)][(#ENV{lien}|?{})]
 ][
 
 (#REM) Cas  : on est appele ici avec emb=' ' : on veut la legende
diff --git a/www/plugins-dist/medias/paquet.xml b/www/plugins-dist/medias/paquet.xml
index 5c864857..3a78e07c 100644
--- a/www/plugins-dist/medias/paquet.xml
+++ b/www/plugins-dist/medias/paquet.xml
@@ -1,7 +1,7 @@
 
 	
 	
-	
-
\ No newline at end of file
+	
+
diff --git a/www/plugins-dist/organiseur/prive/rss/messages.html b/www/plugins-dist/organiseur/prive/rss/messages.html
index a910c0cf..a080da92 100644
--- a/www/plugins-dist/organiseur/prive/rss/messages.html
+++ b/www/plugins-dist/organiseur/prive/rss/messages.html
@@ -8,7 +8,7 @@ if ([(#ID_AUTEUR|securiser_acces{#ENV{cle},rss, #ENV{op}, #ENV{args}}|?{1,0})])
 	[(#URL_ECRIRE{messages}|url_absolue|texte_backend)]
 	
 	#LANG
-
 
diff --git a/www/plugins-dist/porte_plume/tests/all_tests.php b/www/plugins-dist/porte_plume/tests/all_tests.php
index 31ce28f7..4e1fda57 100644
--- a/www/plugins-dist/porte_plume/tests/all_tests.php
+++ b/www/plugins-dist/porte_plume/tests/all_tests.php
@@ -2,11 +2,11 @@
 require_once('lanceur_spip.php');
 
 class AllTests_barre_outil_markitup extends SpipTestSuite {
-    function AllTests_barre_outil_markitup() {
-        $this->SpipTestSuite('Barre MarkitUp');
+	function AllTests_barre_outil_markitup() {
+		$this->SpipTestSuite('Barre MarkitUp');
 		$this->addDir(__FILE__);
-        #$this->addFile(find_in_path('tests/barre_outil_markitup.php'));
-    }
+		#$this->addFile(find_in_path('tests/barre_outil_markitup.php'));
+	}
 }
 
 ?>
diff --git a/www/plugins-dist/porte_plume/tests/barre_outil_markitup.php b/www/plugins-dist/porte_plume/tests/barre_outil_markitup.php
index f11d4650..7b4c231d 100644
--- a/www/plugins-dist/porte_plume/tests/barre_outil_markitup.php
+++ b/www/plugins-dist/porte_plume/tests/barre_outil_markitup.php
@@ -7,16 +7,17 @@
 require_once('lanceur_spip.php');
 
 class Test_barre_outil_markitup extends SpipTest{
-	
+
 	var $baseParamsBarre = array();
 	var $baseParamsBarreEtendue = array();
-	
-	function Test_barre_outil_markitup() {
 
-		$this->SpipTest("Test de la classe Barre_outils");
+	function __construct() {
+
+		parent::__construct("Test de la classe Barre_outils");
 
 		// instancier une barre d'outil
 		include_spip('porte_plume_fonctions');
+
 		$this->baseParamsBarre = array(
 			'nameSpace'    => 'spip',
 			'markupSet'    => array(
@@ -68,17 +69,18 @@ class Test_barre_outil_markitup extends SpipTest{
 		);
 		$this->baseParamsBarreEtendue = $p;
 	}
-	
+
 	// avant chaque appel de fonction test
 	function setUp() {
 
-    }
-    // apres chaque appel de fonction test
-    function tearDown() {
-        
-    }
+	}
+
+	// apres chaque appel de fonction test
+	function tearDown() {
+
+	}
+
 
-	
 	function testInitialisationBarre(){
 		// parametres inseres a leur bonne place
 		$b = new Barre_outils($this->baseParamsBarre);
@@ -86,7 +88,7 @@ class Test_barre_outil_markitup extends SpipTest{
 		$this->assertEqual('header1', $b->markupSet[0]['id']);
 		$this->assertEqual(7, count($b->markupSet[0]));
 	}
-	
+
 	function testInitialisationBarreEtendue(){	
 		// parametres inseres a leur bonne place,
 		// meme quand il y a des sous-menu d'icones
@@ -97,18 +99,23 @@ class Test_barre_outil_markitup extends SpipTest{
 		$this->assertEqual('couleurs', $b->markupSet[1]['id']);	
 		$this->assertEqual(3, count($b->markupSet[1]['dropMenu']));	
 	}
-	
+
 	function testOptionsIncorrectesNonIncluses(){
 		$p = $this->baseParamsBarre;
 		$p['fausseVariable'] = "je ne dois pas m'installer";
 		$p['markupSet'][0]['fauxParam'] = "je ne dois pas m'installer";
 		$b = new Barre_outils($p);
-		$this->assertEqual('spip',$b->nameSpace);
-		$this->assertNull($b->fausseVariable);
-		$this->assertNull($b->markupSet[0]['fauxParam']);
+		$this->assertEqual('spip', $b->nameSpace);
+
+		$this->expectError(new PatternExpectation("/Undefined property: Barre_outils::\\\$fausseVariable/i"));
+		$b->fausseVariable;
+
+		$this->expectError(new PatternExpectation("/Undefined index: fauxParam/i"));
+		$b->markupSet[0]['fauxParam'];
+
 		$this->assertEqual(7, count($b->markupSet[0]));
 	}
-	
+
 	function testRecuperationDeParametreAvecGet(){
 		// trouver des id de premier niveau
 		$p = $this->baseParamsBarre;
@@ -120,40 +127,40 @@ class Test_barre_outil_markitup extends SpipTest{
 		$b = new Barre_outils($p);
 		$this->assertEqual($b->get('header1'), $p['markupSet'][0]);
 		$this->assertEqual($b->get('couleurs'), $p['markupSet'][1]);
-		$this->assertEqual($b->get('couleur_jaune'), $p['markupSet'][1]['dropMenu'][0]);		
-		$this->assertEqual($b->get('couleur_orange'), $p['markupSet'][1]['dropMenu'][1]);		
+		$this->assertEqual($b->get('couleur_jaune'), $p['markupSet'][1]['dropMenu'][0]);
+		$this->assertEqual($b->get('couleur_orange'), $p['markupSet'][1]['dropMenu'][1]);
 		$this->assertEqual($b->get('couleur_rouge'), $p['markupSet'][1]['dropMenu'][2]);
-		
+
 		// ne pas trouver d'id inconnu
 		$this->assertFalse($b->get('je_nexiste_pas'));
 	}
-	
+
 	function testModificationDeParametresAvecSet(){
 		$p = $this->baseParamsBarre;
 		$b = new Barre_outils($p);
 		$p['markupSet'][0]['name'] = 'New';
 		$r = $p['markupSet'][0];
 		$x = $b->set('header1', array("name"=>"New"));
-		
+
 		$this->assertEqual($r, $x); // set retourne la chaine modifiee complete
 		$this->assertEqual($r, $b->get('header1'));
-		
+
 		// on ne peut ajouter de mauvais parametres
 		$x = $b->set('header1', array("Je Suis Pas Bon"=>"No no no"));
 		$this->assertEqual($r, $x); // set retourne la chaine modifiee complete
 		$this->assertEqual($r, $b->get('header1'));		
 	}
-	
+
 	function testAjoutDeParametresApres(){
 		$b = new Barre_outils($this->baseParamsBarre);
 		$p = $this->baseParamsBarreEtendue;
-		
+
 		// ajoutons la couleur apres
 		$b->ajouterApres('header1',$p['markupSet'][1]);
 		$this->assertEqual(2, count($b->markupSet)); // 2 boutons de premier niveau maintenant
 		$this->assertEqual($b->get('couleurs'), $p['markupSet'][1]); // get renvoie bien le bon ajout
 		$this->assertEqual($b->markupSet[1], $p['markupSet'][1]); // et l'ajout est au bon endroit
-		
+
 			// ajoutons une couleur dans l'ajout
 			$coul = $p['markupSet'][1]['dropMenu'][0];
 			$coul['id'] = 'couleur_violette';
@@ -161,7 +168,7 @@ class Test_barre_outil_markitup extends SpipTest{
 			$this->assertEqual(4, count($b->markupSet[1]['dropMenu'])); // sous boutons
 			$this->assertEqual($b->get('couleur_violette'), $coul);
 			$this->assertEqual($b->markupSet[1]['dropMenu'][2], $coul); // insertion au bon endroit
-			
+
 		// ajoutons un header2 encore apres
 		$p['markupSet'][0]['id'] = 'header2';
 		$b->ajouterApres('couleurs',$p['markupSet'][0]);
@@ -169,17 +176,17 @@ class Test_barre_outil_markitup extends SpipTest{
 		$this->assertEqual($b->get('header2'), $p['markupSet'][0]);
 		$this->assertEqual($b->markupSet[2], $p['markupSet'][0]);
 	}
-	
+
 	function testAjoutDeParametresAvant(){
 		$b = new Barre_outils($this->baseParamsBarre);
 		$p = $this->baseParamsBarreEtendue;
-		
+
 		// ajoutons la couleur apres
 		$b->ajouterAvant('header1',$p['markupSet'][1]);
 		$this->assertEqual(2, count($b->markupSet)); // 2 boutons de premier niveau maintenant
 		$this->assertEqual($b->get('couleurs'), $p['markupSet'][1]); // get renvoie bien le bon ajout
 		$this->assertEqual($b->markupSet[0], $p['markupSet'][1]); // et l'ajout est au bon endroit
-		
+
 			// ajoutons une couleur dans l'ajout
 			$coul = $p['markupSet'][1]['dropMenu'][0];
 			$coul['id'] = 'couleur_violette';
@@ -187,7 +194,7 @@ class Test_barre_outil_markitup extends SpipTest{
 			$this->assertEqual(4, count($b->markupSet[0]['dropMenu'])); // sous boutons
 			$this->assertEqual($b->get('couleur_violette'), $coul);
 			$this->assertEqual($b->markupSet[0]['dropMenu'][1], $coul); // insertion au bon endroit
-					
+
 		// ajoutons un header2 avant le 1
 		$p['markupSet'][0]['id'] = 'header2';
 		$b->ajouterAvant('header1',$p['markupSet'][0]);
@@ -195,7 +202,7 @@ class Test_barre_outil_markitup extends SpipTest{
 		$this->assertEqual($b->get('header2'), $p['markupSet'][0]);
 		$this->assertEqual($b->markupSet[1], $p['markupSet'][0]);
 	}
-	
+
 	function testAfficherEtCacher(){
 		$b = new Barre_outils($this->baseParamsBarre);
 		$b->cacher('header1');
@@ -203,47 +210,47 @@ class Test_barre_outil_markitup extends SpipTest{
 		$b->afficher('header1');
 		$this->assertTrue($b->markupSet[0]['display']);
 	}
-	
+
 	function testAfficherEtCacherTout(){
 		$b = new Barre_outils($this->baseParamsBarreEtendue);
 		$b->cacherTout();
 		$this->assertFalse($b->markupSet[0]['display']);
 		$this->assertFalse($b->markupSet[1]['dropMenu'][0]['display']);
-		
+
 		$b->afficherTout();
 		$this->assertTrue($b->markupSet[0]['display']);
 		$this->assertTrue($b->markupSet[1]['dropMenu'][0]['display']);
 	}
-	
+
 	function testAfficherEtCacherPlusieursBoutons(){
 		$b = new Barre_outils($this->baseParamsBarreEtendue);
 		$b->cacher(array('header1','couleur_jaune'));
 		$this->assertFalse($b->markupSet[0]['display']);
 		$this->assertFalse($b->markupSet[1]['dropMenu'][0]['display']);
 		$this->assertTrue($b->markupSet[1]['dropMenu'][1]['display']);
-		
+
 		$b->cacherTout();
 		$b->afficher(array('header1','couleur_jaune'));
 		$this->assertTrue($b->markupSet[0]['display']);
 		$this->assertTrue($b->markupSet[1]['dropMenu'][0]['display']);
 		$this->assertFalse($b->markupSet[1]['dropMenu'][1]['display']);
 	}
-	
+
 	function testSetAvecIdVideNeDoitRienModifier(){
 		$b = new Barre_outils($this->baseParamsBarreEtendue);
 		$b->set(array(),array('display'=>false));	
 		$this->assertTrue($b->markupSet[0]['display']);
-		$this->assertTrue($b->markupSet[1]['dropMenu'][0]['display']);		
+		$this->assertTrue($b->markupSet[1]['dropMenu'][0]['display']);
 	}
-	
+
 	function testSetAvecIdArrayDoitModifTousLesIds(){
 		$b = new Barre_outils($this->baseParamsBarreEtendue);
-		$b->set(array('header1','couleur_jaune'),array('display'=>false));	
+		$b->set(array('header1','couleur_jaune'),array('display'=>false));
 		$this->assertFalse($b->markupSet[0]['display']);
 		$this->assertFalse($b->markupSet[1]['dropMenu'][0]['display']);
-		$this->assertTrue($b->markupSet[1]['dropMenu'][1]['display']);			
-	}	
-	
+		$this->assertTrue($b->markupSet[1]['dropMenu'][1]['display']);
+	}
+
 	function testCreerJson(){
 		$b = new Barre_outils($this->baseParamsBarre);
 		$b->ajouterApres('header1', array(
@@ -258,7 +265,7 @@ class Test_barre_outil_markitup extends SpipTest{
 		$this->assertPattern(',\[{"name":",',$json);
 		$this->assertNoPattern(',eacute;,',$json);
 	}
-	
+
 	function testBoutonsDUneLangue(){
 		$b = new Barre_outils($this->baseParamsBarre);
 		$ico2 = $ico1 = array(
@@ -276,7 +283,7 @@ class Test_barre_outil_markitup extends SpipTest{
 		$b->ajouterApres('ico_fr1', $ico2);
 		$this->assertEqual($ico1, $b->get('ico_fr1'));
 		$this->assertEqual($ico2, $b->get('ico_fr2'));
-		
+
 		// verifier que ces nouveaux array()
 		// ne posent pas de problemes dans les recursions
 		$b->cacherTout();
@@ -286,13 +293,13 @@ class Test_barre_outil_markitup extends SpipTest{
 		$b->cacherTout();
 		$b->afficher(array('ico_fr1','ico_fr2'));
 		$this->assertTrue($b->markupSet[1]['display']);	
-		
+
 		// la langue est bien transmise au json
 		$json = $b->creer_json();
 		$this->assertPattern(',"lang":\[,', $json);
 	}
-	
-	
+
+
 	function testFonctionsJavacriptDansParametreNeDoitPasEtreEntreguillemetsDansJson(){
 		$b = new Barre_outils($this->baseParamsBarre);
 		$clean = array(
@@ -308,24 +315,25 @@ class Test_barre_outil_markitup extends SpipTest{
 		// pas de :"function(... ..."
 		$this->assertPattern('/:function\(/',$json);
 	}
-	
+
 	function testParametreFunctionsDansJson(){
 		$b = new Barre_outils($this->baseParamsBarre);
 		$b->functions = "function dido(){}";
 		$json = $b->creer_json();
 		// function n'est plus dans la barre
-		$this->assertFalse($b->functions);
+		$this->expectError(new PatternExpectation("/Undefined property: Barre_outils::\\\$functions/i"));
+		$b->functions;
 		// mais uniquement en fin du fichier json
-		$this->assertPattern('/function dido\(/', $json);		
+		$this->assertPattern('/function dido\(/', $json);
 	}
-	
+
 	function testAjouterFonctions(){
 		$b = new Barre_outils($this->baseParamsBarre);
 		$b->ajouterFonction("function dido(){}");
-		$this->assertPattern('/function dido\(/', $b->functions);		
+		$this->assertPattern('/function dido\(/', $b->functions);
 	}
-	
-	/*	
+
+	/*
 	function squeletteTest(){
 		$sq = new SqueletteTest("SimpleTest");
 		$sq->addInsertHead();
@@ -338,11 +346,11 @@ class Test_barre_outil_markitup extends SpipTest{
 		");	
 		return $sq;	
 	}
-	
+
 	function testPresenceBarreOutilPublique(){
 		include_spip('simpletest/browser');
 		include_spip('simpletest/web_tester');
-		
+
 		$sq = $this->squeletteTest();
 
 		$browser = &new SimpleBrowser();
diff --git a/www/plugins-dist/porte_plume/tests/lanceur_spip.php b/www/plugins-dist/porte_plume/tests/lanceur_spip.php
index be4c3d8d..f7ebd483 100644
--- a/www/plugins-dist/porte_plume/tests/lanceur_spip.php
+++ b/www/plugins-dist/porte_plume/tests/lanceur_spip.php
@@ -1,26 +1,11 @@
 Echec : SPIP ne peut pas etre demarre automatiquement pour le test.

-		Vous utilisez certainement un lien symbolique dans votre repertoire plugins.");
-}
-include_spip('inc/tests');
-if (!class_exists('SpipTestSuite')) {
-	die("Echec : le plugin pour les tests unitaires avec SimpleTest ne semble pas actif.");
-}
-?>
+demarrer_simpletest();
diff --git a/www/plugins-dist/textwheel/engine/textwheel.php b/www/plugins-dist/textwheel/engine/textwheel.php
index aba6e857..b473407b 100644
--- a/www/plugins-dist/textwheel/engine/textwheel.php
+++ b/www/plugins-dist/textwheel/engine/textwheel.php
@@ -164,7 +164,7 @@ class TextWheel {
 		}
 
 		# optimization: strpos or stripos?
-		if (isset($rule->strpos)) {
+		if (isset($rule->if_str)) {
 			if (strtolower($rule->if_str) !== strtoupper($rule->if_str)) {
 				$rule->if_stri = $rule->if_str;
 				unset($rule->if_str);
@@ -253,18 +253,19 @@ class TextWheel {
 		if (isset($rule->if_chars) AND (strpbrk($t, $rule->if_chars) === false))
 			return;
 
-		if (isset($rule->if_str) AND strpos($t, $rule->if_str) === false)
-			return;
-
-		if (isset($rule->if_stri) AND stripos($t, $rule->if_str) === false)
-			return;
-
 		if (isset($rule->if_match) AND !preg_match($rule->if_match, $t))
 			return;
 
+		// init rule before testing if_str / if_stri as they are optimized by initRule
 		if (!isset($rule->func_replace))
 			$this->initRule($rule);
 
+		if (isset($rule->if_str) AND strpos($t, $rule->if_str) === false)
+			return;
+
+		if (isset($rule->if_stri) AND stripos($t, $rule->if_stri) === false)
+			return;
+
 		$func = $rule->func_replace;
 		TextWheel::$func($rule->match,$rule->replace,$t,$count);
 	}
diff --git a/www/plugins-dist/textwheel/paquet.xml b/www/plugins-dist/textwheel/paquet.xml
index 72234da9..35eac21c 100644
--- a/www/plugins-dist/textwheel/paquet.xml
+++ b/www/plugins-dist/textwheel/paquet.xml
@@ -1,7 +1,7 @@
 2)
@@ -70,7 +70,7 @@ function formulaires_editer_url_objet_traiter($type,$id){
 	// les urls manuelles sont toujours permanentes
 	$set = array('url' => _request('url'), 'type' => $type, 'id_objet' => $id, 'perma'=>1);
 
-	$type_urls = $GLOBALS['meta']['type_urls'];
+	$type_urls = (isset($GLOBALS['type_urls'])?$GLOBALS['type_urls']:$GLOBALS['meta']['type_urls']);
 	if (include_spip("urls/$type_urls")
 		AND function_exists($renseigner_url = "renseigner_url_$type_urls")
 		AND $r = $renseigner_url($type,$id)
diff --git a/www/plugins-dist/urls_etendues/paquet.xml b/www/plugins-dist/urls_etendues/paquet.xml
index 32388b4b..fa4f7f35 100644
--- a/www/plugins-dist/urls_etendues/paquet.xml
+++ b/www/plugins-dist/urls_etendues/paquet.xml
@@ -1,7 +1,7 @@
 3))
+	if (!$sujet=_request('sujet_message_auteur'))
+		$erreurs['sujet_message_auteur'] = _T("info_obligatoire");
+	elseif(!(strlen($sujet)>3))
 		$erreurs['sujet_message_auteur'] = _T('forum:forum_attention_trois_caracteres');
 
 	if (!$texte=_request('texte_message_auteur'))
diff --git a/www/svn.revision b/www/svn.revision
index 7f2d6642..7fc18427 100644
--- a/www/svn.revision
+++ b/www/svn.revision
@@ -1,10 +1,10 @@
 
 
-Origine: svn://trac.rezo.net/spip/tags/spip-3.0.15
-Revision: 21231
-Dernier commit: 2014-02-21 16:36:00 +0100 
+Origine: svn://trac.rezo.net/spip/tags/spip-3.0.16
+Revision: 21266
+Dernier commit: 2014-03-13 15:30:55 +0100 
 
-svn://trac.rezo.net/spip/tags/spip-3.0.15
-21231
-2014-02-21 16:36:00 +0100 
+svn://trac.rezo.net/spip/tags/spip-3.0.16
+21266
+2014-03-13 15:30:55 +0100 
 
\ No newline at end of file
-- 
2.20.1