Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merged in pull from GitHub

git-svn-id: http://svn.textmate.org/trunk/Bundles/Matlab.tmbundle@10790 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
commit d6effd3c4949caed4d223de2f8299ae3fa2f62db 1 parent 412c5ee
@mattfoster mattfoster authored
Showing with 136 additions and 116 deletions.
  1. +58 −44 Syntaxes/M.plist
  2. +78 −72 Syntaxes/Octave.tmLanguage
View
102 Syntaxes/M.plist
@@ -13,50 +13,6 @@
<key>patterns</key>
<array>
<dict>
- <key>captures</key>
- <dict>
- <key>1</key>
- <dict>
- <key>name</key>
- <string>punctuation.definition.comment.matlab</string>
- </dict>
- </dict>
- <key>match</key>
- <string>(%%).*$\n?</string>
- <key>name</key>
- <string>comment.double.percentage.matlab</string>
- </dict>
- <dict>
- <key>begin</key>
- <string>%\{</string>
- <key>captures</key>
- <dict>
- <key>1</key>
- <dict>
- <key>name</key>
- <string>punctuation.definition.comment.matlab</string>
- </dict>
- </dict>
- <key>end</key>
- <string>%\}\s*\n</string>
- <key>name</key>
- <string>comment.block.percentage.matlab</string>
- </dict>
- <dict>
- <key>captures</key>
- <dict>
- <key>1</key>
- <dict>
- <key>name</key>
- <string>punctuation.definition.comment.matlab</string>
- </dict>
- </dict>
- <key>match</key>
- <string>(%).*$\n?</string>
- <key>name</key>
- <string>comment.line.percentage.matlab</string>
- </dict>
- <dict>
<key>begin</key>
<string>(?x)
(?=function\b) # borrowed from ruby bundle
@@ -178,6 +134,10 @@
</dict>
<dict>
<key>include</key>
+ <string>#all_matlab_comments</string>
+ </dict>
+ <dict>
+ <key>include</key>
<string>#number</string>
</dict>
<dict>
@@ -405,6 +365,56 @@
</dict>
</array>
</dict>
+ <key>all_octave_comments</key>
+ <dict>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.matlab</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>(%%).*$\n?</string>
+ <key>name</key>
+ <string>comment.double.percentage.matlab</string>
+ </dict>
+ <dict>
+ <key>begin</key>
+ <string>%\{</string>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.matlab</string>
+ </dict>
+ </dict>
+ <key>end</key>
+ <string>%\}\s*\n</string>
+ <key>name</key>
+ <string>comment.block.percentage.matlab</string>
+ </dict>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.matlab</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>(%).*$\n?</string>
+ <key>name</key>
+ <string>comment.line.percentage.matlab</string>
+ </dict>
+ </array>
+ </dict>
<key>allofem</key>
<dict>
<key>patterns</key>
@@ -443,6 +453,10 @@
</dict>
<dict>
<key>include</key>
+ <string>#all_matlab_comments</string>
+ </dict>
+ <dict>
+ <key>include</key>
<string>#variable</string>
</dict>
<dict>
View
150 Syntaxes/Octave.tmLanguage
@@ -15,64 +15,6 @@
<key>patterns</key>
<array>
<dict>
- <key>captures</key>
- <dict>
- <key>1</key>
- <dict>
- <key>name</key>
- <string>punctuation.definition.comment.octave</string>
- </dict>
- </dict>
- <key>match</key>
- <string>(%%).*$\n?</string>
- <key>name</key>
- <string>comment.double.percentage.octave</string>
- </dict>
- <dict>
- <key>begin</key>
- <string>%\{</string>
- <key>captures</key>
- <dict>
- <key>1</key>
- <dict>
- <key>name</key>
- <string>punctuation.definition.comment.octave</string>
- </dict>
- </dict>
- <key>end</key>
- <string>%\}</string>
- <key>name</key>
- <string>comment.block.percentage.octave</string>
- </dict>
- <dict>
- <key>captures</key>
- <dict>
- <key>1</key>
- <dict>
- <key>name</key>
- <string>punctuation.definition.comment.octave</string>
- </dict>
- </dict>
- <key>match</key>
- <string>(%).*$\n?</string>
- <key>name</key>
- <string>comment.line.percentage.octave</string>
- </dict>
- <dict>
- <key>captures</key>
- <dict>
- <key>1</key>
- <dict>
- <key>name</key>
- <string>punctuation.definition.comment.octave</string>
- </dict>
- </dict>
- <key>match</key>
- <string>(#).*$\n?</string>
- <key>name</key>
- <string>comment.line.pound.octave</string>
- </dict>
- <dict>
<key>begin</key>
<string>(?x)
(?=function\b) # borrowed from ruby bundle
@@ -178,6 +120,10 @@
</dict>
<dict>
<key>include</key>
+ <string>#string_double</string>
+ </dict>
+ <dict>
+ <key>include</key>
<string>#transpose</string>
</dict>
<dict>
@@ -194,6 +140,10 @@
</dict>
<dict>
<key>include</key>
+ <string>#all_octave_comments</string>
+ </dict>
+ <dict>
+ <key>include</key>
<string>#number</string>
</dict>
<dict>
@@ -215,6 +165,70 @@
</array>
<key>repository</key>
<dict>
+ <key>all_octave_comments</key>
+ <dict>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.octave</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>(%%).*$\n?</string>
+ <key>name</key>
+ <string>comment.double.percentage.octave</string>
+ </dict>
+ <dict>
+ <key>begin</key>
+ <string>%\{</string>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.octave</string>
+ </dict>
+ </dict>
+ <key>end</key>
+ <string>%\}</string>
+ <key>name</key>
+ <string>comment.block.percentage.octave</string>
+ </dict>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.octave</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>(%).*$\n?</string>
+ <key>name</key>
+ <string>comment.line.percentage.octave</string>
+ </dict>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.octave</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>(#).*$\n?</string>
+ <key>name</key>
+ <string>comment.line.number-sign.octave</string>
+ </dict>
+ </array>
+ </dict>
<key>all_octave_keywords</key>
<dict>
<key>patterns</key>
@@ -267,11 +281,11 @@
</dict>
<dict>
<key>include</key>
- <string>#transpose</string>
+ <string>#string_double</string>
</dict>
<dict>
<key>include</key>
- <string>#double_quote</string>
+ <string>#transpose</string>
</dict>
<dict>
<key>include</key>
@@ -279,6 +293,10 @@
</dict>
<dict>
<key>include</key>
+ <string>#all_octave_comments</string>
+ </dict>
+ <dict>
+ <key>include</key>
<string>#variable</string>
</dict>
<dict>
@@ -372,18 +390,6 @@
</dict>
</array>
</dict>
- <key>double_quote</key>
- <dict>
- <key>patterns</key>
- <array>
- <dict>
- <key>match</key>
- <string>"</string>
- <key>name</key>
- <string>invalid.illegal.invalid-quote.octave</string>
- </dict>
- </array>
- </dict>
<key>end_in_parens</key>
<dict>
<key>comment</key>
Please sign in to comment.
Something went wrong with that request. Please try again.