[LaTeX] Improve LaTeX

Haskell/Literate Haskell.sublime-syntax

@@ -10,24 +10,26 @@ 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,11 @@
 %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
 
 file_extensions:
   - bib

LaTeX/DocStrip.sublime-syntax

@@ -0,0 +1,96 @@
+%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: 1
+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

LaTeX/LaTeX Log.sublime-syntax

@@ -3,47 +3,100 @@
 name: LaTeX Log
 scope: text.log.latex
 
-first_line_match: "This is (pdf|pdfe)?TeXk?, Version "
+first_line_match: 'This is (pdf|pdfe)?TeXk?, Version '
+
+################################################################################
 
 contexts:
   main:
-    - match: ".*Warning:"
-      scope: invalid.deprecated
-    - match: '[^:]*:\d*:.*'
-      scope: invalid.deprecated
-    - match: .*Error|^!.*
-      scope: invalid.illegal
+    - include: log-entries
+    - include: file-paths
+    - include: under-over-full
+    - include: strings
+
+  under-over-full:
+    - match: (?:Overfull|Underfull)
+      scope: keyword.control.hyphenation.latex
+      push: under-over-full-body
+
+  under-over-full-body:
+    - meta_scope: meta.log.latex.hyphenation
+    - match: \[\]\n
+      scope: keyword.control.hyphenation.latex
+      pop: 1
+    - match: '[0-9]+\-\-[0-9]+'
+      scope: variable.parameter.hyphenation.latex
+
+###[ File paths ]###############################################################
+
+  file-paths:
+    - include: function-file-paths
+    - include: tag-file-paths
+    - include: type-file-paths
+
+  function-file-paths:
     - match: .*\.sty
       scope: entity.name.function
-    - match: .*\.cls
-      scope: entity.name.type.class
+
+  tag-file-paths:
     - match: .*\.cfg
       scope: entity.name.tag.configuration
     - match: .*\.def
       scope: entity.name.tag.definition
-    - match: .*Info.*
+
+  type-file-paths:
+    - match: .*\.cls
+      scope: entity.name.type.class
+
+###[ Log entries ]##############################################################
+
+  log-entries:
+    - include: error-log-entries
+    - include: warning-log-entries
+    - include: info-log-entries
+    - include: fixme-log-entries
+
+  error-log-entries:
+    - match: '.*Error|^!.*'
+      scope: invalid.illegal
+
+  warning-log-entries:
+    - match: '.*Warning:'
+      scope: invalid.deprecated
+    - match: '[^:]*:\d*:.*'
+      scope: invalid.deprecated
+
+  info-log-entries:
+    - match: '.*Info.*'
       scope: comment.block.documentation
-    - match: ".*FiXme:"
+
+  fixme-log-entries:
+    - match: '.*FiXme:'
       scope: meta.log.latex.fixme
-    - match: (Overfull|Underfull)
-      captures:
-        1: keyword.control.hyphenation.latex
-      push:
-        - meta_scope: meta.log.latex.hyphenation
-        - match: '(\[\]\n)'
-          captures:
-            1: keyword.control.hyphenation.latex
-          pop: true
-        - match: '[0-9]+\-\-[0-9]+'
-          scope: variable.parameter.hyphenation.latex2
-    - match: (<)
+
+###[ Strings ]##################################################################
+
+  strings:
+    - include: angle-bracket-strings
+
+  angle-bracket-strings:
+    - match: '<'
       scope: punctuation.definition.string.begin.log.latex
-      push:
-        - meta_scope: string.unquoted.other.filename.log.latex
-        - match: (>)
-          scope: punctuation.definition.string.end.log.latex
-          pop: true
-        - match: (.*/.*\.pdf)
-          scope: support.function.with-arg.latex
-          captures:
-            1: entity.name.function.filename.latex
+      push: angle-bracket-string-content
+
+  angle-bracket-string-content:
+    - meta_scope: string.unquoted.other.filename.log.latex
+    - match: '>'
+      scope: punctuation.definition.string.end.log.latex
+      pop: 1
+    - match: .*/.*\.pdf
+      scope:
+        support.function.with-arg.latex
+        entity.name.function.filename.latex
+    - include: eol-pop
+
+###[ Helpers ]##################################################################
+
+  eol-pop:
+    - match: $\n?
+      pop: 1