less 1.0.6 → 1.0.8

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.8

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.0.6"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-07-14}
+  s.date = %q{2009-07-15}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}
@@ -129,6 +129,7 @@ Gem::Specification.new do |s|
      "spec/command_spec.rb",
      "spec/css/accessors-1.0.css",
      "spec/css/big-1.0.css",
+     "spec/css/colors-1.0.css",
      "spec/css/comments-1.0.css",
      "spec/css/css-1.0.css",
      "spec/css/functions-1.0.css",

data/lib/less/engine/less.tt

@@ -113,7 +113,7 @@ grammar Less
   # An operation or compound value
   #
   rule expression
-    entity (operator / S) expression <Builder> / entity
+    entity (operator / S / WS) expression <Builder> / entity
   end
   
   #
@@ -165,7 +165,7 @@ grammar Less
   # div / .class / #id / input[type="text"] / lang(fr)
   #
   rule element
-    (class_id / tag / ident) attribute* ('(' ident ')')? / '@media' / '@font-face'
+    (class_id / tag / ident) attribute* ('(' ident ')')? / attribute+ / '@media' / '@font-face'
   end
   
   rule class_id
@@ -248,7 +248,7 @@ grammar Less
   # `blue`, `small`, `normal` etc.
   #
   rule keyword
-    [a-zA-Z] [-a-zA-Z]* !ns {
+    [-a-zA-Z]+ !ns {
       def build env
         env.identifiers.last << Node::Keyword.new(text_value)
       end
@@ -367,6 +367,10 @@ grammar Less
     [\n ]*
   end
   
+  rule WS
+    [\n ]+
+  end
+  
   # Non-space char
   rule ns
     ![ ;\n] .

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

@@ -13,14 +13,21 @@ module Less
     #
     class Color < DelegateClass(Fixnum)
       include Literal
-      attr_reader :color
+      attr_reader :color, :opacity
       
       def initialize color = nil, opacity = 1.0
+        @opacity = opacity
         @color = if color.is_a? Array
           rgba color
         elsif color.is_a? ::String
           color.delete! unit
-          (color * ( color.length < 6 ? 6 / color.length : 1 )).to_i 16
+          if color.length == 3
+            color.split(//).map {|v| v + v }.join('').to_i 16
+          elsif color.length == 6
+            color.to_i 16
+          else
+            color
+          end
         else
           color
         end
@@ -31,12 +38,17 @@ module Less
         '#'
       end
     
+      def hex
+        v = [[to_i, 0].max, 256 ** 3].min
+        "%06x" % [v]
+      end
+    
       def to_css
-        unit + if self <= 0
-          '0' * 6
+        if opacity and opacity < 1.0
+          colors = hex.scan(/../).map {|v| v.to_i(16) }.join(", ")
+          "rgba(#{colors}, #{opacity})"
         else
-          hex = self.to_i.to_s(16)
-          '0' * (6 - hex.length) + hex
+          unit + hex
         end
       end
     

data/lib/less/engine/parser.rb

@@ -1265,14 +1265,19 @@ module Less
         if r5
           r3 = r5
         else
-          @index = i3
-          r3 = nil
+          r6 = _nt_WS
+          if r6
+            r3 = r6
+          else
+            @index = i3
+            r3 = nil
+          end
         end
       end
       s1 << r3
       if r3
-        r6 = _nt_expression
-        s1 << r6
+        r7 = _nt_expression
+        s1 << r7
       end
     end
     if s1.last
@@ -1285,9 +1290,9 @@ module Less
     if r1
       r0 = r1
     else
-      r7 = _nt_entity
-      if r7
-        r0 = r7
+      r8 = _nt_entity
+      if r8
+        r0 = r8
       else
         @index = i0
         r0 = nil
@@ -1754,28 +1759,47 @@ module Less
     if r1
       r0 = r1
     else
-      if has_terminal?('@media', false, index)
-        r13 = instantiate_node(SyntaxNode,input, index...(index + 6))
-        @index += 6
-      else
-        terminal_parse_failure('@media')
+      s13, i13 = [], index
+      loop do
+        r14 = _nt_attribute
+        if r14
+          s13 << r14
+        else
+          break
+        end
+      end
+      if s13.empty?
+        @index = i13
         r13 = nil
+      else
+        r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
       end
       if r13
         r0 = r13
       else
-        if has_terminal?('@font-face', false, index)
-          r14 = instantiate_node(SyntaxNode,input, index...(index + 10))
-          @index += 10
+        if has_terminal?('@media', false, index)
+          r15 = instantiate_node(SyntaxNode,input, index...(index + 6))
+          @index += 6
         else
-          terminal_parse_failure('@font-face')
-          r14 = nil
+          terminal_parse_failure('@media')
+          r15 = nil
         end
-        if r14
-          r0 = r14
+        if r15
+          r0 = r15
         else
-          @index = i0
-          r0 = nil
+          if has_terminal?('@font-face', false, index)
+            r16 = instantiate_node(SyntaxNode,input, index...(index + 10))
+            @index += 10
+          else
+            terminal_parse_failure('@font-face')
+            r16 = nil
+          end
+          if r16
+            r0 = r16
+          else
+            @index = i0
+            r0 = nil
+          end
         end
       end
     end
@@ -2658,41 +2682,37 @@ module Less
     end
 
     i0, s0 = index, []
-    if has_terminal?('[a-zA-Z]', true, index)
-      r1 = true
-      @index += 1
-    else
+    s1, i1 = [], index
+    loop do
+      if has_terminal?('[-a-zA-Z]', true, index)
+        r2 = true
+        @index += 1
+      else
+        r2 = nil
+      end
+      if r2
+        s1 << r2
+      else
+        break
+      end
+    end
+    if s1.empty?
+      @index = i1
       r1 = nil
+    else
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
     end
     s0 << r1
     if r1
-      s2, i2 = [], index
-      loop do
-        if has_terminal?('[-a-zA-Z]', true, index)
-          r3 = true
-          @index += 1
-        else
-          r3 = nil
-        end
-        if r3
-          s2 << r3
-        else
-          break
-        end
-      end
-      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-      s0 << r2
-      if r2
-        i4 = index
-        r5 = _nt_ns
-        if r5
-          r4 = nil
-        else
-          @index = i4
-          r4 = instantiate_node(SyntaxNode,input, index...index)
-        end
-        s0 << r4
+      i3 = index
+      r4 = _nt_ns
+      if r4
+        r3 = nil
+      else
+        @index = i3
+        r3 = instantiate_node(SyntaxNode,input, index...index)
       end
+      s0 << r3
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -3846,6 +3866,40 @@ module Less
     r0
   end
 
+  def _nt_WS
+    start_index = index
+    if node_cache[:WS].has_key?(index)
+      cached = node_cache[:WS][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      if has_terminal?('[\\n ]', true, index)
+        r1 = true
+        @index += 1
+      else
+        r1 = nil
+      end
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    if s0.empty?
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+    end
+
+    node_cache[:WS][start_index] = r0
+
+    r0
+  end
+
   module Ns0
   end
 

data/spec/css/colors-1.0.css

@@ -0,0 +1,6 @@
+#yelow #short { color: #ffeeaa; }
+#yelow #long { color: #ffeeaa; }
+#yelow #rgba { color: rgba(255, 238, 170, 0.1); }
+#blue #short { color: #0000ff; }
+#blue #long { color: #0000ff; }
+#blue #rgba { color: rgba(0, 0, 255, 0.1); }

data/spec/css/css-1.0.css

@@ -22,6 +22,7 @@ q:lang(no) { quotes: none; }
 p + h1 { font-size: 2.2em; }
 input[type="text"] { font-weight: normal; }
 h2[title] { font-size: 100%; }
+[disabled] { color: transparent; }
 #shorthands {
   border: 1px solid #000000;
   font: 12px/16px Arial;
@@ -36,6 +37,7 @@ h2[title] { font-size: 100%; }
 }
 .misc {
   -moz-border-radius: 2px;
+  display: -moz-inline-stack;
   width: 0.1em;
   background-color: #009998;
   color: red !important;

data/spec/css/operations-1.0.css

@@ -18,8 +18,8 @@
 }
 .shorthands { padding: -1px 2px 0 -4px; }
 .colors {
-  color: #123123;
-  border-color: #345345;
+  color: #112233;
+  border-color: #334455;
   background-color: #000000;
 }
 .colors .other {

data/spec/css/scope-1.0.css

@@ -1,6 +1,6 @@
 .tiny-scope {
   color: none;
-  border-color: #989989;
+  border-color: #998899;
 }
 .scope1 {
   color: blue;

data/spec/css/whitespace-1.0.css

@@ -11,3 +11,4 @@
   color: white;
   white-space: pre;
 }
+.newlines { border: 2px solid black; }

data/spec/engine_spec.rb

@@ -54,6 +54,10 @@ describe Less::Engine do
       lessify(:accessors).should == css(:accessors)
     end
     
+    it "should parse colors in hex" do
+      lessify(:colors).should == css(:colors)
+    end
+    
     it "should parse mixins" do
       lessify(:mixins).should == css(:mixins)
     end

data/spec/less/colors-1.0.less

@@ -0,0 +1,27 @@
+#yelow {
+  #short {
+    color: #fea;
+  }
+
+  #long {
+    color: #ffeeaa;
+  }
+  
+  #rgba {
+    color: rgba(255, 238, 170, 0.1);
+  }
+}
+
+#blue {
+  #short {
+    color: #00f;
+  }
+
+  #long {
+    color: #0000ff;
+  }
+
+  #rgba {
+    color: rgba(0, 0, 255, 0.1);
+  }
+}

data/spec/less/css-1.0.less

@@ -68,6 +68,10 @@ h2[title] {
   font-size: 100%;
 }
 
+[disabled] {
+  color: transparent;
+}
+
 #shorthands {
   border: 1px solid #000;
   font: 12px/16px Arial;
@@ -84,6 +88,7 @@ h2[title] {
 
 .misc {
   -moz-border-radius: 2px;
+  display: -moz-inline-stack;
   width: .1em;
   background-color: #009998;
   color: red !important;

data/spec/less/operations-1.0.less

@@ -29,8 +29,8 @@
 }
 
 .colors {
-  color: #123; // #123123
-  border-color: #234 + #111111; // #345345
+  color: #123; // #112233
+  border-color: #234 + #111111; // #334455
   background-color: #222222 - #fff; // #000000
   .other {
     color: 2 * #111; // #222222

data/spec/less/whitespace-1.0.less

@@ -20,6 +20,11 @@
   color: white;
   white-space: pre
 }
+.newlines {
+  border: 2px
+          solid
+          black;
+}
 .empty {
   
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: less
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -04:00
+date: 2009-07-15 00:00:00 -04:00
 default_executable: lessc
 dependencies: []
 
@@ -136,6 +136,7 @@ files:
 - spec/command_spec.rb
 - spec/css/accessors-1.0.css
 - spec/css/big-1.0.css
+- spec/css/colors-1.0.css
 - spec/css/comments-1.0.css
 - spec/css/css-1.0.css
 - spec/css/functions-1.0.css