From 568e8236d389c7345a821442bbf5fdb4c106ea1c Mon Sep 17 00:00:00 2001
From: Simon George <simon@sfcgeorge.co.uk>
Date: Fri, 1 Jul 2011 17:21:55 +0100
Subject: [PATCH] Cleaned up some code a teensy bit, added README

---
 README.md                           | 32 +++++++++++++++++++++++++++++
 SyntaxInjections/EmbeddedTweaks.xml | 11 ----------
 Syntaxes/CSS.xml                    | 14 +++++++++++++
 3 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..488dc89
--- /dev/null
+++ b/README.md
@@ -0,0 +1,32 @@
+# SCSS (Sass) Sugar for Espresso 2
+
+## Features (Work in progress)
+
+This Sugar is nowhere near complete. It's better than nothing, but barely. Here is what is currently supported:
+
+* Use of .scss file extension or .css.scss extension to trigger the Sugar
+* CSS (plain and simple) - this is inherited from the default CSS Sugar
+* @include selector (works well in blocks but dodgy at document root level)
+
+## What Why Who?
+
+I'm just a programmer and designer who loves Espresso and Sass. There [was] no Sass Sugar for Espresso in active development, and the one/two I found were incomplete. This Sugar is arguably more incomplete, but I aim to change that.
+
+## Can I help?
+
+If you want to help, that would be great. I have no experience with collaborative development or GitHub, but lets give it a shot!
+
+### Implementation
+
+Basic CSS structure and functionality is already implemented by the Default CSS Sugar, so why reinvent the wheel? We include the default CSS Syntax, then build on it using SyntaxInjections. We shouldn't need to touch the Syntax file often, use SyntaxInjections where possible. I have left some of the original CSS Sugar commented out purely for reference.
+
+### Direction
+
+Aim to get the Syntax complete first, then work on Itemizers to get the Navigator working right. Once these core basics are done, finally we can add the fancy stuff like CodeSense.
+
+### Contact
+
+* Try the Espresso IRC room -  ##espresso
+* Message me on GitHub
+* Tweet to me @sibrow
+* Email me... actually I have enought Russian brides as it is, sorry
\ No newline at end of file
diff --git a/SyntaxInjections/EmbeddedTweaks.xml b/SyntaxInjections/EmbeddedTweaks.xml
index 9775ff5..21ec35c 100644
--- a/SyntaxInjections/EmbeddedTweaks.xml
+++ b/SyntaxInjections/EmbeddedTweaks.xml
@@ -3,16 +3,5 @@
 <injections>
 	<injection name="injections.properties.css.scss" selector="scss property-list.block.css" action="insert-after-children">
 		<include syntax="language-root.css.scss" collection="at-rule-include"/>
-	</injection>
-	
-	<!-- From HTML+XML - reference examples
-	
-	<injection name="injections.html.cssfix" selector="embedded-style.html *" action="insert-before-children">
-		<cut-off>&lt;/style></cut-off>
 	</injection>
-
-	<injection name="injections.html.jsfix" selector="embedded.language-root.js *" action="insert-before-children">
-		<cut-off>&lt;/script></cut-off>
-	</injection>
-	-->
 </injections>
diff --git a/Syntaxes/CSS.xml b/Syntaxes/CSS.xml
index 643be24..310001f 100644
--- a/Syntaxes/CSS.xml
+++ b/Syntaxes/CSS.xml
@@ -2,6 +2,20 @@
 <syntax name="language-root.css.scss">
 	
 	<zones>
+		<zone name="selector.css">
+			<starts-with>^(?=[:.*#a-zA-Z@\\])</starts-with>
+			<ends-with>(?=\{)</ends-with>
+			<subzones>
+			    <include collection="pseudo-classes"/>
+			    <include collection="string-double"/>
+			    <include collection="string-single"/>
+				<include collection="comments"/>
+				<zone name="punctuation.comma">
+					<expression>,</expression>
+				</zone>
+			</subzones>
+		</zone>
+		
 		<include collection="at-rule-include"/>
 		
 		<include syntax="language-root.css" />