Permalink
Browse files

Fixed some grammar issues with end patterns, and added list continuat…

…ion snippets.

git-svn-id: http://svn.textmate.org/trunk/Bundles/Twiki.tmbundle@3227 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
1 parent 9ef3b60 commit de66647ebf43b2f0f22d5ff4dd395e84809e8856 Stephen Skubik-Peplaski committed May 4, 2006
Showing with 80 additions and 23 deletions.
  1. +17 −0 Snippets/List Item (↵).plist
  2. +17 −0 Snippets/Numbered List Item (↵).plist
  3. +44 −23 Syntaxes/Twiki.plist
  4. +2 −0 info.plist
View
17 Snippets/List Item (↵).plist
@@ -0,0 +1,17 @@
+<?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>
+* ${1:list item}</string>
+ <key>keyEquivalent</key>
+ <string>
+</string>
+ <key>name</key>
+ <string>List Item (↵)</string>
+ <key>scope</key>
+ <string>markup.list</string>
+ <key>uuid</key>
+ <string>FBEBDEED-2636-469D-8A0F-8E9524824BB5</string>
+</dict>
View
17 Snippets/Numbered List Item (↵).plist
@@ -0,0 +1,17 @@
+<?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>
+1 ${1:list item}</string>
+ <key>keyEquivalent</key>
+ <string>
+</string>
+ <key>name</key>
+ <string>Numbered List Item (↵)</string>
+ <key>scope</key>
+ <string>markup.numlist</string>
+ <key>uuid</key>
+ <string>FCECC22A-6D5C-4781-B2B8-5777FDD53F76</string>
+</dict>
View
67 Syntaxes/Twiki.plist
@@ -6,10 +6,6 @@
<array>
<string>txt</string>
</array>
- <key>foldingStartMarker</key>
- <string>^-{3}\+{1,6}.*$</string>
- <key>foldingStopMarker</key>
- <string>^(?=\S)</string>
<key>name</key>
<string>Twiki</string>
<key>patterns</key>
@@ -85,7 +81,7 @@
</dict>
</dict>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.def.twiki</string>
<key>patterns</key>
@@ -115,7 +111,7 @@
<key>begin</key>
<string>^ {3}\*</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.list.1.twiki</string>
<key>patterns</key>
@@ -130,7 +126,7 @@
<key>begin</key>
<string>^ {6}\*</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.list.2.twiki</string>
<key>patterns</key>
@@ -145,7 +141,7 @@
<key>begin</key>
<string>^ {9}\*</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.list.3.twiki</string>
<key>patterns</key>
@@ -160,7 +156,7 @@
<key>begin</key>
<string>^ {12}\*</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.list.4.twiki</string>
<key>patterns</key>
@@ -175,7 +171,7 @@
<key>begin</key>
<string>^ {15}\*</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.list.5.twiki</string>
<key>patterns</key>
@@ -190,7 +186,7 @@
<key>begin</key>
<string>^ {18}\*</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.list.6.twiki</string>
<key>patterns</key>
@@ -205,89 +201,89 @@
<key>begin</key>
<string>^ {3}\d</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.numlist.1.twiki</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
- <string>#list-paragraph</string>
+ <string>#numlist-paragraph</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>^ {6}\d</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.numlist.2.twiki</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
- <string>#list-paragraph</string>
+ <string>#numlist-paragraph</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>^ {9}\d</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.numlist.3.twiki</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
- <string>#list-paragraph</string>
+ <string>#numlist-paragraph</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>^ {12}\d</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.numlist.4.twiki</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
- <string>#list-paragraph</string>
+ <string>#numlist-paragraph</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>^ {15}\d</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.numlist.5.twiki</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
- <string>#list-paragraph</string>
+ <string>#numlist-paragraph</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>^ {18}\d</string>
<key>end</key>
- <string>^(?=\S)</string>
+ <string>$\n?</string>
<key>name</key>
<string>markup.numlist.6.twiki</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
- <string>#list-paragraph</string>
+ <string>#numlist-paragraph</string>
</dict>
</array>
</dict>
@@ -405,6 +401,31 @@
</dict>
</array>
</dict>
+ <key>numlist-paragraph</key>
+ <dict>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>begin</key>
+ <string>\G\s+\S</string>
+ <key>end</key>
+ <string>^\s*$</string>
+ <key>name</key>
+ <string>markup.numlist.paragraph</string>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>include</key>
+ <string>#inline</string>
+ </dict>
+ <dict>
+ <key>include</key>
+ <string>text.html.basic</string>
+ </dict>
+ </array>
+ </dict>
+ </array>
+ </dict>
</dict>
<key>scopeName</key>
<string>text.html.twiki</string>
View
2 info.plist
@@ -17,13 +17,15 @@
<string>BA34D7CB-479E-4FB0-B47D-A3BF3184966C</string>
<string>FDD100B6-4FD7-4849-9A6A-3BF5A3EE6139</string>
<string>E7D13285-F135-449C-AED0-D92D42465C68</string>
+ <string>FBEBDEED-2636-469D-8A0F-8E9524824BB5</string>
<string>A09D1824-394A-485B-9AE7-89EA4EBC323A</string>
<string>A23854CA-0E1F-4DD8-8B94-DC37B30FA59A</string>
<string>5C0F4AB3-2649-4F1D-9CD5-1F0E35498A24</string>
<string>37BE0163-DA17-4DEE-85D3-D0FF731F54B5</string>
<string>46360864-CDBB-4F48-8E86-9E0E95E15499</string>
<string>87E31B58-AB45-4F51-BA91-FBF4991DB5EE</string>
<string>6DB4FECE-3036-474A-BC0A-C9A503D41D3B</string>
+ <string>FCECC22A-6D5C-4781-B2B8-5777FDD53F76</string>
<string>AE15F884-4F10-4365-8694-FB6E0891673B</string>
<string>113C7192-9C79-4765-BC53-C78C7778C2F4</string>
<string>EA883D3D-8058-49B3-980D-D481CB58F43A</string>

0 comments on commit de66647

Please sign in to comment.