diff -Nru -x '*svn*' /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Preferences/Miscellaneous.tmPreferences /Users/chhitz/Desktop/Lilypond.tmbundle/Preferences/Miscellaneous.tmPreferences
--- /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Preferences/Miscellaneous.tmPreferences	2006-10-14 09:41:40.000000000 +0200
+++ /Users/chhitz/Desktop/Lilypond.tmbundle/Preferences/Miscellaneous.tmPreferences	2006-11-25 14:44:24.000000000 +0100
@@ -4,8 +4,12 @@
 <dict>
 	<key>name</key>
 	<string>Miscellaneous</string>
+	<key>scope</key>
+	<string>source.lilypond</string>
 	<key>settings</key>
 	<dict>
+		<key>decreaseIndentPattern</key>
+		<string>[^{]*\}.*|&gt;&gt;</string>
 		<key>highlightPairs</key>
 		<array>
 			<array>
@@ -36,7 +40,13 @@
 				<string>&lt;</string>
 				<string>&gt;</string>
 			</array>
+			<array>
+				<string>&lt;&lt;</string>
+				<string>&gt;&gt;</string>
+			</array>
 		</array>
+		<key>increaseIndentPattern</key>
+		<string>.*\{[^}]*$|&lt;&lt;</string>
 		<key>shellVariables</key>
 		<array>
 			<dict>
@@ -71,10 +81,6 @@
 				<string>"</string>
 			</array>
 			<array>
-				<string>(</string>
-				<string>)</string>
-			</array>
-			<array>
 				<string>{</string>
 				<string>}</string>
 			</array>
@@ -90,6 +96,10 @@
 				<string>&lt;</string>
 				<string>&gt;</string>
 			</array>
+			<array>
+				<string>&lt;&lt;</string>
+				<string>&gt;&gt;</string>
+			</array>
 		</array>
 	</dict>
 	<key>uuid</key>
diff -Nru -x '*svn*' /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Snippets/repeat.tmSnippet /Users/chhitz/Desktop/Lilypond.tmbundle/Snippets/repeat.tmSnippet
--- /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Snippets/repeat.tmSnippet	1970-01-01 01:00:00.000000000 +0100
+++ /Users/chhitz/Desktop/Lilypond.tmbundle/Snippets/repeat.tmSnippet	2006-11-25 14:44:24.000000000 +0100
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>\repeat "${1:volta}" ${2:2} {
+	$3
+}
+${1/(volta)|(.*)/(?1:\\alternative {\n\t{  }\n\t{  }\n})(?2:)/}</string>
+	<key>name</key>
+	<string>repeat</string>
+	<key>scope</key>
+	<string>source.lilypond</string>
+	<key>tabTrigger</key>
+	<string>rep</string>
+	<key>uuid</key>
+	<string>C31E36E3-C70E-4296-AB87-492099EF7D52</string>
+</dict>
+</plist>
diff -Nru -x '*svn*' /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Snippets/times.tmSnippet /Users/chhitz/Desktop/Lilypond.tmbundle/Snippets/times.tmSnippet
--- /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Snippets/times.tmSnippet	1970-01-01 01:00:00.000000000 +0100
+++ /Users/chhitz/Desktop/Lilypond.tmbundle/Snippets/times.tmSnippet	2006-11-25 14:44:24.000000000 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>\times $1/$2 { $3 }</string>
+	<key>name</key>
+	<string>times</string>
+	<key>scope</key>
+	<string>source.lilypond</string>
+	<key>tabTrigger</key>
+	<string>times</string>
+	<key>uuid</key>
+	<string>4D46DAC8-B683-466D-AAA8-B41FDC76B039</string>
+</dict>
+</plist>
diff -Nru -x '*svn*' /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Snippets/version.tmSnippet /Users/chhitz/Desktop/Lilypond.tmbundle/Snippets/version.tmSnippet
--- /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Snippets/version.tmSnippet	1970-01-01 01:00:00.000000000 +0100
+++ /Users/chhitz/Desktop/Lilypond.tmbundle/Snippets/version.tmSnippet	2006-11-25 14:44:24.000000000 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>\version "${1:`lilypond --version | head -1 | cut -d" " -f3`}"</string>
+	<key>name</key>
+	<string>version</string>
+	<key>scope</key>
+	<string>source.lilypond</string>
+	<key>tabTrigger</key>
+	<string>ver</string>
+	<key>uuid</key>
+	<string>3FD23404-5463-4C11-BAB7-D9ACAAB8EDAC</string>
+</dict>
+</plist>
diff -Nru -x '*svn*' /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Syntaxes/Lilypond.tmLanguage /Users/chhitz/Desktop/Lilypond.tmbundle/Syntaxes/Lilypond.tmLanguage
--- /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/Syntaxes/Lilypond.tmLanguage	2006-10-14 09:41:40.000000000 +0200
+++ /Users/chhitz/Desktop/Lilypond.tmbundle/Syntaxes/Lilypond.tmLanguage	2006-11-25 14:44:24.000000000 +0100
@@ -13,6 +13,7 @@
 	<key>fileTypes</key>
 	<array>
 		<string>ly</string>
+		<string>ily</string>
 	</array>
 	<key>foldingStartMarker</key>
 	<string>\{\s*$</string>
@@ -142,8 +143,8 @@
 			<key>match</key>
 			<string>(?x)
 				((\\) clef) \s+  # backslash + "clef" + spaces (groups 1-2)
+				(")	# beginning quotes (group 3)
 				(?:
-				  (")?	# beginning quotes (group 3)
 				  ( (?: # group 4
 					  treble | violin | G | french |                    # G clefs
 				      alto | C | tenor | (?:mezzo)?soprano | baritone | # C clefs
@@ -158,8 +159,8 @@
 				    ([_^](?:8|15)?)? # optionally shift 1-2 octaves ↑/↓ (group 5)
 				  ) |
 				  ( (?:\w+) ([_^](?:8|15))? ) # unknown clef name (groups 6-7)
-				  (\3) # closing quotes (group 8)
 				)?
+				(") # closing quotes (group 8)
 			</string>
 			<key>name</key>
 			<string>meta.element.clef.lilypond</string>
@@ -546,7 +547,7 @@
 							(?: up | down | line ) prall |           # and
 							(?: up | down )? mordent |               # mordents
 							signumcongruentiae |
-							(?: (?:very)? long | short)?fermata |    # fermatas
+							(?: (?:very)? long | short)?fermata(Markup)? |    # fermatas
 							segno | (?:var)?coda 
 						)
 					</string>
@@ -590,7 +591,7 @@
 					<key>begin</key>
 					<string>(?x)\b
 					    (						  # (group 1)
-						  ( [a-g]                 # Pitch (group 2)
+						  ( [a-h]                 # Pitch (group 2)
 						    ( (?:i[sh]){1,2} |    #   - sharp (group 3)
 						      (?:e[sh]|s){1,2}    #   - flat
 						    )?
@@ -681,7 +682,7 @@
 				<dict>
 					<key>begin</key>
 					<string>(?x)\b
-						(r) # (group 1)
+						(rR) # (group 1)
 						( ( (\\)breve|       # Duration (groups 2-4)
 						    64|32|16|8|4|2|1
 						  )
@@ -875,7 +876,7 @@
 							</dict>
 							<key>match</key>
 							<string>(?x)\b
-								  ( [a-g]                 # Pitch (group 1)
+								  ( [a-h]                 # Pitch (group 1)
 								    ( (?:i[sh]){1,2} |    #   - sharp (group 2)
 								      (?:e[sh]|s){1,2}    #   - flat
 								    )?
diff -Nru -x '*svn*' /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/info.plist /Users/chhitz/Desktop/Lilypond.tmbundle/info.plist
--- /Users/chhitz/Library/Application Support/TextMate/Pristine Copy/Bundles/Lilypond.tmbundle/info.plist	2006-10-14 09:41:41.000000000 +0200
+++ /Users/chhitz/Desktop/Lilypond.tmbundle/info.plist	2006-11-25 14:44:24.000000000 +0100
@@ -23,6 +23,8 @@
 		<string>B06CC484-F595-4C6A-95EB-D0E46123D9FE</string>
 		<string>E8B6A543-90A6-46A4-A307-B21B67EF7F2F</string>
 		<string>6F8F1607-8D59-4E4D-94D1-7565B4921B81</string>
+		<string>3FD23404-5463-4C11-BAB7-D9ACAAB8EDAC</string>
+		<string>C31E36E3-C70E-4296-AB87-492099EF7D52</string>
 	</array>
 	<key>uuid</key>
 	<string>5D9846C9-EB37-4F56-BD7F-F3A6BF8846A0</string>