Merge pull request #370 from randy3k/latex

[LaTeX] rewrite syntaxes
sublimehq · Jul 22, 2016 · 2b4f7e7 · 2b4f7e7
2 parents 3e4e845 + 23f17cb
commit 2b4f7e7
Show file tree

Hide file tree

Showing 14 changed files with 2,227 additions and 665 deletions.
diff --git a/Haskell/Literate Haskell.sublime-syntax b/Haskell/Literate Haskell.sublime-syntax
@@ -6,22 +6,45 @@ file_extensions:
   - lhs
 scope: text.tex.latex.haskell
 contexts:
+  prototype:
+    - include: scope:text.tex.latex#comments
+
   main:
-    - match: '^((\\)begin)({)code(})(\s*\n)?'
+    - include: scope:text.tex.latex#unique-latex
+    - include: scope:text.tex.latex#packages
+    - include: haskell-code
+    - include: scope:text.tex.latex#plain-tex
+    - include: scope:text.tex.latex#begin-end-commands
+    - include: scope:text.tex.latex#general-commands
+    - include: global-braces
+
+  global-braces:
+    - match: '\{'
+      scope: punctuation.definition.group.brace.begin.latex
+      push:
+        - meta_scope: meta.group.brace.latex
+        - match: '\}'
+          scope: punctuation.definition.group.brace.end.latex
+          pop: true
+        - include: main
+
+  haskell-code:
+    - match: '(?:\s*)((\\)begin)(\{)(code)(\})'
       captures:
         1: support.function.be.latex
-        2: punctuation.definition.function.latex
-        3: punctuation.definition.arguments.begin.latex
-        4: punctuation.definition.arguments.end.latex
+        2: punctuation.definition.backslash.latex
+        3: punctuation.definition.group.brace.begin.latex
+        4: variable.parameter.function.latex
+        5: punctuation.definition.group.brace.end.latex
       push:
         - meta_scope: meta.function.embedded.haskell.latex
         - meta_content_scope: source.haskell.embedded.latex
-        - match: '^((\\)end)({)code(})'
+        - match: '((\\)end)(\{)(code)(\})'
           captures:
             1: support.function.be.latex
-            2: punctuation.definition.function.latex
-            3: punctuation.definition.arguments.begin.latex
-            4: punctuation.definition.arguments.end.latex
+            2: punctuation.definition.backslash.latex
+            3: punctuation.definition.group.brace.begin.latex
+            4: variable.parameter.function.latex
+            5: punctuation.definition.group.brace.end.latex
           pop: true
         - include: scope:source.haskell
-    - include: scope:text.tex.latex
diff --git a/LaTeX/Indentation Rules.tmPreferences b/LaTeX/Indentation Rules.tmPreferences
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+	<key>scope</key>
+	<string>text.tex</string>
+	<key>settings</key>
+	<dict>
+		<key>decreaseIndentPattern</key>
+		<string>^\s*\\end\s*\{(?:itemize|enumerate|description)\*?\}\s*$</string>
+		<key>increaseIndentPattern</key>
+		<string>^\s*\\begin\s*\{(?:itemize|enumerate|description)\*?\}\s*$</string>
+	</dict>
+</dict>
+</plist>
diff --git a/LaTeX/LaTeX Beamer.sublime-syntax b/LaTeX/LaTeX Beamer.sublime-syntax
diff --git a/LaTeX/LaTeX Memoir.sublime-syntax b/LaTeX/LaTeX Memoir.sublime-syntax
diff --git a/LaTeX/LaTeX.sublime-settings b/LaTeX/LaTeX.sublime-settings
@@ -0,0 +1,4 @@
+{
+    "spelling_selector": "-(comment, source, constant, keyword, storage, support, variable, markup.underline.link, meta.tag, meta.preamble, meta.include, meta.function.citation, meta.function.reference, meta.function.label, meta.function.includegraphics)",
+    "word_separators": "_./\\()\"'-:,.;<>~!@#$%^&*|+=[]{}`~?"
+}