Permalink
Commits on Oct 5, 2010
  1. Clean up Functions.signature.

    nex3 committed Oct 5, 2010
  2. Touch up the documentation.

    nex3 committed Oct 5, 2010
Commits on Oct 4, 2010
  1. Make various infrastructure bits aware of keyword arguments.

    Conversion especially was lacking support.
    nex3 committed Oct 4, 2010
  2. Fix parsing for passing in keyword arguments.

    This both removes the need for extra lookahead in the lexer,
    and cleans up the keyword-argument API.
    nex3 committed Oct 4, 2010
  3. Add tests for parser errors.

    nex3 committed Oct 4, 2010
  4. Revert "Give the Sass Lexer a lookahead of 2 for keyword argument sup…

    …port."
    
    This reverts commit f73854c.
    nex3 committed Oct 4, 2010
  5. Merge branch 'master' into keyword-args

    Conflicts:
    	lib/sass/script/funcall.rb
    nex3 committed Oct 4, 2010
  6. Merge branch 'merged'

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    	lib/haml/precompiler.rb
    	test/haml/engine_test.rb
    nex3 committed Oct 4, 2010
  7. Merge branch 'stable' into merged

    Conflicts:
    	doc-src/HAML_CHANGELOG.md
    nex3 committed Oct 4, 2010
  8. [Haml] Allow newlines between case and when.

    Closes gh-289
    nex3 committed Oct 4, 2010
Commits on Oct 3, 2010
  1. Merge branch 'merged'

    nex3 committed Oct 3, 2010
Commits on Oct 2, 2010
  1. Merge branch 'master' into keyword_args

    * master: (23 commits)
      Fixed ruby 1.9.2 compatibility
      Bump VERSION to 3.0.21.
      Really fix the permissions errors.
      [Sass] Fix more #options bugs.
      Don't use Shellwords.shellescape.
      Revert "Set options on operands during Operation#perform."
      Bump VERSION to 3.0.20.
      [Sass] Make sure CSS function results get #options set.
      As part of packaging, fix up some permissions that can apparently go screwy.
      Set options on operands during Operation#perform.
      Bump VERSION to 3.0.19.
      [Sass] Remove spaces after commas in `:compressed` mode.
      [Haml] Fix interpolated if statements with HTML-escaping.
      [Haml] Fix engine_test for Ruby 1.8.
      [Haml] Properly dump encoded strings for the precompiled template.
      [Haml] Fix up a few more of the encoding assertions.
      [Haml] Fix an exception-swallowing bug.
      [Haml] Make encoding tests make a little more sense.
      [Haml] Fix encoding tests under Ruby 1.9.1.
      [Haml] Clean up the encoding tests.
      ...
    
    Conflicts:
    	lib/sass/script/funcall.rb
    	test/sass/engine_test.rb
    chriseppstein committed Oct 2, 2010