🐛 Fix texcat

Author: Freed-Wu

packages/texcat/README.md

@@ -14,6 +14,58 @@ It supports color themes:
 - [x] textmate/VS Code theme XML/json
 - [ ] [syncat themes](https://github.com/foxfriends/syncat-themes)
 
+## Bench
+
+### Terminal output
+
+```sh
+$ hyperfine -Nw10 'texcat test.lua' 'texcat --syntax-type=textmate test.lua' 'pygmentize test.lua' 'bat test.lua'
+Benchmark 1: texcat test.lua
+  Time (mean ± σ):      56.8 ms ±   1.9 ms    [User: 49.8 ms, System: 6.3 ms]
+  Range (min … max):    54.4 ms …  64.2 ms    50 runs
+
+Benchmark 2: texcat --syntax-type=textmate test.lua
+  Time (mean ± σ):      73.1 ms ±  11.2 ms    [User: 70.7 ms, System: 7.4 ms]
+  Range (min … max):    62.0 ms …  89.7 ms    47 runs
+
+Benchmark 3: pygmentize test.lua
+  Time (mean ± σ):     154.4 ms ±  19.9 ms    [User: 140.0 ms, System: 12.8 ms]
+  Range (min … max):   137.4 ms … 217.3 ms    21 runs
+
+Benchmark 4: bat test.lua
+  Time (mean ± σ):       8.0 ms ±   0.5 ms    [User: 7.4 ms, System: 4.2 ms]
+  Range (min … max):     7.0 ms …  10.0 ms    429 runs
+
+Summary
+  bat test.lua ran
+    7.14 ± 0.50 times faster than texcat test.lua
+    9.18 ± 1.52 times faster than texcat --syntax-type=textmate test.lua
+   19.40 ± 2.77 times faster than pygmentize test.lua
+```
+
+### LaTeX output
+
+```sh
+$ hyperfine -Nw10 'texcat --output-format=latex test.lua' 'texcat --output-format=latex --syntax-type=textmate test.lua' 'pygmentize -f latex -O full=True test.lua'
+
+Benchmark 1: texcat --output-format=latex test.lua
+  Time (mean ± σ):      56.3 ms ±   1.2 ms    [User: 49.6 ms, System: 6.1 ms]
+  Range (min … max):    54.9 ms …  60.9 ms    53 runs
+
+Benchmark 2: texcat --output-format=latex --syntax-type=textmate test.lua
+  Time (mean ± σ):      63.8 ms ±   0.8 ms    [User: 61.5 ms, System: 7.0 ms]
+  Range (min … max):    62.5 ms …  66.5 ms    45 runs
+
+Benchmark 3: pygmentize -f latex -O full=True test.lua
+  Time (mean ± σ):     110.7 ms ±   1.2 ms    [User: 99.2 ms, System: 10.7 ms]
+  Range (min … max):   109.1 ms … 114.3 ms    27 runs
+
+Summary
+  texcat --output-format=latex test.lua ran
+    1.13 ± 0.03 times faster than texcat --output-format=latex --syntax-type=textmate test.lua
+    1.97 ± 0.05 times faster than pygmentize -f latex -O full=True test.lua
+```
+
 ## Dependencies
 
 ### TextMate

packages/texcat/lua/texcat.lua

@@ -3,12 +3,9 @@
 ---@copyright 2025
 ---@diagnostic disable: undefined-global
 -- luacheck: ignore 111 113
-local lfs = require 'lfs'
+local lfs = require 'texrocks.lfs'
 local argparse = require 'argparse'
 local T = require 'texcat.themes'
-local TMTheme = require 'texcat.themes.tmtheme'.TMTheme
-local TMLanguage = require 'texcat.syntaxes.tmlanguage'.TMLanguage
-local Treesitter = require 'texcat.syntaxes.treesitter'.Treesitter
 local R = require 'texcat.renderer'
 local Renderer = require 'texcat.renderer'.Renderer
 local M = {
@@ -81,25 +78,25 @@ end
 ---@param theme_names string[] theme names
 function M.get_list(list_type, theme_type, syntax_type, theme_names, extensions_dir)
     local class
-    local theme
-    if theme_type == 'textmate' then
-        class = TMTheme
-    end
-    theme = class { extensions_dir = extensions_dir }
     local syntax
     if syntax_type == 'textmate' then
-        class = Treesitter
+        class = require 'texcat.syntaxes.tmlanguage'.TMLanguage
     elseif syntax_type == 'tree-sitter' then
-        class = TMLanguage
+        class = require 'texcat.syntaxes.treesitter'.Treesitter
     end
     syntax = class { id = 0, extensions_dir = extensions_dir }
+    local theme
+    if theme_type == 'textmate' then
+        class = require 'texcat.themes.tmtheme'.TMTheme
+    end
+    theme = class { extensions_dir = extensions_dir }
     local list
     if list_type == 'extensions_dirs' then
         list = table.concat(extensions_dir, "\n")
     elseif list_type == 'themes' then
-        list = theme.list()
+        list = theme:list()
     elseif list_type == 'syntaxes' then
-        list = syntax.list()
+        list = syntax:list()
     elseif list_type == 'links' then
         list = T.list_links()
     elseif list_type == 'colors' then
@@ -108,7 +105,7 @@ function M.get_list(list_type, theme_type, syntax_type, theme_names, extensions_
             theme = M.themes[theme_name]
             if theme == nil then
                 if theme_type == 'textmate' then
-                    theme = TMTheme { extensions_dir = extensions_dir, name = theme_name }
+                    theme = class { extensions_dir = extensions_dir, name = theme_name }
                     M.themes[theme_name] = theme
                 else
                     return ''
@@ -157,7 +154,7 @@ function M.render(cfg)
     -- theme
     local class
     if cfg.theme_type == 'textmate' then
-        class = TMTheme
+        class = require 'texcat.themes.tmtheme'.TMTheme
     end
     cfg.theme = cfg.theme or 'auto'
     -- no theme auto
@@ -182,9 +179,9 @@ function M.render(cfg)
 
     -- syntax
     if cfg.syntax_type == 'textmate' then
-        class = TMLanguage
+        class = require 'texcat.syntaxes.tmlanguage'.TMLanguage
     elseif cfg.syntax_type == 'tree-sitter' then
-        class = Treesitter
+        class = require 'texcat.syntaxes.treesitter'.Treesitter
     end
     cfg.syntax = cfg.syntax or 'auto'
     -- no syntax auto
@@ -244,11 +241,7 @@ function M.output(out, filename)
     else
         local dir = filename:match('(.*)/[^/]+$')
         if dir then
-            if lfs.mkdirp then
-                lfs.mkdirp(dir)
-            else
-                lfs.mkdir(dir)
-            end
+            lfs.mkdirp(dir)
         end
         local f = io.open(filename, 'w')
         if f then

packages/texcat/lua/texcat/renderer.lua

@@ -3,6 +3,7 @@
 ---@copyright 2025
 ---@diagnostic disable: undefined-global
 -- luacheck: ignore 111 113
+local split = require 'vim.shared'.split
 local template = require 'template'
 local warna = require 'warna'
 warna.options.level = 3
@@ -57,28 +58,34 @@ end
 ---@param str string
 ---@return string[] tokens
 function M.split(str)
-    local tokens = {}
-    local token
-    for i = 1, #str do
-        local char = str:sub(i, i)
-        if char == "\n" then
-            if token then
-                table.insert(tokens, token)
-                token = nil
-            end
-            table.insert(tokens, "\n")
-        elseif token then
-            token = token .. char
-        else
-            token = char
-        end
+    local tokens = split(str, "\n")
+    for i = 1, #tokens - 1 do
+        tokens[i] = tokens[i] .. "\n"
     end
-    if token then
-        table.insert(tokens, token)
+    if tokens[#tokens] == "" then
+        tokens[#tokens] = nil
     end
     return tokens
 end
 
+---add child scopes to color map
+---@param color_map color_map
+---@param captures capture[]
+function M.add_scope(color_map, captures)
+    for _, capture in ipairs(captures) do
+        local scope = capture.scope
+        while color_map[scope] == nil do
+            -- get parent scope: punctuation.bracket -> punctuation
+            scope = scope:match('(.*)%.[^.]+$')
+            if scope == nil then
+                scope = 'source'
+            end
+        end
+        color_map[capture.scope] = color_map[scope]
+    end
+    return color_map
+end
+
 ---get highlights
 ---@param text string
 ---@param captures capture[]
@@ -142,6 +149,7 @@ function M.escape(text, prefix, math_escape)
     return table.concat(texts, '$')
 end
 
+---@diagnostic disable-next-line: undefined-doc-name
 ---@type Renderer
 
 ---@param renderer table?
@@ -170,14 +178,16 @@ function M.Renderer:get_opts(text, format, opts)
     if format:match 'tex' and opts.prefix == nil then
         opts.prefix = "PY" .. self.theme.name:gsub(" ", "")
     end
+    local captures = self.syntax:capture(text, self.theme)
     opts.color_map = opts.color_map or self.theme.get_full_color_map()
-    opts.hls = opts.hls or M.get_hls(text, self.syntax:capture(text, self.theme))
+    opts.color_map = M.add_scope(opts.color_map, captures)
+    opts.hls = opts.hls or M.get_hls(text, captures)
     opts.ipairs = ipairs
     opts.table = table
     opts.warna = warna
     opts.escape = M.escape
-    opts.preamble = M.get_path('texcat/main.preamble.tex')
-    opts.tex = M.get_path('texcat/main.tex')
+    opts.preamble = M.get_path('templates/main.preamble.tex')
+    opts.tex = M.get_path('templates/main.tex')
     opts.scopes = T.get_sorted_keys(opts.color_map)
     return opts
 end

packages/texcat/lua/texcat/syntaxes/tmlanguage.lua

@@ -7,14 +7,15 @@ local M = {
     TMLanguage = {}
 }
 
+---@diagnostic disable-next-line: undefined-doc-name
 ---@type TMLanguage
 
 ---@param tmlanguage table?
 ---@return table language
 function M.TMLanguage:new(tmlanguage)
     tmlanguage = tmlanguage or {}
     tmlanguage.name = tmlanguage.name or 'lua'
-    tmlanguage.id = tmlanguage.id or textmate.highlight_load_syntax(tmlanguage.name)
+    tmlanguage.id = tmlanguage.id or textmate.highlight_load_language(tmlanguage.name)
     setmetatable(tmlanguage, {
         __index = self
     })
@@ -27,7 +28,7 @@ setmetatable(M.TMLanguage, {
 
 ---list all languages
 ---@return string information
-function M.TMLanguage.list()
+function M.TMLanguage:list()
     return T.list(textmate.highlight_languages())
 end
 
@@ -39,7 +40,7 @@ end
 function M.TMLanguage:capture(text, theme)
     local captures = {}
     textmate.highlight_set_theme(theme.id)
-    textmate.highlight_set_syntax(self.id)
+    textmate.highlight_set_language(self.id)
     local results = textmate.highlight_line(text, theme.id, self.id, 0)
     for _, result in ipairs(results) do
         local idx, len, _, _, _, scope = result[1] + 1, result[2], result[3], result[4], result[5], result

packages/texcat/lua/texcat/syntaxes/treesitter.lua

@@ -148,6 +148,7 @@ function M.cut_captures(captures, len)
     return ranges
 end
 
+---@diagnostic disable-next-line: undefined-doc-name
 ---@type Treesitter
 
 ---@param treesitter table?
@@ -176,10 +177,10 @@ function M.Treesitter:capture(text, theme)
     local tree = self.parser:parse_string(text)
     local node = tree:root()
     local captures = {}
-    for capture, name in self.query:capture(node) do
+    for capture, scope in self.query:capture(node) do
         -- lua index start from 1
         table.insert(captures,
-            { start_index = capture:start_byte() + 1, end_index = capture:end_byte(), scope = name })
+            { start_index = capture:start_byte() + 1, end_index = capture:end_byte(), scope = scope })
     end
     local color_map = theme.get_full_color_map()
     color_map = M.add_scope(color_map, captures)

packages/texcat/lua/texcat/themes.lua

@@ -12,6 +12,11 @@ local M = {
         constant = 'type',
         operator = 'control',
         constructor = 'function',
+        ['punctuation.definition.comment'] = 'comment',
+        ['meta.function'] = 'function',
+        ['entity.name.function'] = 'function',
+        ['support.function'] = 'function',
+        ['punctuation.definition.parameters'] = 'control',
     }
 }
 

packages/texcat/lua/texcat/themes/tmtheme.lua

@@ -15,6 +15,7 @@ function M.load_extensions_dir(extensions_dir)
     end
 end
 
+---@diagnostic disable-next-line: undefined-doc-name
 ---@type TMTheme
 
 ---@param tmtheme table?
@@ -66,7 +67,7 @@ end
 
 ---list all themes
 ---@return string information
-function M.TMTheme.list()
+function M.TMTheme:list()
     return T.list(textmate.highlight_themes())
 end
 

packages/texcat/lux.toml

@@ -1,5 +1,5 @@
 package = "texcat"
-version = "0.3.12"
+version = "0.3.13"
 lua = ">=5.1"
 
 [description]
@@ -22,7 +22,7 @@ warna = ">=0.3.5"
 ltreesitter = ">=0.1.0"
 nvim-textmate = ">=0.0.1"
 luafilesystem = ">=1.9.0"
-texrocks = ">=0.3.12"
+texrocks = ">=0.3.13"
 vscode-extensions = ">=1.102.3"
 
 [test_dependencies]

scripts/publish.sh

@@ -1,16 +1,21 @@
 #!/usr/bin/env bash
 set -e
 cd "$(dirname "$(dirname "$(readlink -f "$0")")")"
-
 cd packages
+
+dirs=("$1")
+if (( ${#dirs} == 0 )); then
+  dirs=(./*/)
+fi
+
 rm -f ./*/*.rock{,spec}
-for dir in ./*/; do
+for dir in "${dirs[@]}"; do
   if [[ "$dir" = ./demo-*/ ]]; then
     continue
   fi
   cd "$dir"
   lx generate-rockspec
-  perl -pi -e's/>=/ >= /' ./*.rockspec
+  perl -pi -e's/[>=]=/ >= /' ./*.rockspec
   luarocks upload --force ./*.rockspec
   cd ..
 done