less 1.1.10 → 1.1.11

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.1.11

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.1.10"
+  s.version = "1.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-07-31}
+  s.date = %q{2009-08-01}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}

data/lib/less/engine/grammar/entity.tt

@@ -5,7 +5,7 @@ module Less
       # Entity: Any whitespace delimited token
       #
       rule entity
-        function / fonts / keyword / accessor / variable / literal / important
+        function / fonts / keyword / accessor / variable / literal
       end
 
       rule fonts
@@ -51,15 +51,6 @@ module Less
         }
       end
 
-      # !important
-      rule important
-        '!important' {
-          def build
-            Node::Keyword.new(text_value)
-          end
-        }
-      end
-
       #
       # `blue`, `small`, `normal` etc.
       #

data/lib/less/engine/grammar/less.tt

@@ -41,9 +41,9 @@ module Less
     end
 
     rule import
-      "@import" S url:(string / url) medias? s ';' ws {
+      ws "@import" S url:(string / url) medias? s ';' ws {
         def build env
-          path = File.join(env.root.file, url.value)
+          path = File.join(env.root.file || Dir.pwd, url.value)
           path += '.less' unless path =~ /\.(le|c)ss$/
           if File.exist? path
             imported = Less::Engine.new(File.new(path)).to_tree
@@ -133,13 +133,13 @@ module Less
           [expression] + tail.elements.map {|i| [i.operator, i.expression] }.flatten.compact
         end
       # Space-delimited expressions
-      } / expression tail:(WS expression)* {
+      } / expression tail:(WS expression)* i:important? {
         def build env
           all.map {|e| e.build(env) if e.respond_to? :build }.compact
         end
         
         def all
-          [expression] + tail.elements.map {|f| f.expression }
+          [expression] + tail.elements.map {|f| f.expression } + [i]
         end
       # Catch-all rule
       } / [-a-zA-Z0-9_%*/.&=:,#+? \[\]()]+ {
@@ -160,6 +160,15 @@ module Less
         end
       }
     end
+    
+    # !important
+    rule important
+      s '!' s 'important' {
+        def build env
+          Node::Keyword.new(text_value.strip)
+        end
+      }
+    end
 
     #
     # An identifier
@@ -207,7 +216,7 @@ module Less
     end
 
     rule select
-      (s [+>~] s / s ':' / S)?
+      (s [+>~] s / '::' / s ':' / S)?
     end
 
     # TODO: Merge this with attribute rule

data/lib/less/engine/nodes/selector.rb

@@ -4,11 +4,12 @@ module Less
       include Entity
       
       Selectors = {
-        :Descendant => '',
-        :Child      => '>',
-        :Adjacent   => '+',
-        :Pseudo     => ':',
-        :Sibling    => '~'
+        :Descendant    => '',
+        :Child         => '>',
+        :Adjacent      => '+',
+        :PseudoClass   => ':',
+        :PseudoElement => '::',
+        :Sibling       => '~'
       }
   
       def initialize
@@ -32,7 +33,11 @@ module Less
       def to_css; " #{self} " end
     end
 
-    class Pseudo < Selector
+    class PseudoClass < Selector
+      def to_css; self end
+    end
+    
+    class PseudoElement < Selector
       def to_css; self end
     end
   end

data/spec/css/css-3.css

@@ -1,2 +1,3 @@
 p:not([class*="lead"]) { color: black; }
 a[href^="http://"], a[href$="http://"] { color: black; }
+p::before { color: black; }

data/spec/css/css.css

@@ -40,7 +40,11 @@ h2[title] { font-size: 100%; }
   display: -moz-inline-stack;
   width: 0.1em;
   background-color: #009998;
-  color: red !important;
   background-image: url(images/image.jpg);
   background: -webkit-gradient(linear, left top, left bottom, from(red), to(blue));
 }
+#important {
+  color: red !important;
+  width: 100% !important;
+  height: 20px ! important;
+}

data/spec/less/css-3.less

@@ -9,3 +9,7 @@ a[href^="http://"] {
 a[href$="http://"] {
   color: black;
 }
+
+p::before {
+  color: black;
+}

data/spec/less/css.less

@@ -91,9 +91,14 @@ h2[title] {
   display: -moz-inline-stack;
   width: .1em;
   background-color: #009998;
-  color: red !important;
   background-image: url(images/image.jpg);
   background: -webkit-gradient(linear, left top, left bottom, from(red), to(blue));
   margin: ;
 }
 
+#important {
+  color: red !important;
+  width: 100%!important;
+  height: 20px ! important;
+}
+

data/spec/less/import/import-test-c.less

@@ -1,3 +1,4 @@
+
 @import "import-test-d.css";
 @c: red;
 

data/spec/less/whitespace.less

@@ -1,5 +1,8 @@
+
+
 .whitespace
   { color: white; }  
+  
 .whitespace
 {
   color: white;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-31 00:00:00 -04:00
+date: 2009-08-01 00:00:00 +02:00
 default_executable: lessc
 dependencies: []