Changeset 943838

Timestamp:

07/06/2014 06:13:45 AM (12 years ago)

Author:

WebMaestro.Fr

Message:

v1.3 : wp_enqueue_style support and cache directory fix

Location:

less-compiler/trunk

Files:

• cache (deleted)
• css/less-compiler.css (modified) (1 diff)
• libs/less-parser/Cache.php (modified) (6 diffs)
• libs/less-parser/Less.php (modified) (142 diffs)
• libs/less-parser/Version.php (modified) (1 diff)
• libs/wm-settings/wm-settings.css (modified) (2 diffs)
• libs/wm-settings/wm-settings.js (modified) (1 diff)
• libs/wm-settings/wm-settings.php (modified) (9 diffs)
• plugin.php (modified) (6 diffs)
• readme.txt (modified) (3 diffs)

less-compiler/trunk/css/less-compiler.css

@@ -8 +8 @@
     line-height: 1.4;
 }
+.toplevel_page_less .form-table th {
+    display: none;
+}
+.toplevel_page_less .form-table td {
+    padding-left: 0;
+}

less-compiler/trunk/libs/less-parser/Cache.php

@@ -22 +22 @@
      * @param array $less_files Array of .less files to compile
      * @param array $parser_options Array of compiler options
-     * @param boolean $use_cache Set to false to regenerate the css file
+     * @param array $modify_vars Array of variables
      * @return string Name of the css file
      */
-    public static function Get( $less_files, $parser_options = array(), $use_cache = true ){
+    public static function Get( $less_files, $parser_options = array(), $modify_vars = array() ){
 
 
@@ -38 +38 @@
 
         self::CheckCacheDir();
+        $less_files = (array)$less_files;
+
+
+        //create a file for variables
+        if( !empty($modify_vars) ){
+            $lessvars = Less_Parser::serializeVars($modify_vars);
+            $vars_file = Less_Cache::$cache_dir.'lessphpvars_' . sha1($lessvars) . '.less';
+
+            if( !file_exists($vars_file) ){
+                file_put_contents($vars_file, $lessvars);
+            }
+
+            $less_files += array($vars_file => '/');
+        }
+
 
         // generate name for compiled css file
-        $less_files = (array)$less_files;
         $hash = md5(json_encode($less_files));
         $list_file = Less_Cache::$cache_dir.'lessphp_'.$hash.'.list';
 
 
-        if( $use_cache === true ){
-
-            // check cached content
-            if( file_exists($list_file) ){
-
+        // check cached content
+        if( !isset($parser_options['use_cache']) || $parser_options['use_cache'] === true ){
+            if( file_exists($list_file) ){
 
                 $list = explode("\n",file_get_contents($list_file));
+
+                //pop the cached name that should match $compiled_name
+                $cached_name = array_pop($list);
+                if( !preg_match('/^lessphp_[a-f0-9]+\.css$/',$cached_name) ){
+                    $list[] = $cached_name;
+                    $cached_name = false;
+                }
                 $compiled_name = self::CompiledName($list);
-                $compiled_file = Less_Cache::$cache_dir.$compiled_name;
-                if( file_exists($compiled_file) ){
-                    @touch($list_file);
-                    @touch($compiled_file);
-                    return $compiled_name;
-                }
-            }
-
+
+                // if $cached_name != $compiled_name, we know we need to recompile
+                if( !$cached_name || $cached_name === $compiled_name ){
+
+                    $output_file = self::OutputFile($compiled_name, $parser_options );
+
+                    if( $output_file && file_exists($output_file) ){
+                        @touch($list_file);
+                        @touch($output_file);
+                        return basename($output_file); // for backwards compatibility, we just return the name of the file
+                    }
+                }
+            }
         }
 
@@ -68 +92 @@
         }
 
+        $compiled_name = self::CompiledName( $less_files );
+        $output_file = self::OutputFile($compiled_name, $parser_options );
+
 
         //save the file list
-        $cache = implode("\n",$less_files);
+        $list = $less_files;
+        $list[] = $compiled_name;
+        $cache = implode("\n",$list);
         file_put_contents( $list_file, $cache );
 
 
         //save the css
-        $compiled_name = self::CompiledName( $less_files );
-        file_put_contents( Less_Cache::$cache_dir.$compiled_name, $compiled );
+        file_put_contents( $output_file, $compiled );
 
 
@@ -82 +110 @@
         self::CleanCache();
 
-        return $compiled_name;
+        return basename($output_file);
     }
 
@@ -90 +118 @@
      * @param array $less_files Array of .less files to compile
      * @param array $parser_options Array of compiler options
+     * @param array $modify_vars Array of variables
      * @return string Name of the css file
      */
-    public static function Regen( $less_files, $parser_options = array() ){
-        return self::Get( $less_files, $parser_options, false );
+    public static function Regen( $less_files, $parser_options = array(), $modify_vars = array() ){
+        $parser_options['use_cache'] = false;
+        return self::Get( $less_files, $parser_options, $modify_vars );
     }
 
@@ -127 +157 @@
 
         return $compiled;
+    }
+
+
+    private static function OutputFile( $compiled_name, $parser_options ){
+
+        //custom output file
+        if( !empty($parser_options['output']) ){
+
+            //relative to cache directory?
+            if( preg_match('#[\\\\/]#',$parser_options['output']) ){
+                return $parser_options['output'];
+            }
+
+            return Less_Cache::$cache_dir.$parser_options['output'];
+        }
+
+        return Less_Cache::$cache_dir.$compiled_name;
     }
 

less-compiler/trunk/libs/less-parser/Less.php

@@ -27 +27 @@
         'import_callback'       => null,
         'cache_dir'             => null,
-        'cache_method'          => 'php',           //false, 'serialize', 'php', 'var_export';
+        'cache_method'          => 'php',           // false, 'serialize', 'php', 'var_export', 'callback';
+        'cache_callback_get'    => null,
+        'cache_callback_set'    => null,
 
         'sourceMap'             => false,           // whether to output a source map
@@ -140 +142 @@
     }
 
-
+    /**
+     * Registers a new custom function
+     *
+     * @param  string   $name     function name
+     * @param  callable $callback callback
+     */
+    public function registerFunction($name, $callback) {
+        $this->env->functions[$name] = $callback;
+    }
+
+    /**
+     * Removed an already registered function
+     *
+     * @param  string $name function name
+     */
+    public function unregisterFunction($name) {
+        if( isset($this->env->functions[$name]) )
+            unset($this->env->functions[$name]);
+    }
 
 
@@ -328 +348 @@
     public function ModifyVars( $vars ){
 
-        $this->input = $this->serializeVars( $vars );
+        $this->input = Less_Parser::serializeVars( $vars );
         $this->_parse();
 
@@ -447 +467 @@
 
         $cache_file = $this->CacheFile( $file_path );
-        if( $cache_file && file_exists($cache_file) ){
-            switch(Less_Parser::$options['cache_method']){
-
-                // Using serialize
-                // Faster but uses more memory
-                case 'serialize':
-                    $cache = unserialize(file_get_contents($cache_file));
+        if( $cache_file ){
+            if( Less_Parser::$options['cache_method'] == 'callback' ){
+                if( is_callable(Less_Parser::$options['cache_callback_get']) ){
+                    $cache = call_user_func_array(
+                        Less_Parser::$options['cache_callback_get'],
+                        array($this, $file_path, $cache_file)
+                    );
+
                     if( $cache ){
-                        touch($cache_file);
                         $this->UnsetInput();
                         return $cache;
                     }
-                break;
-
-
-                // Using generated php code
-                case 'var_export':
-                case 'php':
-                $this->UnsetInput();
-                return include($cache_file);
+                }
+
+            }elseif( file_exists($cache_file) ){
+                switch(Less_Parser::$options['cache_method']){
+
+                    // Using serialize
+                    // Faster but uses more memory
+                    case 'serialize':
+                        $cache = unserialize(file_get_contents($cache_file));
+                        if( $cache ){
+                            touch($cache_file);
+                            $this->UnsetInput();
+                            return $cache;
+                        }
+                    break;
+
+
+                    // Using generated php code
+                    case 'var_export':
+                    case 'php':
+                    $this->UnsetInput();
+                    return include($cache_file);
+                }
             }
         }
@@ -481 +516 @@
         //save the cache
         if( $cache_file ){
-
-            //msg('write cache file');
-            switch(Less_Parser::$options['cache_method']){
-                case 'serialize':
-                    file_put_contents( $cache_file, serialize($rules) );
-                break;
-                case 'php':
-                    file_put_contents( $cache_file, '<?php return '.self::ArgString($rules).'; ?>' );
-                break;
-                case 'var_export':
-                    //Requires __set_state()
-                    file_put_contents( $cache_file, '<?php return '.var_export($rules,true).'; ?>' );
-                break;
-            }
-
-            Less_Cache::CleanCache();
+            if( Less_Parser::$options['cache_method'] == 'callback' ){
+                if( is_callable(Less_Parser::$options['cache_callback_set']) ){
+                    call_user_func_array(
+                        Less_Parser::$options['cache_callback_set'],
+                        array($this, $file_path, $cache_file, $rules)
+                    );
+                }
+
+            }else{
+                //msg('write cache file');
+                switch(Less_Parser::$options['cache_method']){
+                    case 'serialize':
+                        file_put_contents( $cache_file, serialize($rules) );
+                    break;
+                    case 'php':
+                        file_put_contents( $cache_file, '<?php return '.self::ArgString($rules).'; ?>' );
+                    break;
+                    case 'var_export':
+                        //Requires __set_state()
+                        file_put_contents( $cache_file, '<?php return '.var_export($rules,true).'; ?>' );
+                    break;
+                }
+
+                Less_Cache::CleanCache();
+            }
         }
 
@@ -540 +584 @@
     public function CacheFile( $file_path ){
 
-        if( $file_path && Less_Parser::$options['cache_method'] && Less_Cache::$cache_dir ){
+        if( $file_path && $this->CacheEnabled() ){
 
             $env = get_object_vars($this->env);
@@ -637 +681 @@
     private function MatchFuncs($toks){
 
-        foreach($toks as $tok){
-            $match = $this->$tok();
-            if( $match ){
-                return $match;
+        if( $this->pos < $this->input_len ){
+            foreach($toks as $tok){
+                $match = $this->$tok();
+                if( $match ){
+                    return $match;
+                }
             }
         }
@@ -865 +911 @@
             $this->MatchChar('~');
         }
-        $str = $this->MatchReg('/\\G"((?:[^"\\\\\r\n]|\\\\.)*)"|\'((?:[^\'\\\\\r\n]|\\\\.)*)\'/');
+
+                // Fix for #124: match escaped newlines
+                //$str = $this->MatchReg('/\\G"((?:[^"\\\\\r\n]|\\\\.)*)"|\'((?:[^\'\\\\\r\n]|\\\\.)*)\'/');
+        $str = $this->MatchReg('/\\G"((?:[^"\\\\\r\n]|\\\\.|\\\\\r\n|\\\\[\n\r\f])*)"|\'((?:[^\'\\\\\r\n]|\\\\.|\\\\\r\n|\\\\[\n\r\f])*)\'/');
+
         if( $str ){
             $result = $str[0][0] == '"' ? $str[1] : $str[2];
@@ -1563 +1613 @@
     //
     private function parseCombinator(){
-        $c = $this->input[$this->pos];
-        if ($c === '>' || $c === '+' || $c === '~' || $c === '|' || $c === '^' ){
-
-            $this->pos++;
-            if( $this->input[$this->pos] === '^' ){
-                $c = '^^';
+        if( $this->pos < $this->input_len ){
+            $c = $this->input[$this->pos];
+            if ($c === '>' || $c === '+' || $c === '~' || $c === '|' || $c === '^' ){
+
                 $this->pos++;
-            }
-
-            $this->skipWhitespace(0);
-
-            return $c;
-        }
-
-        if( $this->pos > 0 && $this->isWhitespace(-1) ){
-            return ' ';
+                if( $this->input[$this->pos] === '^' ){
+                    $c = '^^';
+                    $this->pos++;
+                }
+
+                $this->skipWhitespace(0);
+
+                return $c;
+            }
+
+            if( $this->pos > 0 && $this->isWhitespace(-1) ){
+                return ' ';
+            }
         }
     }
@@ -1619 +1671 @@
                     //error("Extend can only be used at the end of selector");
                 //}
-                $c = $this->input[ $this->pos ];
+                if( $this->pos < $this->input_len ){
+                    $c = $this->input[ $this->pos ];
+                }
                 $elements[] = $e;
                 $e = null;
@@ -2379 +2433 @@
     }
 
-    public function serializeVars( $vars ){
+    public static function serializeVars( $vars ){
         $s = '';
 
@@ -2427 +2481 @@
     public function NewObj0($class){
         $obj = new $class();
-        if( Less_Cache::$cache_dir ){
+        if( $this->CacheEnabled() ){
             $obj->cache_string = ' new '.$class.'()';
         }
@@ -2435 +2489 @@
     public function NewObj1($class, $arg){
         $obj = new $class( $arg );
-        if( Less_Cache::$cache_dir ){
+        if( $this->CacheEnabled() ){
             $obj->cache_string = ' new '.$class.'('.Less_Parser::ArgString($arg).')';
         }
@@ -2443 +2497 @@
     public function NewObj2($class, $args){
         $obj = new $class( $args[0], $args[1] );
-        if( Less_Cache::$cache_dir ){
+        if( $this->CacheEnabled() ){
             $this->ObjCache( $obj, $class, $args);
         }
@@ -2451 +2505 @@
     public function NewObj3($class, $args){
         $obj = new $class( $args[0], $args[1], $args[2] );
-        if( Less_Cache::$cache_dir ){
+        if( $this->CacheEnabled() ){
             $this->ObjCache( $obj, $class, $args);
         }
@@ -2459 +2513 @@
     public function NewObj4($class, $args){
         $obj = new $class( $args[0], $args[1], $args[2], $args[3] );
-        if( Less_Cache::$cache_dir ){
+        if( $this->CacheEnabled() ){
             $this->ObjCache( $obj, $class, $args);
         }
@@ -2467 +2521 @@
     public function NewObj5($class, $args){
         $obj = new $class( $args[0], $args[1], $args[2], $args[3], $args[4] );
-        if( Less_Cache::$cache_dir ){
+        if( $this->CacheEnabled() ){
             $this->ObjCache( $obj, $class, $args);
         }
@@ -2475 +2529 @@
     public function NewObj6($class, $args){
         $obj = new $class( $args[0], $args[1], $args[2], $args[3], $args[4], $args[5] );
-        if( Less_Cache::$cache_dir ){
+        if( $this->CacheEnabled() ){
             $this->ObjCache( $obj, $class, $args);
         }
@@ -2483 +2537 @@
     public function NewObj7($class, $args){
         $obj = new $class( $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6] );
-        if( Less_Cache::$cache_dir ){
+        if( $this->CacheEnabled() ){
             $this->ObjCache( $obj, $class, $args);
         }
@@ -2530 +2584 @@
     public static function WinPath($path){
         return str_replace('\\', '/', $path);
+    }
+
+    public function CacheEnabled(){
+        return (Less_Parser::$options['cache_method'] && (Less_Cache::$cache_dir || (Less_Parser::$options['cache_method'] == 'callback')));
     }
 
@@ -2754 +2812 @@
     public static $mixin_stack = 0;
 
+    /**
+     * @var array
+     */
+    public $functions = array();
+
 
     public function Init(){
@@ -2821 +2884 @@
      *
      */
-    static function normalizePath($path){
+    public static function normalizePath($path){
 
         $segments = explode('/',$path);
@@ -2889 +2952 @@
      * @param string $op
      */
-    static public function operate( $op, $a, $b ){
+    public static function operate( $op, $a, $b ){
         switch ($op) {
             case '+': return $a + $b;
@@ -2898 +2961 @@
     }
 
-    static public function clamp($val, $max = 1){
+    public static function clamp($val, $max = 1){
         return min( max($val, 0), $max);
     }
 
-    static function fround( $value ){
+    public static function fround( $value ){
 
         if( $value === 0 ){
@@ -2915 +2978 @@
     }
 
-    static public function number($n){
+    public static function number($n){
 
         if ($n instanceof Less_Tree_Dimension) {
@@ -2926 +2989 @@
     }
 
-    static public function scaled($n, $size = 255 ){
+    public static function scaled($n, $size = 255 ){
         if( $n instanceof Less_Tree_Dimension && $n->unit->is('%') ){
             return (float)$n->value * $size / 100;
@@ -2970 +3033 @@
      * @param double $h
      */
-    function hsla_hue($h, $m1, $m2){
+    public function hsla_hue($h, $m1, $m2){
         $h = $h < 0 ? $h + 1 : ($h > 1 ? $h - 1 : $h);
         if    ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
@@ -3388 +3451 @@
      * @param boolean $isMin
      */
-    function _minmax( $isMin, $args ){
+    private function _minmax( $isMin, $args ){
 
         $arg_count = count($args);
@@ -3583 +3646 @@
     }
 
-    function length($values){
+    public function length($values){
         $n = (property_exists($values,'value') && is_array($values->value)) ? count($values->value) : 1;
         return new Less_Tree_Dimension($n);
     }
 
-    function datauri($mimetypeNode, $filePathNode = null ) {
+    public function datauri($mimetypeNode, $filePathNode = null ) {
 
         $filePath = ( $filePathNode ? $filePathNode->value : null );
@@ -3664 +3727 @@
 
     //svg-gradient
-    function svggradient( $direction ){
+    public function svggradient( $direction ){
 
         $throw_message = 'svg-gradient expects direction, start_color [start_position], [color position,]..., end_color [end_position]';
@@ -3863 +3926 @@
 
     // non-w3c functions:
-    function colorBlendAverage($cb, $cs ){
+    public function colorBlendAverage($cb, $cs ){
         return ($cb + $cs) / 2;
     }
@@ -3871 +3934 @@
     }
 
-    function colorBlendNegation($cb, $cs){
+    public function colorBlendNegation($cb, $cs){
         return 1 - abs($cb + $cs - 1);
     }
@@ -3896 +3959 @@
             '.jpg' => 'image/jpeg',
             '.jpeg'=> 'image/jpeg',
-            '.png' => 'image/png'
+            '.png' => 'image/png',
+            '.ttf' => 'application/x-font-ttf',
+            '.otf' => 'application/x-font-otf',
+            '.eot' => 'application/vnd.ms-fontobject',
+            '.woff' => 'application/x-font-woff',
+            '.svg' => 'image/svg+xml',
             );
 
-    static function lookup( $filepath ){
+    public static function lookup( $filepath ){
         $parts = explode('.',$filepath);
         $ext = '.'.strtolower(array_pop($parts));
@@ -3909 +3977 @@
     }
 
-    static function charsets_lookup( $type = null ){
+    public static function charsets_lookup( $type = null ){
         // assumes all text types are UTF-8
         return $type && preg_match('/^text\//',$type) ? 'UTF-8' : '';
     }
-} 
+}
+ 
 
 /**
@@ -4060 +4129 @@
 class Less_Visitor{
 
-    var $methods = array();
-    var $_visitFnCache = array();
-
-    function __construct(){
+    protected $methods = array();
+    protected $_visitFnCache = array();
+
+    public function __construct(){
         $this->_visitFnCache = get_class_methods(get_class($this));
         $this->_visitFnCache = array_flip($this->_visitFnCache);
     }
 
-    function visitObj( $node ){
+    public function visitObj( $node ){
 
         $funcName = 'visit'.$node->type;
@@ -4092 +4161 @@
     }
 
-    function visitArray( $nodes ){
+    public function visitArray( $nodes ){
 
         array_map( array($this,'visitObj'), $nodes);
@@ -4109 +4178 @@
 class Less_VisitorReplacing extends Less_Visitor{
 
-    function visitObj( $node ){
+    public function visitObj( $node ){
 
         $funcName = 'visit'.$node->type;
@@ -4135 +4204 @@
     }
 
-    function visitArray( $nodes ){
+    public function visitArray( $nodes ){
 
         $newNodes = array();
@@ -4151 +4220 @@
     }
 
-    function flatten( $arr, &$out ){
+    public function flatten( $arr, &$out ){
 
         foreach($arr as $item){
@@ -4323 +4392 @@
     }
 
-    function compare($x){
+    public function compare($x){
         if( !is_object($x) ){
             return -1;
@@ -4364 +4433 @@
     public $type = 'Assignment';
 
-    function __construct($key, $val) {
+    public function __construct($key, $val) {
         $this->key = $key;
         $this->value = $val;
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         $this->value = $visitor->visitObj( $this->value );
     }
@@ -4404 +4473 @@
     public $type = 'Attribute';
 
-    function __construct($key, $op, $value){
+    public function __construct($key, $op, $value){
         $this->key = $key;
         $this->op = $op;
@@ -4410 +4479 @@
     }
 
-    function compile($env){
+    public function compile($env){
 
         $key_obj = is_object($this->key);
@@ -4428 +4497 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
         $output->add( $this->toCSS() );
     }
 
-    function toCSS(){
+    public function toCSS(){
         $value = $this->key;
 
@@ -4454 +4523 @@
     public $value;
 
-    var $name;
-    var $args;
-    var $index;
-    var $currentFileInfo;
+    protected $name;
+    protected $args;
+    protected $index;
+    protected $currentFileInfo;
     public $type = 'Call';
 
@@ -4467 +4536 @@
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         $this->args = $visitor->visitArray( $this->args );
     }
@@ -4523 +4592 @@
                     throw new Less_Exception_Compiler('error evaluating function `' . $this->name . '` '.$e->getMessage().' index: '. $this->index);
                 }
+            } elseif( isset( $env->functions[$nameLC] ) && is_callable( $env->functions[$nameLC] ) ) {
+                try {
+                    $result = call_user_func_array( $env->functions[$nameLC], $args );
+                } catch (Exception $e) {
+                    throw new Less_Exception_Compiler('error evaluating function `' . $this->name . '` '.$e->getMessage().' index: '. $this->index);
+                }
             }
         }
@@ -4707 +4782 @@
 
     //Adapted from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
-    function toHSV() {
+    public function toHSV() {
         $r = $this->rgb[0] / 255;
         $g = $this->rgb[1] / 255;
@@ -4755 +4830 @@
     }
 
-    function toHex( $v ){
+    public function toHex( $v ){
 
         $ret = '#';
@@ -4923 +4998 @@
     static $value_;
 
-    static function compile(){
+    public static function compile(){
         if( self::$error_ ){
-            throw Exception(self::$error_);
+            throw new Exception(self::$error_);
         }
         if( self::$value_ !== null ){
@@ -4932 +5007 @@
     }
 
-    static function value( $v ){
+    public static function value( $v ){
         self::$value_ = $v;
     }
 
-    static function error( $e ){
+    public static function error( $e ){
         self::$error_ = $e;
     }
 
-    static function reset(){
+    public static function reset(){
         self::$value_ = self::$error_ = null;
     }
@@ -4957 +5032 @@
     public $type = 'DetachedRuleset';
 
-    function __construct( $ruleset, $frames = null ){
+    public function __construct( $ruleset, $frames = null ){
         $this->ruleset = $ruleset;
         $this->frames = $frames;
     }
 
-    function accept($visitor) {
+    public function accept($visitor) {
         $this->ruleset = $visitor->visitObj($this->ruleset);
     }
 
-    function compile($env){
+    public function compile($env){
         if( $this->frames ){
             $frames = $this->frames;
@@ -4975 +5050 @@
     }
 
-    function callEval($env) {
+    public function callEval($env) {
         if( $this->frames ){
             return $this->ruleset->compile( $env->copyEvalEnv( array_merge($this->frames,$env->frames) ) );
@@ -5009 +5084 @@
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         $this->unit = $visitor->visitObj( $this->unit );
     }
@@ -5132 +5207 @@
     }
 
-    function unify() {
+    public function unify() {
         return $this->convertTo(array('length'=> 'px', 'duration'=> 's', 'angle' => 'rad' ));
     }
 
-    function convertTo($conversions) {
+    public function convertTo($conversions) {
         $value = $this->value;
         $unit = clone $this->unit;
@@ -5217 +5292 @@
 
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         if( $this->rules ){
             $this->rules = $visitor->visitObj( $this->rules );
@@ -5230 +5305 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
         $value = $this->value;
         $rules = $this->rules;
@@ -5315 +5390 @@
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         if( $this->value_is_object ){ //object or string
             $this->value = $visitor->visitObj( $this->value );
@@ -5379 +5454 @@
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         $this->value = $visitor->visitArray( $this->value );
     }
@@ -5432 +5507 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
         $val_len = count($this->value);
         for( $i = 0; $i < $val_len; $i++ ){
@@ -5442 +5517 @@
     }
 
-    function throwAwayComments() {
+    public function throwAwayComments() {
 
         if( is_array($this->value) ){
@@ -5483 +5558 @@
      * @param integer $index
      */
-    function __construct($selector, $option, $index){
+    public function __construct($selector, $option, $index){
         static $i = 0;
         $this->selector = $selector;
@@ -5504 +5579 @@
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         $this->selector = $visitor->visitObj( $this->selector );
     }
 
-    function compile( $env ){
+    public function compile( $env ){
         Less_Parser::$has_extends = true;
         $this->selector = $this->selector->compile($env);
@@ -5515 +5590 @@
     }
 
-    function findSelfSelectors( $selectors ){
+    public function findSelfSelectors( $selectors ){
         $selfElements = array();
 
@@ -5561 +5636 @@
     public $type = 'Import';
 
-    function __construct($path, $features, $options, $index, $currentFileInfo = null ){
+    public function __construct($path, $features, $options, $index, $currentFileInfo = null ){
         $this->options = $options;
         $this->index = $index;
@@ -5592 +5667 @@
 //
 
-    function accept($visitor){
+    public function accept($visitor){
 
         if( $this->features ){
@@ -5607 +5682 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
         if( $this->css ){
 
@@ -5621 +5696 @@
     }
 
-    function toCSS(){
+    public function toCSS(){
         $features = $this->features ? ' ' . $this->features->toCSS() : '';
 
@@ -5634 +5709 @@
      * @return string
      */
-    function getPath(){
+    public function getPath(){
         if ($this->path instanceof Less_Tree_Quoted) {
             $path = $this->path->value;
-            return ( isset($this->css) || preg_match('/(\.[a-z]*$)|([\?;].*)$/',$path)) ? $path : $path . '.less';
+            $path = ( isset($this->css) || preg_match('/(\.[a-z]*$)|([\?;].*)$/',$path)) ? $path : $path . '.less';
         } else if ($this->path instanceof Less_Tree_URL) {
-            return $this->path->value->value;
-        }
-        return null;
-    }
-
-    function compileForImport( $env ){
+            $path = $this->path->value->value;
+        }else{
+            return null;
+        }
+
+        //remove query string and fragment
+        return preg_replace('/[\?#][^\?]*$/','',$path);
+    }
+
+    public function compileForImport( $env ){
         return new Less_Tree_Import( $this->path->compile($env), $this->features, $this->options, $this->index, $this->currentFileInfo);
     }
 
-    function compilePath($env) {
+    public function compilePath($env) {
         $path = $this->path->compile($env);
         $rootpath = '';
@@ -5672 +5751 @@
     }
 
-    function compile( $env ){
+    public function compile( $env ){
 
         $evald = $this->compileForImport($env);
@@ -5729 +5808 @@
      * @param Less_Tree_Import $evald
      */
-    function PathAndUri(){
+    public function PathAndUri(){
 
         $evald_path = $this->getPath();
@@ -5780 +5859 @@
      * @return Less_Tree_Media|array
      */
-    function ParseImport( $full_path, $uri, $env ){
+    public function ParseImport( $full_path, $uri, $env ){
 
         $import_env = clone $env;
@@ -5927 +6006 @@
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         $this->features = $visitor->visitObj($this->features);
         $this->rules = $visitor->visitArray($this->rules);
@@ -5935 +6014 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
 
         $output->add( '@media ', $this->currentFileInfo, $this->index );
@@ -6068 +6147 @@
     }
 
-    function bubbleSelectors($selectors) {
+    public function bubbleSelectors($selectors) {
 
         if( !$selectors) return;
@@ -6103 +6182 @@
     }
 
-    function genCSS( $output ){
+    public function genCSS( $output ){
 
         $output->add(
@@ -6130 +6209 @@
     public $type = 'Negative';
 
-    function __construct($node){
+    public function __construct($node){
         $this->value = $node;
     }
@@ -6141 +6220 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
         $output->add( '-' );
         $this->value->genCSS( $output );
     }
 
-    function compile($env) {
+    public function compile($env) {
         if( Less_Environment::isMathOn() ){
             $ret = new Less_Tree_Operation('*', array( new Less_Tree_Dimension(-1), $this->value ) );
@@ -6177 +6256 @@
     }
 
-    function accept($visitor) {
+    public function accept($visitor) {
         $this->operands = $visitor->visitArray($this->operands);
     }
@@ -6210 +6289 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
         $this->operands[0]->genCSS( $output );
         if( $this->isSpaced ){
@@ -6240 +6319 @@
     }
 
-    function accept($visitor){
+    public function accept($visitor){
         $this->value = $visitor->visitObj($this->value);
     }
@@ -6247 +6326 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
         $output->add( '(' );
         $this->value->genCSS( $output );
@@ -6323 +6402 @@
     }
 
-    function compare($x) {
+    public function compare($x) {
 
         if( !Less_Parser::is_method($x, 'toCSS') ){
@@ -6373 +6452 @@
     }
 
-    function accept($visitor) {
+    public function accept($visitor) {
         $this->value = $visitor->visitObj( $this->value );
     }
@@ -6380 +6459 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
 
         $output->add( $this->name . Less_Environment::$_outputMap[': '], $this->currentFileInfo, $this->index);
@@ -6441 +6520 @@
 
 
-    function CompileName( $env, $name ){
+    public function CompileName( $env, $name ){
         $output = new Less_Output();
         foreach($name as $n){
@@ -6449 +6528 @@
     }
 
-    function makeImportant(){
+    public function makeImportant(){
         return new Less_Tree_Rule($this->name, $this->value, '!important', $this->merge, $this->index, $this->currentFileInfo, $this->inline);
     }
@@ -6480 +6559 @@
     public $allExtends;
 
-    var $ruleset_id;
-    var $originalRuleset;
-
-    var $first_oelements;
+    public $ruleset_id;
+    public $originalRuleset;
+
+    public $first_oelements;
 
     public function SetRulesetIndex(){
@@ -6506 +6585 @@
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         if( $this->paths ){
             $paths_len = count($this->paths);
@@ -7110 +7189 @@
     public $type = "RulesetCall";
 
-    function __construct($variable){
+    public function __construct($variable){
         $this->variable = $variable;
     }
 
-    function accept($visitor) {}
-
-    function compile( $env ){
+    public function accept($visitor) {}
+
+    public function compile( $env ){
         $variable = new Less_Tree_Variable($this->variable);
         $detachedRuleset = $variable->compile($env);
@@ -7170 +7249 @@
     }
 
-    function accept($visitor) {
+    public function accept($visitor) {
         $this->elements = $visitor->visitArray($this->elements);
         $this->extendList = $visitor->visitArray($this->extendList);
@@ -7182 +7261 @@
     }
 
-    function createDerived( $elements, $extendList = null, $evaldCondition = null ){
+    public function createDerived( $elements, $extendList = null, $evaldCondition = null ){
         $newSelector = new Less_Tree_Selector( $elements, ($extendList ? $extendList : $this->extendList), null, $this->index, $this->currentFileInfo, $this->isReferenced);
         $newSelector->evaldCondition = $evaldCondition ? $evaldCondition : $this->evaldCondition;
@@ -7267 +7346 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output, $firstSelector = true ){
+    public function genCSS( $output, $firstSelector = true ){
 
         if( !$firstSelector && $this->elements[0]->combinator === "" ){
@@ -7278 +7357 @@
     }
 
-    function markReferenced(){
+    public function markReferenced(){
         $this->isReferenced = true;
     }
 
-    function getIsReferenced(){
+    public function getIsReferenced(){
         return !isset($this->currentFileInfo['reference']) || !$this->currentFileInfo['reference'] || $this->isReferenced;
     }
 
-    function getIsOutput(){
+    public function getIsOutput(){
         return $this->evaldCondition;
     }
@@ -7335 +7414 @@
     public $type = 'Unit';
 
-    function __construct($numerator = array(), $denominator = array(), $backupUnit = null ){
+    public function __construct($numerator = array(), $denominator = array(), $backupUnit = null ){
         $this->numerator = $numerator;
         $this->denominator = $denominator;
@@ -7341 +7420 @@
     }
 
-    function __clone(){
+    public function __clone(){
     }
 
@@ -7347 +7426 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
 
         if( $this->numerator ){
@@ -7359 +7438 @@
     }
 
-    function toString(){
+    public function toString(){
         $returnStr = implode('*',$this->numerator);
         foreach($this->denominator as $d){
@@ -7367 +7446 @@
     }
 
-    function __toString(){
+    public function __toString(){
         return $this->toString();
     }
@@ -7375 +7454 @@
      * @param Less_Tree_Unit $other
      */
-    function compare($other) {
+    public function compare($other) {
         return $this->is( $other->toString() ) ? 0 : -1;
     }
 
-    function is($unitString){
+    public function is($unitString){
         return $this->toString() === $unitString;
     }
 
-    function isLength(){
+    public function isLength(){
         $css = $this->toCSS();
         return !!preg_match('/px|em|%|in|cm|mm|pc|pt|ex/',$css);
     }
 
-    function isAngle() {
+    public function isAngle() {
         return isset( Less_Tree_UnitConversions::$angle[$this->toCSS()] );
     }
 
-    function isEmpty(){
+    public function isEmpty(){
         return !$this->numerator && !$this->denominator;
     }
 
-    function isSingular() {
+    public function isSingular() {
         return count($this->numerator) <= 1 && !$this->denominator;
     }
 
 
-    function usedUnits(){
+    public function usedUnits(){
         $result = array();
 
@@ -7423 +7502 @@
     }
 
-    function cancel(){
+    public function cancel(){
         $counter = array();
         $backup = null;
@@ -7523 +7602 @@
     }
 
-    function accept( $visitor ){
+    public function accept( $visitor ){
         $this->value = $visitor->visitObj($this->value);
     }
@@ -7530 +7609 @@
      * @see Less_Tree::genCSS
      */
-    function genCSS( $output ){
+    public function genCSS( $output ){
         $output->add( 'url(' );
         $this->value->genCSS( $output );
@@ -7594 +7673 @@
     }
 
-    function accept($visitor) {
+    public function accept($visitor) {
         $this->value = $visitor->visitArray($this->value);
     }
@@ -7653 +7732 @@
 
         if( $this->name[1] === '@' ){
-            $v = new Less_Tree_Variable(substr($this->name, 1), $this->index + 1);
+            $v = new Less_Tree_Variable(substr($this->name, 1), $this->index + 1, $this->currentFileInfo);
             $name = '@' . $v->compile($env)->value;
         }else{
@@ -7667 +7746 @@
         foreach($env->frames as $frame){
             if( $v = $frame->variable($name) ){
+                $r = $v->value->compile($env);
                 $this->evaluating = false;
-                return $v->value->compile($env);
-            }
-        }
-
-        throw new Less_Exception_Compiler("variable " . $name . " is undefined", null, $this->index );
+                return $r;
+            }
+        }
+
+        throw new Less_Exception_Compiler("variable " . $name . " is undefined in file ".$this->currentFileInfo["filename"], null, $this->index );
     }
 
@@ -7785 +7865 @@
                 $defaultResult = $defTrue;
                 if( ($count[$defTrue] + $count[$defFalse]) > 1 ){
-                    throw Exception( 'Ambiguous use of `default()` found when matching for `'. $this->format($args) + '`' );
+                    throw new Exception( 'Ambiguous use of `default()` found when matching for `'. $this->format($args) + '`' );
                 }
             }
@@ -7823 +7903 @@
 
         }else{
-            throw new Less_Exception_Compiler(trim($this->selector->toCSS()) . " is undefined", null, $this->index);
+            throw new Less_Exception_Compiler(trim($this->selector->toCSS()) . " is undefined in ".$this->currentFileInfo['filename'], null, $this->index);
         }
 
@@ -8126 +8206 @@
     public $foundExtends;
 
-    function __construct(){
+    public function __construct(){
         $this->contexts = array();
         $this->allExtendsStack = array(array());
@@ -8135 +8215 @@
      * @param Less_Tree_Ruleset $root
      */
-    function run($root){
+    public function run($root){
         $root = $this->visitObj($root);
         $root->allExtends =& $this->allExtendsStack[0];
@@ -8141 +8221 @@
     }
 
-    function visitRule($ruleNode, &$visitDeeper ){
+    public function visitRule($ruleNode, &$visitDeeper ){
         $visitDeeper = false;
     }
 
-    function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
         $visitDeeper = false;
     }
 
-    function visitRuleset($rulesetNode){
+    public function visitRuleset($rulesetNode){
 
         if( $rulesetNode->root ){
@@ -8185 +8265 @@
     }
 
-    function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j){
+    public function allExtendsStackPush($rulesetNode, $selectorPath, $extend, &$j){
         $this->foundExtends = true;
         $extend = clone $extend;
@@ -8200 +8280 @@
 
 
-    function visitRulesetOut( $rulesetNode ){
+    public function visitRulesetOut( $rulesetNode ){
         if( !is_object($rulesetNode) || !$rulesetNode->root ){
             array_pop($this->contexts);
@@ -8206 +8286 @@
     }
 
-    function visitMedia( $mediaNode ){
+    public function visitMedia( $mediaNode ){
         $mediaNode->allExtends = array();
         $this->allExtendsStack[] =& $mediaNode->allExtends;
     }
 
-    function visitMediaOut(){
+    public function visitMediaOut(){
         array_pop($this->allExtendsStack);
     }
 
-    function visitDirective( $directiveNode ){
+    public function visitDirective( $directiveNode ){
         $directiveNode->allExtends = array();
         $this->allExtendsStack[] =& $directiveNode->allExtends;
     }
 
-    function visitDirectiveOut(){
+    public function visitDirectiveOut(){
         array_pop($this->allExtendsStack);
     }
@@ -8380 +8460 @@
      * @param Less_Tree_Ruleset $root
      */
-    function run( $root ){
+    public function run( $root ){
         return $this->visitObj($root);
     }
 
-    function visitRule( $ruleNode, &$visitDeeper ){
+    public function visitRule( $ruleNode, &$visitDeeper ){
         $visitDeeper = false;
     }
 
-    function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+    public function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
         $visitDeeper = false;
     }
 
-    function visitRuleset( $rulesetNode ){
+    public function visitRuleset( $rulesetNode ){
 
         $paths = array();
@@ -8421 +8501 @@
     }
 
-    function visitRulesetOut(){
+    public function visitRulesetOut(){
         array_pop($this->contexts);
     }
 
-    function visitMedia($mediaNode) {
+    public function visitMedia($mediaNode) {
         $context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
 
@@ -8915 +8995 @@
     private $charset;
 
-    function __construct(){
+    public function __construct(){
         parent::__construct();
     }
@@ -8922 +9002 @@
      * @param Less_Tree_Ruleset $root
      */
-    function run( $root ){
+    public function run( $root ){
         return $this->visitObj($root);
     }
 
-    function visitRule( $ruleNode ){
+    public function visitRule( $ruleNode ){
         if( $ruleNode->variable ){
             return array();
@@ -8933 +9013 @@
     }
 
-    function visitMixinDefinition($mixinNode){
+    public function visitMixinDefinition($mixinNode){
         // mixin definitions do not get eval'd - this means they keep state
         // so we have to clear that state here so it isn't used if toCSS is called twice
@@ -8940 +9020 @@
     }
 
-    function visitExtend(){
+    public function visitExtend(){
         return array();
     }
 
-    function visitComment( $commentNode ){
+    public function visitComment( $commentNode ){
         if( $commentNode->isSilent() ){
             return array();
@@ -8951 +9031 @@
     }
 
-    function visitMedia( $mediaNode, &$visitDeeper ){
+    public function visitMedia( $mediaNode, &$visitDeeper ){
         $mediaNode->accept($this);
         $visitDeeper = false;
@@ -8961 +9041 @@
     }
 
-    function visitDirective( $directiveNode ){
+    public function visitDirective( $directiveNode ){
         if( isset($directiveNode->currentFileInfo['reference']) && (!property_exists($directiveNode,'isReferenced') || !$directiveNode->isReferenced) ){
             return array();
@@ -8985 +9065 @@
     }
 
-    function checkPropertiesInRoot( $rulesetNode ){
+    public function checkPropertiesInRoot( $rulesetNode ){
 
         if( !$rulesetNode->firstRoot ){
@@ -9000 +9080 @@
 
 
-    function visitRuleset( $rulesetNode, &$visitDeeper ){
+    public function visitRuleset( $rulesetNode, &$visitDeeper ){
 
         $visitDeeper = false;
@@ -9097 +9177 @@
     }
 
-    function _removeDuplicateRules( &$rules ){
+    protected function _removeDuplicateRules( &$rules ){
         // remove duplicates
         $ruleCache = array();
@@ -9124 +9204 @@
     }
 
-    function _mergeRules( &$rules ){
+    protected function _mergeRules( &$rules ){
         $groups = array();
 
@@ -9176 +9256 @@
     }
 
-    static function toExpression($values){
+    public static function toExpression($values){
         $mapped = array();
         foreach($values as $p){
@@ -9184 +9264 @@
     }
 
-    static function toValue($values){
+    public static function toValue($values){
         //return new Less_Tree_Value($values); ??
 
@@ -9363 +9443 @@
      *
      */
-    function Chunks(){
+    protected function Chunks(){
         $level = 0;
         $parenLevel = 0;
@@ -9490 +9570 @@
     }
 
-    function CharCode($pos){
+    public function CharCode($pos){
         return ord($this->input[$pos]);
     }
 
 
-    function fail( $msg, $index = null ){
+    public function fail( $msg, $index = null ){
 
         if( !$index ){
@@ -9623 +9703 @@
                         count($sourceLines),                    // original_line
                         strlen($sourceColumns),                 // original_column
-                        $fileInfo['currentUri']
+                        $fileInfo
                 );
             }else{
@@ -9632 +9712 @@
                         count($sourceLines) + $i,               // original_line
                         $i === 0 ? strlen($sourceColumns) : 0,  // original_column
-                        $fileInfo['currentUri']
+                        $fileInfo
                     );
                 }
@@ -9875 +9955 @@
 
             // base path for filename normalization
-            'sourceMapBasepath'     => ''
+            'sourceMapRootpath'     => '',
+
+            // base path for filename normalization
+            'sourceMapBasepath'   => ''
     );
 
@@ -9912 +9995 @@
      */
     protected $sources = array();
+    protected $source_keys = array();
 
     /**
@@ -9928 +10012 @@
 
         // fix windows paths
-        if( isset($this->options['sourceMapBasepath']) ){
-            $this->options['sourceMapBasepath'] = str_replace('\\', '/', $this->options['sourceMapBasepath']);
+        if( !empty($this->options['sourceMapRootpath']) ){
+            $this->options['sourceMapRootpath'] = str_replace('\\', '/', $this->options['sourceMapRootpath']);
+            $this->options['sourceMapRootpath'] = rtrim($this->options['sourceMapRootpath'],'/').'/';
         }
     }
@@ -9999 +10084 @@
      */
     protected function normalizeFilename($filename){
+
         $filename = str_replace('\\', '/', $filename);
+        $rootpath = $this->getOption('sourceMapRootpath');
         $basePath = $this->getOption('sourceMapBasepath');
 
-        if( $basePath && ($pos = strpos($filename, $basePath)) !== false ){
-            $filename = substr($filename, $pos + strlen($basePath));
-            if(strpos($filename, '\\') === 0 || strpos($filename, '/') === 0){
-                $filename = substr($filename, 1);
-            }
-        }
-        return sprintf('%s%s', $this->getOption('sourceMapRootpath'), $filename);
+        // "Trim" the 'sourceMapBasepath' from the output filename.
+        if (strpos($filename, $basePath) === 0) {
+            $filename = substr($filename, strlen($basePath));
+        }
+
+        // Remove extra leading path separators.
+        if(strpos($filename, '\\') === 0 || strpos($filename, '/') === 0){
+            $filename = substr($filename, 1);
+        }
+
+        return $rootpath . $filename;
     }
 
@@ -10020 +10111 @@
      * @param string $sourceFile The original source file
      */
-    public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $sourceFile){
+    public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $fileInfo ){
+
         $this->mappings[] = array(
             'generated_line' => $generatedLine,
@@ -10026 +10118 @@
             'original_line' => $originalLine,
             'original_column' => $originalColumn,
-            'source_file' => $sourceFile
+            'source_file' => $fileInfo['currentUri']
         );
 
-
-        $norm_file = $this->normalizeFilename($sourceFile);
-
-        $this->sources[$norm_file] = $sourceFile;
+        $this->sources[$fileInfo['currentUri']] = $fileInfo['filename'];
     }
 
@@ -10066 +10155 @@
 
         // A list of original sources used by the 'mappings' entry.
-        $sourceMap['sources'] = array_keys($this->sources);
-
+        $sourceMap['sources'] = array();
+        foreach($this->sources as $source_uri => $source_filename){
+            $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
+        }
 
 
@@ -10118 +10209 @@
         }
 
+        $this->source_keys = array_flip(array_keys($this->sources));
+
+
         // group mappings by generated line number.
         $groupedMap = $groupedMapEncoded = array();
@@ -10141 +10235 @@
                 // find the index
                 if( $m['source_file'] ){
-                    $index = $this->findFileIndex($this->normalizeFilename($m['source_file']));
+                    $index = $this->findFileIndex($m['source_file']);
                     if( $index !== false ){
                         $mapEncoded .= $this->encoder->encode($index - $lastOriginalIndex);
@@ -10171 +10265 @@
      */
     protected function findFileIndex($filename){
-        return array_search($filename, array_keys($this->sources));
+        return $this->source_keys[$filename];
     }
 

less-compiler/trunk/libs/less-parser/Version.php

@@ -9 +9 @@
 class Less_Version{
 
-    const version = '1.7.0.1';          // The current build number of less.php
+    const version = '1.7.0.2';          // The current build number of less.php
     const less_version = '1.7';         // The less.js version that this build should be compatible with
     const cache_version = '170';        // The parser cache version

less-compiler/trunk/libs/wm-settings/wm-settings.css

@@ -2 +2 @@
 form.wrap p.submit {
     padding-top: 20px;
-    border-top: 1px solid #dfdfdf;
+    border-top: 1px solid #ddd;
 }
 form.wrap td .settings-error {
@@ -11 +11 @@
     margin: 0.5em 0;
 }
+form.wrap .wm-settings-tabs-header h3 {
+    float: left;
+    padding: 10px 15px;
+    font-weight: 300;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-right: none;
+    border-bottom: none;
+    cursor: pointer;
+}
+form.wrap .wm-settings-tabs-header h3:hover {
+    background-color: #f9f9f9;
+}
+form.wrap .wm-settings-tabs-header h3.wm-settings-tab-active {
+    background-color: #f1f1f1;
+}
+form.wrap .wm-settings-tabs-header h3:last-child {
+    border-right: 1px solid #ddd;
+}
+.wm-settings-tabs-header,
+.wm-settings-tabs-content {
+    clear: both;
+}

less-compiler/trunk/libs/wm-settings/wm-settings.js

@@ -1 +1 @@
 jQuery(document).ready(function ($) {
   'use strict';
+  var tabs = $('.wm-settings-tab', 'form'),
+    tabsHeader,
+    tabsContent,
+    active = 'wm-settings-tab-active',
+    current = $('#wm-settings-current-tab');
+  if (tabs.length) {
+    tabsHeader = $('<div>').addClass('wm-settings-tabs-header').insertBefore('form .submit:first');
+    tabsContent = $('<div>').addClass('wm-settings-tabs-content').insertAfter(tabsHeader);
+    tabs.each(function(i, el) {
+      var title = $(el).prev('h3').appendTo(tabsHeader),
+        nextAll = $(el).nextAll(),
+        tab = $('<div>').appendTo(tabsContent).hide();
+      nextAll.each(function() {
+        var tag = $(this).prop('tagName');
+        if (tag === 'H3' || tag === 'INPUT') {
+          return false;
+        }
+        $(this).appendTo(tab);
+      });
+      title.click(function(e) {
+        e.preventDefault();
+        if (!title.hasClass(active)) {
+          current.val(i);
+          $('.' + active, tabsContent).fadeOut('fast', function() {
+            $('.' + active, 'form').removeClass(active);
+            title.addClass(active);
+            tab.fadeIn('fast').addClass(active);
+          });
+        }
+      });
+    });
+    tabsHeader.children().eq(current.val()).addClass(active);
+    tabsContent.children().eq(current.val()).show().addClass(active);
+  }
   $('.wm-settings-media', 'form').each(function () {
     var frame,

less-compiler/trunk/libs/wm-settings/wm-settings.php

@@ -1 +1 @@
 <?php
 /*
-http://webmaestro.fr/wordpress-settings-api-options-pages/
+Plugin Name: WebMaestro Settings
+Plugin URI: http://webmaestro.fr/wordpress-settings-api-options-pages/
+Author: Etienne Baudry
+Author URI: http://webmaestro.fr
+Description: Simplified options system for WordPress. Generates a default page for settings.
+Version: 1.2.4
+License: GNU General Public License
+License URI: license.txt
+Text Domain: wm-settings
+GitHub Plugin URI: https://github.com/WebMaestroFr/wm-settings
+GitHub Branch: master
 */
 
@@ -28 +38 @@
     $this->args  = array_merge( array(
       'submit' => __( 'Save Settings', 'wm-settings' ),
-      'reset'  => __( 'Reset Settings', 'wm-settings' )
+      'reset'  => __( 'Reset Settings', 'wm-settings' ),
+      'tabs'   => true
     ), $args );
     add_action( 'admin_menu', array( $this, 'admin_menu' ) );
@@ -63 +74 @@
       }
     }
+    // This is really ugly, there must be a better way to deal with that active tab
+    $current_tag = "wm_settings_{$this->page}_current_tab";
+    if ( isset( $_POST[$current_tag] ) ) {
+      update_option( $current_tag, (int) $_POST[$current_tag] );
+    }
   }
 
@@ -146 +162 @@
   { ?>
     <form action="options.php" method="POST" enctype="multipart/form-data" class="wrap">
+      <input type="hidden" name="wm_settings_<?php echo $this->page; ?>_current_tab" value="<?php echo get_option( "wm_settings_{$this->page}_current_tab" ); ?>" id="wm-settings-current-tab">
       <h2><?php echo $this->title; ?></h2>
       <?php
         // Avoid showing admin notice twice
-        // TODO : Target the pages where it happens
         if ( ! in_array( $this->menu['parent'], array( 'options-general.php' ) ) ) {
           settings_errors();
@@ -168 +184 @@
   {
     extract( $args );
+    echo "<input name='{$id}[{$this->page}_setting]' type='hidden' value='{$id}'";
+    if ( $this->args['tabs'] && ! empty( $this->settings[$id]['title'] ) ) {
+      echo " class='wm-settings-tab'";
+    }
+    echo " />";
     if ( $text = $this->settings[$id]['description'] ) {
       echo wpautop( $text );
     }
-    echo "<input name='{$id}[{$this->page}_setting]' type='hidden' value='{$id}' />";
   }
 
@@ -187 +207 @@
     {
       case 'checkbox':
-        $check = checked( 1, $value, false);
+        $check = checked( 1, $value, false );
         echo "<label><input {$attrs} id='{$id}' type='checkbox' value='1' {$check} />";
         if ( $description ) { echo " {$description}"; }
@@ -216 +236 @@
       case 'media':
         echo "<fieldset class='wm-settings-media' id='{$id}'><input {$attrs} type='hidden' value='{$value}' />";
+        echo "<p><a class='button button-large wm-select-media' title='{$label}'>" . sprintf( __( 'Select %s', 'wm-settings' ), $label ) . "</a> ";
+        echo "<a class='button button-small wm-remove-media' title='{$label}'>" . sprintf( __( 'Remove %s', 'wm-settings' ), $label ) . "</a></p>";
         if ( $value ) {
-          echo wp_get_attachment_image( $value, 'medium' );
-        }
-        echo "<p><a class='button button-large wm-select-media' title='{$label}'>" . sprintf( __( 'Select %s', 'wm-settings' ), $label ) . "</a> ";
-        echo "<a class='button button-small wm-remove-media' title='{$label}'>" . sprintf( __( 'Remove %s', 'wm-settings' ), $label ) . "</a></p>{$desc}</fieldset>";
+          echo wpautop( wp_get_attachment_image( $value, 'medium' ) );
+        }
+        echo "{$desc}</fieldset>";
         break;
 
@@ -232 +253 @@
         foreach ( $options as $n => $label ) {
           $a = preg_replace( "/name\=\'(.+)\'/", "name='$1[{$n}]'", $attrs );
-          $check = checked( 1, $value[$n], false);
+          $check = checked( 1, $value[$n], false );
           $options[$n] = "<label><input {$a} type='checkbox' value='1' {$check} /> {$label}</label>";
         }
@@ -352 +373 @@
 }
 
+function wm_settings_plugin_priority()
+{
+    $wm_settings = plugin_basename( __FILE__ );
+    $active_plugins = get_option( 'active_plugins' );
+    if ( $order = array_search( $wm_settings, $active_plugins ) ) {
+        array_splice( $active_plugins, $order, 1 );
+        array_unshift( $active_plugins, $wm_settings );
+        update_option( 'active_plugins', $active_plugins );
+    }
+}
+add_action( 'activated_plugin', 'wm_settings_plugin_priority' );
+
 }
 

less-compiler/trunk/plugin.php

@@ -6 +6 @@
 Author URI: http://webmaestro.fr
 Description: Less Compiler for Wordpress
-Version: 1.2.2
+Version: 1.3
 License: GNU General Public License
 License URI: license.txt
@@ -61 +61 @@
         add_action( 'wp_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
         // add_editor_style( get_stylesheet_directory_uri() . self::$output );
+        add_filter( 'style_loader_src', array( __CLASS__, 'style_loader_src' ) );
     }
 
@@ -71 +72 @@
         ), array(
             'less' => array(
-                'description' => '<p>' . sprintf( __( 'The resulting CSS will be compiled into <strong>%s</strong>. You can use the PHP function <code>less_output( $css_file );</code> to output an other file instead (relative to <strong>%s</strong>).', 'wm-less' ), self::$output, get_stylesheet_directory() ) . '</p><p>' . __( 'Import any LESS files to compile prior to this stylesheet with <code>less_import( $files_array );</code>.', 'wm-less' ) . '</p>',
+                'description' => '<p>' .
+                        sprintf( __( 'The resulting CSS will be compiled into <strong>%s</strong>.', 'wm-less' ), ltrim( self::$output, '/' ) ) .
+                        ' ' . sprintf( __( 'You can use the PHP function <code>less_output( $css_file );</code> to output an other file instead (relative to <strong>%s</strong>).', 'wm-less' ), get_stylesheet_directory() ) .
+                        ' ' . __( 'Do not set your theme\'s <strong>style.css</strong> as output !', 'wm-less' ) .
+                    '</p><p>' .
+                        __( 'Import any LESS files to compile prior to this stylesheet with <code>less_import( $files_array );</code>.', 'wm-less' ) .
+                    '</p><p>' .
+                        __( 'Alternatively, you can enqueue any LESS sheet the same way you would for your CSS : <code>wp_enqueue_style( $handle, $src, $deps, $ver, $media );</code>.', 'wm-less' ) .
+                    '</p>',
                 'fields' => array(
                     'compiler' => array(
@@ -128 +137 @@
     {
         require_once( plugin_dir_path( __FILE__ ) . 'libs/less-parser/Less.php' );
+        $parser = new Less_Parser( array(
+            'compress' => true,
+            'cache_dir' => self::get_cache_dir()
+        ) );
+        $parser->SetImportDirs( array(
+            get_stylesheet_directory() => '',
+            get_template_directory() => ''
+        ) );
         try {
-            $cache_dir = plugin_dir_path( __FILE__ ) . 'cache';
-            if ( ! is_writable( $cache_dir ) ) {
-                add_action( 'admin_notices', array( __CLASS__, 'cache_permissions_notice' ) );
-            }
-            $parser = new Less_Parser( array(
-                'compress' => true,
-                'cache_dir' => is_writable( $cache_dir ) ? $cache_dir : null
-            ) );
-            $parser->SetImportDirs( array(
-                get_stylesheet_directory() => '',
-                get_template_directory() => ''
-            ) );
             foreach ( self::$imports as $file ) {
                 $parser->parse( "@import '{$file}';" );
@@ -152 +157 @@
         }
     }
+    private static function get_cache_dir()
+    {
+        $cache_dir = ABSPATH . 'wp-content/cache';
+        if ( ! is_dir( $cache_dir ) ) {
+            mkdir( $cache_dir );
+        }
+        if ( ! is_writable( $cache_dir ) ) {
+            add_action( 'admin_notices', array( __CLASS__, 'cache_permissions_notice' ) );
+            return null;
+        }
+        return $cache_dir;
+    }
 
     public static function admin_enqueue_scripts( $hook_suffix )
     {
         if ( 'toplevel_page_less' == $hook_suffix ) {
-            wp_enqueue_script( 'codemirror', plugin_dir_url( __FILE__ ) . '/js/codemirror.js' );
-            wp_enqueue_script( 'codemirror-less', plugin_dir_url( __FILE__ ) . '/js/codemirror-less.js', array( 'codemirror' ) );
-            wp_enqueue_script( 'less-compiler', plugin_dir_url( __FILE__ ) . '/js/less-compiler.js', array( 'codemirror-less' ) );
-            wp_enqueue_style( 'codemirror', plugin_dir_url( __FILE__ ) . '/css/codemirror.css' );
-            wp_enqueue_style( 'less-compiler', plugin_dir_url( __FILE__ ) . '/css/less-compiler.css' );
+            wp_enqueue_script( 'codemirror', plugin_dir_url( __FILE__ ) . 'js/codemirror.js' );
+            wp_enqueue_script( 'codemirror-less', plugin_dir_url( __FILE__ ) . 'js/codemirror-less.js', array( 'codemirror' ) );
+            wp_enqueue_script( 'less-compiler', plugin_dir_url( __FILE__ ) . 'js/less-compiler.js', array( 'codemirror-less' ) );
+            wp_enqueue_style( 'codemirror', plugin_dir_url( __FILE__ ) . 'css/codemirror.css' );
+            wp_enqueue_style( 'less-compiler', plugin_dir_url( __FILE__ ) . 'css/less-compiler.css' );
         }
     }
@@ -170 +187 @@
         }
     }
+
+    public static function style_loader_src( $src )
+    {
+        $input = strtok( $src, '?' );
+    if ( preg_match( '/\.less$/', $input ) ) {
+            require_once( plugin_dir_path( __FILE__ ) . 'libs/less-parser/Less.php' );
+            $input = str_replace( trailingslashit( site_url() ), ABSPATH, $input );
+            if ( $cache_dir = self::get_cache_dir() ) {
+                return trailingslashit( str_replace( ABSPATH, trailingslashit( site_url() ), $cache_dir ) ) . Less_Cache::Get( array(
+                        $input => dirname( $input )
+                    ), array(
+                        'cache_dir' => $cache_dir
+                    ) );
+            }
+            return null;
+    }
+    return $src;
+    }
 }
 add_action( 'init', array( 'WM_Less', 'init' ) );

less-compiler/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.9
 Tested up to: 3.9.1
-Stable tag: 1.2
+Stable tag: 1.3
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -39 +39 @@
   Import any LESS files to compile prior to the dashboard stylesheet.
 
+- ```wp_enqueue_style( 'my-less-handle', 'http://example.com/css/mystyle.less', $deps, $ver, $media );```
+
+  Alternatively you can register and enqueue your LESS sheets the same way you would do for your CSS.
+
+
 You will most likely use these in your theme's `functions.php`.
 
-The plugin uses [**leafo**'s LESS compiler written in PHP](https://github.com/leafo/lessphp).
+The plugin uses [the Less.php Compiler](http://lessphp.gpeasy.com/).
 
 == Installation ==
@@ -62 +67 @@
 == Changelog ==
 
-= 1.2 =
-* Minor fixes (typo, dependences)
+= 1.3 =
+* "wp_enqueue_style" support
+* Moved cache directory to wp-content/cache
 
-= 1.0 =
-* First stable release
-
-== Upgrade Notice ==
+= 1.2.2 =
+* Menu icon and cache warning
 
 = 1.2 =
 * Minor fixes (typo, dependences)
 
-= 1.0 =
-First stable release
+== Upgrade Notice ==
+
+= 1.3 =
+* "wp_enqueue_style" support
+* Moved cache directory to wp-content/cache
+
+= 1.2 =
+* Minor fixes (typo, dependences)