From 83bde1004d596740a7bb63ec7fe2271734492f59 Mon Sep 17 00:00:00 2001 From: NNB Date: Sun, 23 Jan 2022 09:18:50 +0700 Subject: [PATCH] Add markup support (#1525) * Add markup support for all Base16 themes * Fix rose_pine `markup.link.text` attribute misname * Add basic default markup support for all themes * Fix cursor change color on Base16 terminal and default * Remove old markup monokai_pro support and fix Onedark `markup.link.text` attribute misname * Remove old markup dracula support --- base16_theme.toml | 11 ++++++++++- runtime/themes/base16_default_dark.toml | 9 +++++++++ runtime/themes/base16_default_light.toml | 9 +++++++++ runtime/themes/base16_terminal.toml | 11 ++++++++++- runtime/themes/bogster.toml | 10 ++++++++++ runtime/themes/dark_plus.toml | 10 ++++++++++ runtime/themes/everforest_dark.toml | 10 ++++++++++ runtime/themes/everforest_light.toml | 10 ++++++++++ runtime/themes/ingrid.toml | 10 ++++++++++ runtime/themes/monokai.toml | 10 ++++++++++ runtime/themes/nord.toml | 10 ++++++++++ runtime/themes/onedark.toml | 2 +- runtime/themes/rose_pine.toml | 2 +- runtime/themes/rose_pine_dawn.toml | 2 +- runtime/themes/solarized_dark.toml | 10 ++++++++++ runtime/themes/solarized_light.toml | 10 ++++++++++ runtime/themes/spacebones_light.toml | 10 ++++++++++ 17 files changed, 141 insertions(+), 5 deletions(-) diff --git a/base16_theme.toml b/base16_theme.toml index bb60a3ea5..42e02a98a 100644 --- a/base16_theme.toml +++ b/base16_theme.toml @@ -11,7 +11,7 @@ "ui.statusline" = { fg = "black", bg = "white" } "ui.statusline.inactive" = { fg = "gray", bg = "white" } "ui.help" = { modifiers = ["reversed"] } -"ui.cursor" = { modifiers = ["reversed"] } +"ui.cursor" = { fg = "white", modifiers = ["reversed"] } "variable" = "red" "constant.numeric" = "yellow" "constant" = "yellow" @@ -29,6 +29,15 @@ "namespace" = "magenta" "ui.help" = { fg = "white", bg = "black" } +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = "green" "diff.delta" = "yellow" "diff.minus" = "red" diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml index 33ff87fae..d19863e03 100644 --- a/runtime/themes/base16_default_dark.toml +++ b/runtime/themes/base16_default_dark.toml @@ -33,6 +33,15 @@ "namespace" = "base0E" "ui.help" = { fg = "base06", bg = "base01" } +"markup.heading" = "base0D" +"markup.list" = "base08" +"markup.bold" = { fg = "base0A", modifiers = ["bold"] } +"markup.italic" = { fg = "base0E", modifiers = ["italic"] } +"markup.link.url" = { fg = "base09", modifiers = ["underlined"] } +"markup.link.text" = "base08" +"markup.quote" = "base0C" +"markup.raw" = "base0B" + "diff.plus" = "base0B" "diff.delta" = "base09" "diff.minus" = "base08" diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml index 3f4de2654..483e87cc5 100644 --- a/runtime/themes/base16_default_light.toml +++ b/runtime/themes/base16_default_light.toml @@ -33,6 +33,15 @@ "namespace" = "base0E" "ui.help" = { fg = "base06", bg = "base01" } +"markup.heading" = "base0D" +"markup.list" = "base08" +"markup.bold" = { fg = "base0A", modifiers = ["bold"] } +"markup.italic" = { fg = "base0E", modifiers = ["italic"] } +"markup.link.url" = { fg = "base09", modifiers = ["underlined"] } +"markup.link.text" = "base08" +"markup.quote" = "base0C" +"markup.raw" = "base0B" + "diff.plus" = "base0B" "diff.delta" = "base09" "diff.minus" = "base08" diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml index cbbfbf241..23240d8dd 100644 --- a/runtime/themes/base16_terminal.toml +++ b/runtime/themes/base16_terminal.toml @@ -12,7 +12,7 @@ "ui.statusline.inactive" = { fg = "gray", bg = "black" } "ui.help" = { fg = "white", bg = "black" } "ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] } -"ui.cursor.primary" = { modifiers = ["reversed"] } +"ui.cursor.primary" = { fg = "light-white", modifiers = ["reversed"] } "variable" = "light-red" "constant.numeric" = "yellow" "constant" = "yellow" @@ -30,6 +30,15 @@ "namespace" = "light-magenta" "ui.help" = { fg = "white", bg = "black" } +"markup.heading" = "light-blue" +"markup.list" = "light-red" +"markup.bold" = { fg = "light-yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "light-magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "light-red" +"markup.quote" = "light-cyan" +"markup.raw" = "light-green" + "diff.plus" = "light-green" "diff.delta" = "yellow" "diff.minus" = "light-red" diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml index 493e5ace9..32b58d0ac 100644 --- a/runtime/themes/bogster.toml +++ b/runtime/themes/bogster.toml @@ -28,6 +28,16 @@ "module" = "#d32c5d" +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = "#59dcb7" "diff.delta" = "#dc7759" "diff.minus" = "#dc597f" diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml index 784376493..ab7c16ecc 100644 --- a/runtime/themes/dark_plus.toml +++ b/runtime/themes/dark_plus.toml @@ -39,6 +39,16 @@ "constant.numeric" = { fg = "pale_green" } "constant.character.escape" = { fg = "gold" } +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = { fg = "pale_green" } "diff.delta" = { fg = "gold" } "diff.minus" = { fg = "red" } diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml index f5a0088cd..a6389da2c 100644 --- a/runtime/themes/everforest_dark.toml +++ b/runtime/themes/everforest_dark.toml @@ -34,6 +34,16 @@ "module" = "blue" "special" = "orange" +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = "green" "diff.delta" = "orange" "diff.minus" = "red" diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml index 3038ef9c5..5490adb3c 100644 --- a/runtime/themes/everforest_light.toml +++ b/runtime/themes/everforest_light.toml @@ -34,6 +34,16 @@ "module" = "blue" "special" = "orange" +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = "green" "diff.delta" = "orange" "diff.minus" = "red" diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml index df8a922fd..a7c33e2df 100644 --- a/runtime/themes/ingrid.toml +++ b/runtime/themes/ingrid.toml @@ -28,6 +28,16 @@ "module" = "#839A53" +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = "#839A53" "diff.delta" = "#D4A520" "diff.minus" = "#D74E50" diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml index c8bf8ebd8..e6ff0a5e3 100644 --- a/runtime/themes/monokai.toml +++ b/runtime/themes/monokai.toml @@ -39,6 +39,16 @@ "constant.numeric" = { fg = "#ae81ff" } "constant.character.escape" = { fg = "#ae81ff" } +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = { fg = "#a6e22e" } "diff.delta" = { fg = "#fd971f" } "diff.minus" = { fg = "#f92672" } diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml index ae1ea29be..deb904520 100644 --- a/runtime/themes/nord.toml +++ b/runtime/themes/nord.toml @@ -84,6 +84,16 @@ # nord15 - integer, floating point "constant.numeric" = "nord15" +# TODO markup +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + # vcs "diff.plus" = "nord14" "diff.delta" = "nord12" diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml index dfeadbb29..acdaf99c8 100644 --- a/runtime/themes/onedark.toml +++ b/runtime/themes/onedark.toml @@ -34,7 +34,7 @@ "markup.list" = { fg = "red" } "markup.quote" = { fg = "yellow" } "markup.link.url" = { fg = "cyan", modifiers = ["underlined"]} -"markup.link.label" = { fg = "purple" } +"markup.link.text" = { fg = "purple" } "diff.plus" = "green" "diff.delta" = "gold" diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml index bf3a040ba..027cc5ed1 100644 --- a/runtime/themes/rose_pine.toml +++ b/runtime/themes/rose_pine.toml @@ -55,7 +55,7 @@ "markup.list" = { fg = "love" } "markup.quote" = { fg = "rose" } "markup.link.url" = { fg = "pine", modifiers = ["underlined"]} -"markup.link.label" = { fg = "foam" } +"markup.link.text" = { fg = "foam" } [palette] base = "#191724" diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml index cc6d287e0..73b018441 100644 --- a/runtime/themes/rose_pine_dawn.toml +++ b/runtime/themes/rose_pine_dawn.toml @@ -55,7 +55,7 @@ "markup.list" = { fg = "love" } "markup.quote" = { fg = "rose" } "markup.link.url" = { fg = "pine", modifiers = ["underlined"]} -"markup.link.label" = { fg = "foam" } +"markup.link.test" = { fg = "foam" } [palette] base = "#faf4ed" diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml index ab345c8db..dfaa104ae 100644 --- a/runtime/themes/solarized_dark.toml +++ b/runtime/themes/solarized_dark.toml @@ -22,6 +22,16 @@ "module" = { fg = "violet" } "tag" = { fg = "magenta" } +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = { fg = "green" } "diff.delta" = { fg = "orange" } "diff.minus" = { fg = "red" } diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml index 6b0137fb7..c8a3dee11 100644 --- a/runtime/themes/solarized_light.toml +++ b/runtime/themes/solarized_light.toml @@ -22,6 +22,16 @@ "module" = { fg = "violet" } "tag" = { fg = "magenta" } +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = { fg = "green" } "diff.delta" = { fg = "orange" } "diff.minus" = { fg = "red" } diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml index fcbe7b371..5318dc2d3 100644 --- a/runtime/themes/spacebones_light.toml +++ b/runtime/themes/spacebones_light.toml @@ -30,6 +30,16 @@ "label" = "#b1951d" "module" = "#b1951d" +# TODO +"markup.heading" = "blue" +"markup.list" = "red" +"markup.bold" = { fg = "yellow", modifiers = ["bold"] } +"markup.italic" = { fg = "magenta", modifiers = ["italic"] } +"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] } +"markup.link.text" = "red" +"markup.quote" = "cyan" +"markup.raw" = "green" + "diff.plus" = "#2d9574" "diff.delta" = "#715ab1" "diff.minus" = "#ba2f59"