[LaTeX] Improve LaTeX

Haskell/Literate Haskell.sublime-syntax

@@ -3,31 +3,34 @@
 # https://www.sublimetext.com/docs/syntax.html
 name: Literate Haskell
 scope: text.tex.latex.haskell
+version: 2
 
 extends: Packages/LaTeX/LaTeX.sublime-syntax
 
 file_extensions:
   - lhs
 
 contexts:
-  plain-tex:
+  begin-end-commands:
     - meta_prepend: true
     - include: haskell-code
 
   haskell-code:
-    - match: ((\\)begin)(\{)(code)(\})
+    - match: ((\\)begin)((\{)\s*(code)\s*(\}))
       captures:
         1: support.function.begin.latex keyword.control.block.begin.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
+        3: meta.group.brace.tex
+        4: punctuation.definition.group.brace.begin.tex
+        5: variable.parameter.function.latex
+        6: punctuation.definition.group.brace.end.tex
       embed: scope:source.haskell
       embed_scope: source.haskell.embedded.latex
-      escape: ((\\)end)(\{)(code)(\})
+      escape: ((\\)end)((\{)\s*(code)\s*(\}))
       escape_captures:
         1: support.function.end.latex keyword.control.block.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
+        3: meta.group.brace.tex
+        4: punctuation.definition.group.brace.begin.tex
+        5: variable.parameter.function.latex
+        6: punctuation.definition.group.brace.end.tex

Haskell/tests/syntax_test_literate.lhs

@@ -5,9 +5,9 @@
 %               ^ source.haskell.embedded.latex
 %   ^ punctuation.definition.backslash.latex
 %   ^^^^^^ support.function.begin.latex keyword.control.block.begin.latex
-%         ^ punctuation.definition.group.brace.begin.latex
+%         ^ punctuation.definition.group.brace.begin.tex
 %          ^^^^ variable.parameter.function.latex
-%              ^ punctuation.definition.group.brace.end.latex
+%              ^ punctuation.definition.group.brace.end.tex
 
     {- comment -}
 %   ^^^^^^^^^^^^^ source.haskell.embedded.latex comment.block.haskell
@@ -23,6 +23,6 @@
 %   ^^^^^^^^^^^ - source.haskell
 %   ^ punctuation.definition.backslash.latex
 %   ^^^^ support.function.end.latex keyword.control.block.end.latex
-%       ^ punctuation.definition.group.brace.begin.latex
+%       ^ punctuation.definition.group.brace.begin.tex
 %        ^^^^ variable.parameter.function.latex
-%            ^ punctuation.definition.group.brace.end.latex
+%            ^ punctuation.definition.group.brace.end.tex

LaTeX/Bibtex.sublime-syntax

@@ -1,11 +1,12 @@
 %YAML 1.2
 ---
+# Grammar based on description from
+# http://artis.imag.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html#comment
+#
+# TODO: Does not support @preamble
 name: BibTeX
 scope: text.bibtex
-comment: |
-  Grammar based on description from http://artis.imag.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html#comment
-
-      TODO: Does not support @preamble
+version: 2
 
 file_extensions:
   - bib
@@ -25,7 +26,7 @@ contexts:
       push:
         - meta_scope: comment.line.at-sign.bibtex
         - match: $\n?
-          pop: true
+          pop: 1
     - match: '((@)[Ss]tring)\s*(\{)\s*({{var}})'
       captures:
         1: keyword.other.string-constant.bibtex
@@ -36,7 +37,7 @@ contexts:
         - meta_scope: meta.string-constant.braces.bibtex
         - match: '\}'
           scope: punctuation.section.string-constant.end.bibtex
-          pop: true
+          pop: 1
         - include: string_content
         - include: variables
         - include: operators
@@ -50,7 +51,7 @@ contexts:
         - meta_scope: meta.string-constant.parenthesis.bibtex
         - match: \)
           scope: punctuation.section.string-constant.end.bibtex
-          pop: true
+          pop: 1
         - include: string_content
         - include: variables
         - include: operators
@@ -65,7 +66,7 @@ contexts:
         - meta_content_scope: meta.mapping.bibtex
         - match: '\}'
           scope: punctuation.section.entry.end.bibtex
-          pop: true
+          pop: 1
         - match: '([a-zA-Z]+)(\s*(=)\s*)'
           captures:
             1: meta.mapping.key.bibtex string.unquoted.key.bibtex
@@ -74,8 +75,8 @@ contexts:
           push:
             - clear_scopes: 1
             - meta_content_scope: meta.mapping.value.bibtex
-            - match: "(?=[,}])"
-              pop: true
+            - match: (?=[,}])
+              pop: 1
             - include: string_content
             - include: integer
             - include: variables
@@ -93,7 +94,7 @@ contexts:
         - meta_content_scope: meta.mapping.bibtex
         - match: \)
           scope: punctuation.section.entry.end.bibtex
-          pop: true
+          pop: 1
         - match: '([a-zA-Z]+)(\s*(=)\s*)'
           captures:
             1: meta.mapping.key.bibtex string.unquoted.key.bibtex
@@ -102,8 +103,8 @@ contexts:
           push:
             - clear_scopes: 1
             - meta_content_scope: meta.mapping.value.bibtex
-            - match: "(?=[,)])"
-              pop: true
+            - match: (?=[,)])
+              pop: 1
             - include: string_content
             - include: integer
             - include: variables
@@ -114,7 +115,7 @@ contexts:
       push:
         - meta_scope: comment.block.bibtex
         - match: (?=@)
-          pop: true
+          pop: 1
   integer:
     - match: \d+
       scope: meta.number.integer.decimal.bibtex constant.numeric.value.bibtex
@@ -130,7 +131,7 @@ contexts:
       push:
         - match: '\}'
           scope: punctuation.definition.group.end.bibtex
-          pop: true
+          pop: 1
         - include: nested_braces
   string_content:
     - match: '"'
@@ -139,15 +140,15 @@ contexts:
         - meta_scope: string.quoted.double.bibtex
         - match: '"'
           scope: punctuation.definition.string.end.bibtex
-          pop: true
+          pop: 1
         - include: nested_braces
     - match: '\{'
       scope: punctuation.definition.string.begin.bibtex
       push:
         - meta_scope: string.quoted.other.braces.bibtex
         - match: '\}'
           scope: punctuation.definition.string.end.bibtex
-          pop: true
+          pop: 1
         - match: "@"
           scope: invalid.illegal.at-sign.bibtex
         - include: nested_braces

LaTeX/DocStrip.sublime-syntax

@@ -0,0 +1,97 @@
+%YAML 1.2
+---
+# https://www.sublimetext.com/docs/syntax.html
+# https://www.texlive.info/CTAN/macros/latex/base/docstrip.pdf
+name: TeX (DocStrip)
+scope: source.tex.docstrip
+version: 2
+
+extends: Packages/LaTeX/TeX.sublime-syntax
+
+file_extensions:
+  - ins
+
+contexts:
+  main:
+    - meta_prepend: true
+    - include: docstrip-preamble
+    - include: docstrip-config
+    - include: docstrip-user-io
+    - include: docstrip-keywords
+    - include: docstrip-constants
+
+  controls:
+    - meta_append: true
+    - match: (\\)endbatchfile{{endcs}}
+      scope: keyword.control.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex
+    - match: (\\)(?:batch)?input{{endcs}}
+      scope: meta.function.input.tex keyword.control.input.tex
+      captures:
+        1: punctuation.definition.backslash.tex
+    - match: (\\)ifToplevel{{endcs}}
+      scope: keyword.control.conditional.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex
+
+  docstrip-preamble:
+    - match: (\\)(?:declare)?(?:pre|post)amble{{endcs}}
+      scope: keyword.context.block.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex
+      push: docstrip-preamble-content
+
+  docstrip-preamble-content:
+    - meta_include_prototype: false
+    - meta_content_scope: markup.raw.verbatim.tex
+    - match: (\\)end(?:pre|post)amble{{endcs}}
+      scope: keyword.context.block.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex
+      pop: 1
+
+  docstrip-keywords:
+    - match: (\\)(?:file|from|generateFile){{endcs}}
+      scope: keyword.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex
+      push: docstrip-file-argument
+    - match: (\\)(?:generate|needed){{endcs}}
+      scope: keyword.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex
+
+  docstrip-file-argument:
+    - match: \{
+      scope: punctuation.definition.group.brace.begin.tex
+      set: docstrip-file-argument-path
+    - include: else-pop
+    - include: paragraph-pop
+
+  docstrip-file-argument-path:
+    - meta_content_scope: meta.path.tex.docstrip
+    - include: macro-braces-body
+
+  docstrip-config:
+    - match: (\\)(?:usedir|showdirectory|BaseDirectory|DeclareDir|UseTDS|maxfiles|maxoutfiles){{endcs}}
+      scope: support.function.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex
+
+  docstrip-user-io:
+     - match: (\\)(?:Msg|Ask){{endcs}}
+       scope: support.function.tex.docstrip
+       captures:
+         1: punctuation.definition.backslash.tex
+
+  docstrip-constants:
+    - match: (\\)(?:askforoverwrite(?:true|false)|askonceonly|(?:use|no)(?:pre|post)amble|showprogress|keepsilent){{endcs}}
+      scope: constant.language.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex
+
+    - match: (\\)(?:(?:Double)?perCent|MetaPrefix|empty){{endcs}}
+      scope: constant.language.tex.docstrip
+      captures:
+        1: punctuation.definition.backslash.tex