Permalink
Browse files

merging in kroo's fork -- @import statements +tests

  • Loading branch information...
jaredly committed Jun 19, 2010
2 parents 5f76cc2 + d468b9d commit 04536763f98bf5285194595a39e21c41d7c63b1a
Showing with 630 additions and 113 deletions.
  1. +3 −0 .gitignore
  2. +5 −0 BUGFIXES
  3. +2 −2 bin/ccss
  4. +393 −0 clevercss/clevercss.py
  5. +2 −1 clevercss/consts.py
  6. +45 −11 clevercss/engine.py
  7. +9 −17 clevercss/errors.py
  8. +1 −1 clevercss/expressions.py
  9. +4 −1 clevercss/line_iterator.py
  10. +13 −79 setup.py
  11. +145 −1 tests/ccss_to_css.py
  12. +8 −0 tests/example.ccss
View
@@ -3,3 +3,6 @@
*.pyo
*.swp
*.swo
+CleverCSS.egg-info
+build
+dist
View
@@ -1,5 +1,10 @@
List of bug fixes since CleverCSS-0.1
===================================
+5/27/10 - v.0.1.6 - submitted by Elliot Kroo - added support for @import statements. Syntax is similar to css, but expects a clever css file -- namely, they must be defined at the top of the file, and will be parsed as a clevercss file.
+
+9/18/09 - v.0.1.5 - submitted by Tim Babych - The Parser was not aware of negative numbers. Thus any minus sign was an operator, leading to unneeded calculations. Say, "margin: -2px -2px" was converted into "margin: -4px"
+
+9/18/09 - v.0.1.5 - submitted by Tim Babych - LineIterator was not filtering out "\n"s that were left after trimming /* comments */, causing an exception in Parser
9/01/09 - v.0.1.4 - submitted by David Niergarth and 'Lasse' - Missing None check in Engine.evaluate which causes context to always be reset to {}.
View
@@ -39,7 +39,7 @@ def main():
(options, args) = parser.parse_args()
if options.eigen_test:
- do_test()
+ print do_test()
elif options.list_colors:
list_colors()
elif options.to_ccss:
@@ -92,7 +92,7 @@ def do_test():
rx = re.compile(r'Example::\n(.*?)__END__(?ms)')
text = rx.search(clevercss.__doc__).group(1)
ccss = '\n'.join(line[8:].rstrip() for line in text.splitlines())
- print clevercss.convert(ccss)
+ return clevercss.convert(ccss)
def list_colors():
print '%d known colors:' % len(clevercss.consts.COLORS)
Oops, something went wrong.

0 comments on commit 0453676

Please sign in to comment.