Merge branch 'main' into dev

V1.4.2

.gitignore

@@ -3,4 +3,5 @@
 
 .obsidian
 assets
+result
 

README.md

@@ -156,6 +156,7 @@ require('typstar').setup({ -- depending on your neovim plugin system
 </details>
 
 ### Snippets
+0. The snippets are designed to work with Typst `0.14`. For older versions check out the legacy `typst-0.13` branch.
 1. Install [LuaSnip](https://github.com/L3MON4D3/LuaSnip/), set `enable_autosnippets = true` and set a visual mode selection key (e.g. `store_selection_keys = '<Tab>'`) in the configuration
 2. Install [jsregexp](https://github.com/kmarius/jsregexp) as described [here](https://github.com/L3MON4D3/LuaSnip/blob/master/DOC.md#transformations) (You will see a warning on startup if jsregexp isn't installed properly)
 3. Install [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter) and run `:TSInstall typst`
@@ -175,7 +176,6 @@ require('typstar').setup({ -- depending on your neovim plugin system
 4. See comment 4 above at Excalidraw
 
 ### Anki
-0. Typst version `0.12.0` or higher is required
 1. Install [Anki](https://apps.ankiweb.net/#download)
 2. Install [Anki-Connect](https://ankiweb.net/shared/info/2055492159) and make sure `http://localhost` is added to `webCorsOriginList` in the Add-on config (should be added by default)
 3. Install the typstar python package (I recommend using [pipx](https://github.com/pypa/pipx) via `pipx install git+https://github.com/arne314/typstar`, you will need to have python build tools and clang installed) \[Note: this may take a while\]

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1749398372,
+        "lastModified": 1762040540,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "0010412d62a25d959151790968765a70c436598b",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750386251,
+        "lastModified": 1762156382,
-        "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=",
+        "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb",
+        "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1748740939,
+        "lastModified": 1761765539,
-        "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
+        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "656a64127e9d791a334452c6b6606d17539476e2",
+        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,78 +6,79 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
   };
 
-  outputs = inputs @ {
+  outputs =
-    self,
+    inputs@{
-    nixpkgs,
+      self,
-    flake-parts,
+      nixpkgs,
-    ...
+      flake-parts,
-  }:
+      ...
-    flake-parts.lib.mkFlake {inherit inputs;} {
+    }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "x86_64-linux"
         "x86_64-darwin"
         "aarch64-darwin"
       ];
 
-      perSystem = {system, ...}: let
+      perSystem =
-        pkgs = import nixpkgs {inherit system;};
+        { system, ... }:
-        typstar = pkgs.vimUtils.buildVimPlugin {
+        let
-          name = "typstar";
+          pkgs = import nixpkgs { inherit system; };
-          src = self;
+          typstar = pkgs.vimUtils.buildVimPlugin {
-          buildInputs = [
+            name = "typstar";
-            pkgs.vimPlugins.luasnip
+            src = self;
-            pkgs.vimPlugins.nvim-treesitter-parsers.typst
+            buildInputs = [
-          ];
+              pkgs.vimPlugins.luasnip
-          # TODO: make this check pass instead of skipping
+              pkgs.vimPlugins.nvim-treesitter-parsers.typst
-          neovimRequireCheckHook = ''
+            ];
-            echo "Skipping neovimRequireCheckHook"
+          };
-          '';
+        in
+        {
+          packages = {
+            default = typstar;
+            nvim =
+              let
+                config = pkgs.neovimUtils.makeNeovimConfig {
+                  customRC = ''
+                    lua << EOF
+                    print("Welcome to Typstar! This is just a demo.")
+
+                    vim.g.mapleader = " "
+
+                    require('nvim-treesitter.configs').setup {
+                      highlight = { enable = true },
+                    }
+
+                    local ls = require('luasnip')
+                    ls.config.set_config({
+                      enable_autosnippets = true,
+                      store_selection_keys = "<Tab>",
+                    })
+
+                    local typstar = require('typstar')
+                    typstar.setup({})
+
+                    vim.keymap.set({'n', 'i'}, '<M-t>', '<Cmd>TypstarToggleSnippets<CR>', { silent = true, noremap = true })
+                    vim.keymap.set({'s', 'i'}, '<M-j>', '<Cmd>TypstarSmartJump<CR>', { silent = true, noremap = true })
+                    vim.keymap.set({'s', 'i'}, '<M-k>', '<Cmd>TypstarSmartJumpBack<CR>', { silent = true, noremap = true })
+
+                    vim.keymap.set('n', '<leader>e', '<Cmd>TypstarInsertExcalidraw<CR>', { silent = true, noremap = true })
+                    vim.keymap.set('n', '<leader>r', '<Cmd>TypstarInsertRnote<CR>', { silent = true, noremap = true })
+                    vim.keymap.set('n', '<leader>o', '<Cmd>TypstarOpenDrawing<CR>', { silent = true, noremap = true })
+
+                    vim.keymap.set('n', '<leader>a', '<Cmd>TypstarAnkiScan<CR>', { silent = true, noremap = true })
+                    EOF
+                  '';
+                  plugins = [
+                    typstar
+                    pkgs.vimPlugins.luasnip
+                    pkgs.vimPlugins.nvim-treesitter
+                    pkgs.vimPlugins.nvim-treesitter-parsers.typst
+                  ];
+                };
+              in
+              pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped config;
+          };
         };
-      in {
-        packages = {
-          default = typstar;
-          nvim = let
-            config = pkgs.neovimUtils.makeNeovimConfig {
-              customRC = ''
-                lua << EOF
-                print("Welcome to Typstar! This is just a demo.")
-
-                vim.g.mapleader = " "
-
-                require('nvim-treesitter.configs').setup {
-                  highlight = { enable = true },
-                }
-
-                local ls = require('luasnip')
-                ls.config.set_config({
-                  enable_autosnippets = true,
-                  store_selection_keys = "<Tab>",
-                })
-
-                local typstar = require('typstar')
-                typstar.setup({})
-
-                vim.keymap.set({'n', 'i'}, '<M-t>', '<Cmd>TypstarToggleSnippets<CR>', { silent = true, noremap = true })
-                vim.keymap.set({'s', 'i'}, '<M-j>', '<Cmd>TypstarSmartJump<CR>', { silent = true, noremap = true })
-                vim.keymap.set({'s', 'i'}, '<M-k>', '<Cmd>TypstarSmartJumpBack<CR>', { silent = true, noremap = true })
-
-                vim.keymap.set('n', '<leader>e', '<Cmd>TypstarInsertExcalidraw<CR>', { silent = true, noremap = true })
-                vim.keymap.set('n', '<leader>r', '<Cmd>TypstarInsertRnote<CR>', { silent = true, noremap = true })
-                vim.keymap.set('n', '<leader>o', '<Cmd>TypstarOpenDrawing<CR>', { silent = true, noremap = true })
-
-                vim.keymap.set('n', '<leader>a', '<Cmd>TypstarAnkiScan<CR>', { silent = true, noremap = true })
-                EOF
-              '';
-              plugins = [
-                typstar
-                pkgs.vimPlugins.luasnip
-                pkgs.vimPlugins.nvim-treesitter
-                pkgs.vimPlugins.nvim-treesitter-parsers.typst
-              ];
-            };
-          in
-            pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped config;
-        };
-      };
     };
 }

lua/typstar/drawings.lua

@@ -104,10 +104,64 @@ local open_drawing = function(prov)
     end
 end
 
+local function delete_drawing(provider)
+    local cfg = provider[1]
+    local line_num = vim.api.nvim_win_get_cursor(0)[1] - 1
+    local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false)
+
+    -- Find the start and end of the #figure() block containing the filename
+    local start_line, end_line
+    for i = line_num, 0, -1 do
+        if lines[i + 1]:match("^#figure%(") then
+            start_line = i
+            break
+        end
+    end
+    for i = line_num, #lines - 1 do
+        if lines[i + 1]:match("%)$") then
+            end_line = i
+            break
+        end
+    end
+
+    if not start_line or not end_line then
+        print("No #figure() block found on current line")
+        return
+    end
+
+    -- Extract filename from the block
+    local block_text = table.concat(vim.api.nvim_buf_get_lines(0, start_line, end_line + 1, false), "\n")
+    local filename = block_text:match('image%("%s*(.-)%s*"%)')
+    if not filename then
+        print("No image filename found in #figure() block")
+        return
+    end
+
+    local path = vim.fn.expand('%:p:h') .. '/' .. filename
+    local path_export = vim.fn.expand('%:p:h') .. '/' .. filename:match("^(.*)%.")
+
+    -- Delete files if they exist
+    if vim.fn.filereadable(path) == 1 then os.remove(path) end
+    if vim.fn.filereadable(path_export) == 1 then os.remove(path_export) end
+
+    -- Delete the lines of the #figure() block
+    vim.api.nvim_buf_set_lines(0, start_line, end_line + 1, false, {})
+
+    print("Deleted drawing: " .. filename)
+end
+
+function M.delete_obsidian_excalidraw() delete_drawing(excalidraw) end
+
+function M.delete_rnote() delete_drawing(rnote) end
+
 function M.insert_obsidian_excalidraw() insert_drawing(excalidraw) end
+
 function M.insert_rnote() insert_drawing(rnote) end
+
 function M.open_obsidian_excalidraw() open_drawing({ excalidraw }) end
+
 function M.open_rnote() open_drawing({ rnote }) end
+
 function M.open_drawing() open_drawing(providers) end
 
 return M

lua/typstar/init.lua

@@ -14,7 +14,9 @@ M.setup = function(args)
     vim.api.nvim_create_user_command('TypstarSmartJumpBack', function() M.smart_jump(-1) end, {})
 
     vim.api.nvim_create_user_command('TypstarInsertExcalidraw', drawings.insert_obsidian_excalidraw, {})
+    vim.api.nvim_create_user_command('TypstarDeleteExcalidraw', drawings.delete_obsidian_excalidraw, {})
     vim.api.nvim_create_user_command('TypstarInsertRnote', drawings.insert_rnote, {})
+    vim.api.nvim_create_user_command('TypstarDeleteRnote', drawings.delete_rnote, {})
     vim.api.nvim_create_user_command('TypstarOpenExcalidraw', drawings.open_obsidian_excalidraw, {})
     vim.api.nvim_create_user_command('TypstarOpenRnote', drawings.open_rnote, {})
     vim.api.nvim_create_user_command('TypstarOpenDrawing', drawings.open_drawing, {})

lua/typstar/snippets/markup.lua

@@ -19,14 +19,16 @@ local ctheorems = {
     { 'def', 'definition' },
     { 'exa', 'example' },
     { 'rem', 'remark' },
+    { 'nte', 'note' },
+    { 'eri', 'experiment' },
 }
 
 local wrappings = {
-    { 'll', '$', '$', '1+1' },
+    { 'll', '$', '$', '' },
-    { 'BLD', '*', '*', 'abc' },
+    { 'BLD', '*', '*', '' },
-    { 'ITL', '_', '_', 'abc' },
+    { 'ITL', '_', '_', '' },
-    { 'HIG', '#highlight[', ']', 'abc' },
+    { 'HIG', '#highlight[', ']', '' },
-    { 'UND', '#underline[', ']', 'abc' },
+    { 'UND', '#underline[', ']', '' },
 }
 
 local document_snippets = {}
@@ -49,6 +51,7 @@ return {
     helper.list_snip('dm', '\n$\n\t<>\n$ <>', { helper.visual(1), i(2) }, markup, 1100, { prepend = '\t' }),
     start('fla', '#flashcard(0)[<>][\n<>\n<>]', { i(1, 'flashcard'), indent_visual(2), cap(1) }, markup),
     start('flA', '#flashcard(0, "<>")[\n<>\n<>]', { i(1, 'flashcard'), indent_visual(2), cap(1) }, markup),
+    start('TAB', '#table(columns: <>,\n[<>], [<>], <>\n)', { i(1), i(2), i(3), i(4) }, markup),
     snip('IMP', '$==>>$ ', {}, markup),
     snip('IFF', '$<<==>>$ ', {}, markup),
     unpack(document_snippets),

lua/typstar/snippets/math.lua

@@ -9,7 +9,6 @@ local cap = helper.cap
 return {
     snip('fa', 'forall ', {}, math),
     snip('ex', 'exists ', {}, math),
-    snip('ni', 'in.not ', {}, math),
     snip('Sq', 'square', {}, math),
 
     -- logical chunks
@@ -19,6 +18,8 @@ return {
     snip('een', 'exists epsilon>>0 ', {}, math),
 
     -- boolean logic
+    snip('and', 'and ', {}, math),
+    snip('or', 'or ', {}, math),
     snip('not', 'not ', {}, math),
     snip('ip', '==>> ', {}, math),
     snip('ib', '<<== ', {}, math),
@@ -31,30 +32,47 @@ return {
     snip('gt', '>> ', {}, math),
     snip('le', '<<= ', {}, math),
     snip('ne', '!= ', {}, math),
+    snip('eel', '&= ', {}, math),
     snip('ge', '>>= ', {}, math),
 
-    -- operators
+	-- custom
-    snip('ak([^k ])', '+ <>', { cap(1) }, math, 100, { wordTrig = false }),
+    snip('mm', '- ', {}, math),
-    snip('sk([^k ])', '- <>', { cap(1) }, math, 100, { wordTrig = false }),
+    snip('pl', '+ ', {}, math),
-    snip('oak', 'plus.circle ', {}, math),
+    snip('nl', '\\ \n<>', {i(1)}, math),
-    snip('bak', 'plus.square ', {}, math),
+    snip('pm', '+- ', {}, math),
-    snip('mak', 'plus.minus ', {}, math),
+    snip('nx', '\\, space ', {}, math),
-    snip('xx', 'times ', {}, math),
+    snip('nbx', '\\, quad ', {}, math),
-    snip('oxx', 'times.circle ', {}, math),
+    snip('deg', 'degree ', {}, math),
-    snip('bxx', 'times.square ', {}, math),
+    snip('ta', 'star ', {}, math),
-    snip('ff', '(<>) / (<>) <>', { i(1, 'a'), i(2, 'b'), i(3) }, math),
+    snip('del', 'Delta ', {}, math),
+    snip('apr', 'approx ', {}, math),
+    snip('pal', 'parallel ', {}, math),
+    snip('sa', 'space ', {}, math),
 
-    -- exponents
+    -- operators
+    snip('mak', 'plus.minus ', {}, math),
+    snip('oak', 'plus.o ', {}, math),
+    snip('bak', 'plus.square ', {}, math),
+    snip('osk', 'minus.o ', {}, math),
+    snip('bsk', 'minus.square ', {}, math),
+    snip('xx', 'times ', {}, math),
+    snip('oxx', 'times.o ', {}, math),
+    snip('bxx', 'times.square ', {}, math),
+    snip('ff', '(<>) / (<>) <>', { i(1), i(2), i(3) }, math),
+    snip('nab', 'arrow(nabla) ', {}, math),
+
+    -- subscript/superscript
     snip('iv', '^(-1) ', {}, math, 500, { wordTrig = false, blacklist = { 'equiv' } }),
     snip('tp', '^top ', {}, math, 500, { wordTrig = false }),
+    snip('cmp', '^complement ', {}, math, 500, { wordTrig = false }),
+    snip('prp', '^perp ', {}, math, 500, { wordTrig = false }),
     snip('sr', '^2 ', {}, math, 500, { wordTrig = false }),
     snip('cb', '^3 ', {}, math, 500, { wordTrig = false }),
     snip('jj', '_(<>) ', { i(1, 'n') }, math, 500, { wordTrig = false }),
     snip('kk', '^(<>) ', { i(1, 'n') }, math, 500, { wordTrig = false }),
-    snip('ep', 'exp(<>) ', { i(1, '1') }, math),
 
     -- sets
-    -- 'st' to '{<>} in ./visual.lua
+    -- 'st' to '{<>}' in ./visual.lua
     snip('set', '{<> mid(|) <>}', { i(1), i(2) }, math),
     snip('es', 'emptyset ', {}, math),
     snip('ses', '{emptyset} ', {}, math),
@@ -67,37 +85,45 @@ return {
     snip('bnn', 'inter.big ', {}, math),
     snip('buu', 'union.big ', {}, math),
     snip('swo', 'without ', {}, math),
+    snip('ni', 'in.not ', {}, math),
 
     -- misc
     snip('to', '->> ', {}, math),
     snip('mt', '|->> ', {}, math),
-    snip('Oo', 'compose ', {}, math),
+    snip('cp', 'compose ', {}, math),
     snip('iso', 'tilde.equiv ', {}, math),
-    snip('cc', 'cases(\n\t<>\n)\\', { i(1, '1') }, math),
+    snip('cc', 'cases(\n\t<>\n)\\', { i(1) }, math),
     snip('([A-Za-z])o([A-Za-z0-9]) ', '<>(<>) ', { cap(1), cap(2) }, math, 100, {
         maxTrigLength = 4,
-        blacklist = { 'bot ', 'cos ', 'cot ', 'dot ', 'log ', 'mod ', 'top ', 'won ', 'xor ' },
+        blacklist = { 'bot ', 'cos ', 'cot ', 'dot ', 'log ', 'mod ', 'not ', 'top ', 'won ', 'xor ' },
     }),
     snip('(K|M|N|Q|R|S|Z)([\\dn]) ', '<><>^<> ', { cap(1), cap(1), cap(2) }, math),
 
+    -- derivatives
     snip('dx', 'dif / (dif <>) ', { i(1, 'x') }, math),
     snip('ddx', '(dif <>) / (dif <>) ', { i(1, 'f'), i(2, 'x') }, math),
-    snip('DX', 'diff / (diff <>) ', { i(1, 'x') }, math),
+    snip('DX', 'partial / (partial <>) ', { i(1, 'x') }, math),
-    snip('DDX', '(diff <>) / (diff <>) ', { i(1, 'f'), i(2, 'x') }, math),
+    snip('DDX', '(partial <>) / (partial <>) ', { i(1, 'f'), i(2, 'x') }, math),
     snip('part', 'partial ', {}, math, 1600),
 
+    -- integrals
     snip('it', 'integral ', {}, math),
+    snip('iot', 'integral.vol ', {}, math),
+    snip('ift', 'integral.surf ', {}, math),
     snip('int', 'integral_(<>)^(<>) ', { i(1, 'a'), i(2, 'b') }, math),
     snip('oit', 'integral.cont_(<>) ', { i(1, 'C') }, math),
     snip('dit', 'integral_(<>) ', { i(1, 'Omega') }, math),
 
+    -- sums
     snip('sm', 'sum ', {}, math),
     snip('sum', 'sum_(<>)^(<>) ', { i(1, 'k=1'), i(2, 'oo') }, math),
     snip('dsm', 'sum_(<>) ', { i(1, 'Omega') }, math),
 
+    -- products
     snip('prd', 'product ', {}, math),
     snip('prod', 'product_(<>)^(<>) ', { i(1, 'k=1'), i(2, 'n') }, math),
 
+    -- limits
     snip('lm', 'lim ', {}, math),
     snip('lim', 'lim_(<> ->> <>) ', { i(1, 'n'), i(2, 'oo') }, math),
     snip('lim (sup|inf)', 'lim<> ', { cap(1) }, math),

lua/typstar/snippets/visual.lua

@@ -28,18 +28,22 @@ local operations = { -- first boolean: existing brackets should be kept; second
     { 'sQ', '[', ']', false, false }, -- replace with square brackets
     { 'BB', '', '', false, false }, -- remove brackets
     { 'ss', '"', '"', false, false },
-    { 'agl', 'lr(angle.l ', ' angle.r)', false, false },
+    { 'chv', 'lr(chevron.l ', ' chevron.r)', false, false },
     { 'abs', 'abs', '', true, true },
     { 'ul', 'underline', '', true, true },
     { 'ol', 'overline', '', true, true },
     { 'ub', 'underbrace', '', true, true },
     { 'ob', 'overbrace', '', true, true },
     { 'ht', 'hat', '', true, true },
+    { 'ar', 'arrow', '', true, true },
     { 'br', 'macron', '', true, true },
     { 'dt', 'dot', '', true, true },
+    { 'dou', 'dot.double', '', true, true },
+    { 'dia', 'diaer', '', true, true },
     { 'ci', 'circle', '', true, true },
     { 'td', 'tilde', '', true, true },
     { 'nr', 'norm', '', true, true },
+    { 'arr', 'arrow', '', true, true },
     { 'vv', 'vec', '', true, true },
     { 'rt', 'sqrt', '', true, true },
     { 'flo', 'floor', '', true, true },
@@ -96,7 +100,7 @@ local smart_wrap = function(args, parent, old_state, expand)
 
     -- normal snippet
     if not visual_disable_normal[trigger] then
-        return s(nil, { t(expand1), i(1, '1+1'), t(expand2) })
+        return s(nil, { t(expand1), i(1), t(expand2) })
     else
         return s(nil, t(trigger))
     end

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "typstar"
-version = "1.4.1"
+version = "1.4.2"
 description = "Neovim plugin for efficient note taking in Typst"
 authors = [
     { name = "arne314" }

uv.lock

@@ -516,7 +516,7 @@ wheels = [
 
 [[package]]
 name = "typstar"
-version = "1.4.1"
+version = "1.4.2"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },