diff --git a/.github/labels.yml b/.github/labels.yml
index ade3d65..77960a9 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -7,10 +7,10 @@ extended_glob: true
rules:
- labels: ['C: infrastructure']
- patterns: ['*|-@(*.md|*.py|*.sublime-@(keymap|menu|settings|commands))', '.github/**']
+ patterns: ['*|-@(*.md|*.py|*.sublime-@(keymap|menu|settings|commands|color-scheme))', '.github/**']
- labels: ['C: source']
- patterns: ['**/*.py|-tests']
+ patterns: ['**/@(*.py|*.sublime-@(keymap|menu|settings|commands|color-scheme))|-tests']
- labels: ['C: docs']
patterns: ['**/*.md|docs/**']
@@ -43,7 +43,7 @@ rules:
patterns: ['lib/browsers.py']
- labels: ['C: settings']
- patterns: ['*.sublime-@(keymap|menu|settings|commands)']
+ patterns: ['*.sublime-@(keymap|menu|settings|commands|color-scheme)']
# Label management
diff --git a/CHANGES.md b/CHANGES.md
index 7bd0321..6dc3e98 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+# ExportHtml 2.14.0
+
+- **NEW**: Default themes converted to `sublime-color-scheme` format.
+
# ExportHtml 2.13.0
- **NEW**: Add support for `hwb()` and `alpha()`/`a()`.
diff --git a/ColorSchemes/Print Color.sublime-color-scheme b/ColorSchemes/Print Color.sublime-color-scheme
new file mode 100644
index 0000000..7349f2c
--- /dev/null
+++ b/ColorSchemes/Print Color.sublime-color-scheme
@@ -0,0 +1,180 @@
+{
+ "name": "Print Color",
+ "author": "Unknown",
+ "variables":
+ {
+ "black": "#000000",
+ "cyan": "#34a7bd",
+ "cyan2": "#6ac4d6",
+ "green": "#427e00",
+ "grey": "#3b3a32",
+ "grey2": "#a5a5a5",
+ "grey3": "#858585",
+ "grey4": "#2e2e2e",
+ "orange": "#cb6500",
+ "orange2": "#9d550f",
+ "orange3": "#ffe792",
+ "purple": "#7c4fcd",
+ "red": "#c70040",
+ "white": "#ffffff",
+ "white2": "#e5e5e5",
+ "white3": "#f8f8f0",
+ "white4": "#f8f8f2",
+ "yellow": "#8f8634"
+ },
+ "globals":
+ {
+ "foreground": "var(black)",
+ "background": "var(white)",
+ "caret": "var(black)",
+ "invisibles": "var(grey)",
+ "line_highlight": "color(var(grey4) alpha(0.13))",
+ "selection": "var(cyan)",
+ "selection_foreground": "var(white)",
+ "inactive_selection": "color(var(orange2) alpha(0.67))",
+ "inactive_selection_foreground": "var(cyan2)",
+ "gutter": "var(white2)",
+ "gutter_foreground": "var(grey3)",
+ "active_guide": "var(cyan)",
+ "find_highlight_foreground": "var(black)",
+ "find_highlight": "var(orange3)",
+ "brackets_options": "underline",
+ "brackets_foreground": "color(var(white4) alpha(0.65))",
+ "bracket_contents_options": "underline",
+ "bracket_contents_foreground": "color(var(white4) alpha(0.65))",
+ "tags_options": "stippled_underline"
+ },
+ "rules":
+ [
+ {
+ "name": "Comment",
+ "scope": "comment",
+ "foreground": "var(grey2)"
+ },
+ {
+ "name": "String",
+ "scope": "string",
+ "foreground": "var(yellow)"
+ },
+ {
+ "name": "Number",
+ "scope": "constant.numeric",
+ "foreground": "var(purple)"
+ },
+ {
+ "name": "Built-in constant",
+ "scope": "constant.language",
+ "foreground": "var(purple)"
+ },
+ {
+ "name": "User-defined constant",
+ "scope": "constant.character, constant.other",
+ "foreground": "var(purple)"
+ },
+ {
+ "name": "Variable",
+ "scope": "variable"
+ },
+ {
+ "name": "Keyword",
+ "scope": "keyword",
+ "foreground": "var(red)"
+ },
+ {
+ "name": "Storage",
+ "scope": "storage",
+ "foreground": "var(red)"
+ },
+ {
+ "name": "Storage type",
+ "scope": "storage.type",
+ "foreground": "var(cyan)",
+ "font_style": "italic"
+ },
+ {
+ "name": "Class name",
+ "scope": "entity.name.class",
+ "foreground": "var(green)",
+ "font_style": "underline"
+ },
+ {
+ "name": "Inherited class",
+ "scope": "entity.other.inherited-class",
+ "foreground": "var(green)",
+ "font_style": "italic underline"
+ },
+ {
+ "name": "Function name",
+ "scope": "entity.name.function",
+ "foreground": "var(green)"
+ },
+ {
+ "name": "Function argument",
+ "scope": "variable.parameter",
+ "foreground": "var(orange)",
+ "font_style": "italic"
+ },
+ {
+ "name": "Tag name",
+ "scope": "entity.name.tag",
+ "foreground": "var(red)"
+ },
+ {
+ "name": "Tag attribute",
+ "scope": "entity.other.attribute-name",
+ "foreground": "var(green)"
+ },
+ {
+ "name": "Library function",
+ "scope": "support.function",
+ "foreground": "var(cyan)"
+ },
+ {
+ "name": "Library constant",
+ "scope": "support.constant",
+ "foreground": "var(cyan)"
+ },
+ {
+ "name": "Library class/type",
+ "scope": "support.type, support.class",
+ "foreground": "var(cyan)",
+ "font_style": "italic"
+ },
+ {
+ "name": "Library variable",
+ "scope": "support.other.variable"
+ },
+ {
+ "name": "Invalid",
+ "scope": "invalid",
+ "foreground": "var(white3)",
+ "background": "var(red)"
+ },
+ {
+ "name": "Invalid deprecated",
+ "scope": "invalid.deprecated",
+ "foreground": "var(white3)",
+ "background": "var(purple)"
+ },
+ {
+ "name": "JSON String",
+ "scope": "meta.structure.dictionary.json string.quoted.double.json",
+ "foreground": "var(yellow)"
+ },
+ {
+ "name": "diff.deleted",
+ "scope": "markup.deleted",
+ "foreground": "var(red)"
+ },
+ {
+ "name": "diff.inserted",
+ "scope": "markup.inserted",
+ "foreground": "var(green)"
+ },
+ {
+ "name": "diff.changed",
+ "scope": "markup.changed",
+ "foreground": "var(yellow)"
+ }
+ ]
+}
diff --git a/ColorSchemes/Print Grayscale.sublime-color-scheme b/ColorSchemes/Print Grayscale.sublime-color-scheme
new file mode 100644
index 0000000..1b8a35e
--- /dev/null
+++ b/ColorSchemes/Print Grayscale.sublime-color-scheme
@@ -0,0 +1,74 @@
+{
+ "name": "Print Grayscale",
+ "author": "Unknown",
+ "variables":
+ {
+ "black": "#000000",
+ "grey": "#a5a5a5",
+ "grey2": "#888888",
+ "grey3": "#666666",
+ "grey4": "#323232",
+ "grey5": "#2e2e2e",
+ "white": "#ffffff",
+ "white2": "#e5e5e5"
+ },
+ "globals":
+ {
+ "foreground": "var(black)",
+ "background": "var(white)",
+ "caret": "var(black)",
+ "invisibles": "var(grey4)",
+ "line_highlight": "color(var(grey5) alpha(0.13))",
+ "selection": "var(grey3)",
+ "selection_foreground": "var(white)",
+ "inactive_selection": "var(grey2)",
+ "gutter": "var(white2)",
+ "gutter_foreground": "var(black)",
+ "active_guide": "var(grey2)",
+ "find_highlight_foreground": "var(black)",
+ "find_highlight": "var(grey3)",
+ "brackets_options": "underline",
+ "brackets_foreground": "var(black)",
+ "bracket_contents_options": "underline",
+ "bracket_contents_foreground": "var(black)",
+ "tags_options": "stippled_underline"
+ },
+ "rules":
+ [
+ {
+ "name": "Comment",
+ "scope": "comment",
+ "foreground": "var(grey)"
+ },
+ {
+ "name": "Storage type",
+ "scope": "storage.type",
+ "foreground": "var(black)",
+ "font_style": "italic"
+ },
+ {
+ "name": "Class name",
+ "scope": "entity.name.class",
+ "foreground": "var(black)",
+ "font_style": "underline"
+ },
+ {
+ "name": "Inherited class",
+ "scope": "entity.other.inherited-class",
+ "foreground": "var(black)",
+ "font_style": "italic underline"
+ },
+ {
+ "name": "Function argument",
+ "scope": "variable.parameter",
+ "foreground": "var(black)",
+ "font_style": "italic"
+ },
+ {
+ "name": "Library class/type",
+ "scope": "support.type, support.class",
+ "foreground": "var(black)",
+ "font_style": "italic"
+ }
+ ]
+}
diff --git a/ColorSchemes/Print-Color.tmTheme b/ColorSchemes/Print-Color.tmTheme
deleted file mode 100755
index 4d2fe55..0000000
--- a/ColorSchemes/Print-Color.tmTheme
+++ /dev/null
@@ -1,362 +0,0 @@
-
-
-
-
- name
- Print Color
- settings
-
-
- settings
-
- background
- #FFFFFF
- caret
- #000000
- foreground
- #000000
- invisibles
- #3B3A32
- lineHighlight
- #2E2E2E22
- selection
- #34A7BD
- selectionForeground
- #FFFFFF
- inactiveSelection
- #9D550FAA
- inactiveSelectionForeground
- #6ac4d6
- findHighlight
- #FFE792
- findHighlightForeground
- #000000
- activeGuide
- #34A7BD
- gutterForeground
- #858585
- gutter
- #E5E5E5
-
- bracketsForeground
- #F8F8F2A5
- bracketsOptions
- underline
-
- bracketContentsForeground
- #F8F8F2A5
- bracketContentsOptions
- underline
-
- tagsOptions
- stippled_underline
-
-
-
- name
- Comment
- scope
- comment
- settings
-
- foreground
- #A5A5A5
-
-
-
- name
- String
- scope
- string
- settings
-
- foreground
- #8F8634
-
-
-
- name
- Number
- scope
- constant.numeric
- settings
-
- foreground
- #7C4FCD
-
-
-
- name
- Built-in constant
- scope
- constant.language
- settings
-
- foreground
- #7C4FCD
-
-
-
- name
- User-defined constant
- scope
- constant.character, constant.other
- settings
-
- foreground
- #7C4FCD
-
-
-
- name
- Variable
- scope
- variable
- settings
-
- fontStyle
-
-
-
-
- name
- Keyword
- scope
- keyword
- settings
-
- foreground
- #C70040
-
-
-
- name
- Storage
- scope
- storage
- settings
-
- fontStyle
-
- foreground
- #C70040
-
-
-
- name
- Storage type
- scope
- storage.type
- settings
-
- fontStyle
- italic
- foreground
- #34A7BD
-
-
-
- name
- Class name
- scope
- entity.name.class
- settings
-
- fontStyle
- underline
- foreground
- #427E00
-
-
-
- name
- Inherited class
- scope
- entity.other.inherited-class
- settings
-
- fontStyle
- italic underline
- foreground
- #427E00
-
-
-
- name
- Function name
- scope
- entity.name.function
- settings
-
- fontStyle
-
- foreground
- #427E00
-
-
-
- name
- Function argument
- scope
- variable.parameter
- settings
-
- fontStyle
- italic
- foreground
- #CB6500
-
-
-
- name
- Tag name
- scope
- entity.name.tag
- settings
-
- fontStyle
-
- foreground
- #C70040
-
-
-
- name
- Tag attribute
- scope
- entity.other.attribute-name
- settings
-
- fontStyle
-
- foreground
- #427E00
-
-
-
- name
- Library function
- scope
- support.function
- settings
-
- fontStyle
-
- foreground
- #34A7BD
-
-
-
- name
- Library constant
- scope
- support.constant
- settings
-
- fontStyle
-
- foreground
- #34A7BD
-
-
-
- name
- Library class/type
- scope
- support.type, support.class
- settings
-
- fontStyle
- italic
- foreground
- #34A7BD
-
-
-
- name
- Library variable
- scope
- support.other.variable
- settings
-
- fontStyle
-
-
-
-
- name
- Invalid
- scope
- invalid
- settings
-
- background
- #C70040
- fontStyle
-
- foreground
- #F8F8F0
-
-
-
- name
- Invalid deprecated
- scope
- invalid.deprecated
- settings
-
- background
- #7C4FCD
- foreground
- #F8F8F0
-
-
-
- name
- JSON String
- scope
- meta.structure.dictionary.json string.quoted.double.json
- settings
-
- foreground
- #8F8634
-
-
-
- name
- diff.deleted
- scope
- markup.deleted
- settings
-
- foreground
- #C70040
-
-
-
- name
- diff.inserted
- scope
- markup.inserted
- settings
-
- foreground
- #427E00
-
-
-
- name
- diff.changed
- scope
- markup.changed
- settings
-
- foreground
- #8F8634
-
-
-
- uuid
- 22808317-0a5a-4b87-baea-5aeee17bf295
-
-
diff --git a/ColorSchemes/Print-Grayscale.tmTheme b/ColorSchemes/Print-Grayscale.tmTheme
deleted file mode 100755
index 3d5a195..0000000
--- a/ColorSchemes/Print-Grayscale.tmTheme
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
- name
- Print Grayscale
- settings
-
-
- settings
-
- background
- #FFFFFF
- caret
- #000000
- foreground
- #000000
- invisibles
- #323232
- lineHighlight
- #2E2E2E22
- selection
- #666666
- selectionForeground
- #FFFFFF
- inactiveSelection
- #888888
- findHighlight
- #666666
- findHighlightForeground
- #000000
- activeGuide
- #888888
- gutterForeground
- #000000
- gutter
- #E5E5E5
-
- bracketsForeground
- #000000
- bracketsOptions
- underline
-
- bracketContentsForeground
- #000000
- bracketContentsOptions
- underline
-
- tagsOptions
- stippled_underline
-
-
-
- name
- Comment
- scope
- comment
- settings
-
- foreground
- #A5A5A5
-
-
-
- name
- Storage type
- scope
- storage.type
- settings
-
- fontStyle
- italic
- foreground
- #000000
-
-
-
- name
- Class name
- scope
- entity.name.class
- settings
-
- fontStyle
- underline
- foreground
- #000000
-
-
-
- name
- Inherited class
- scope
- entity.other.inherited-class
- settings
-
- fontStyle
- italic underline
- foreground
- #000000
-
-
-
- name
- Function argument
- scope
- variable.parameter
- settings
-
- fontStyle
- italic
- foreground
- #000000
-
-
-
- name
- Library class/type
- scope
- support.type, support.class
- settings
-
- fontStyle
- italic
- foreground
- #000000
-
-
-
- uuid
- 07379361-ce49-4e6c-a03f-26378a7a2131
-
-
diff --git a/ExportHtml.sublime-settings b/ExportHtml.sublime-settings
index c1c1299..9141216 100644
--- a/ExportHtml.sublime-settings
+++ b/ExportHtml.sublime-settings
@@ -48,7 +48,7 @@
"wrap": 900,
"browser_print": true,
"multi_select": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color.tmTheme",
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color",
"style_gutter": false,
"diable_nbsp": true
}
@@ -61,7 +61,7 @@
"wrap": 900,
"browser_print": true,
"multi_select": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale.tmTheme",
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale",
"style_gutter": false,
"diable_nbsp": true
}
@@ -76,7 +76,7 @@
"wrap": 900,
"browser_print": true,
"highlight_selections": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color.tmTheme",
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color",
"style_gutter": false,
"diable_nbsp": true
}
@@ -91,7 +91,7 @@
"wrap": 900,
"browser_print": true,
"highlight_selections": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale.tmTheme",
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale",
"style_gutter": false,
"diable_nbsp": true
}
@@ -101,7 +101,7 @@
"Browser View - Color": {
"numbers": true,
"multi_select": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color.tmTheme"
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color"
}
},
@@ -110,7 +110,7 @@
"Browser View - Grayscale": {
"numbers": true,
"multi_select": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale.tmTheme"
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale"
}
},
@@ -119,7 +119,7 @@
"Browser View - Color (Selection Highlights)": {
"numbers": true,
"highlight_selections": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color.tmTheme"
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color"
}
},
@@ -128,7 +128,7 @@
"Browser View - Grayscale (Selection Highlights)": {
"numbers": true,
"highlight_selections": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale.tmTheme"
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale"
}
},
@@ -139,7 +139,7 @@
"numbers": true,
"wrap": 900,
"multi_select": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color.tmTheme"
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Color"
}
},
@@ -150,7 +150,7 @@
"numbers": true,
"wrap": 900,
"multi_select": true,
- "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale.tmTheme"
+ "color_scheme": "Packages/ExportHtml/ColorSchemes/Print-Grayscale"
}
}
],
diff --git a/messages.json b/messages.json
index e93f249..9cc0073 100644
--- a/messages.json
+++ b/messages.json
@@ -1,4 +1,4 @@
{
"install": "messages/install.md",
- "2.13.0": "messages/recent.md"
+ "2.14.0": "messages/recent.md"
}
diff --git a/support.py b/support.py
index 2a6e907..cc08e2f 100644
--- a/support.py
+++ b/support.py
@@ -5,7 +5,7 @@
import webbrowser
import re
-__version__ = "2.13.0"
+__version__ = "2.14.0"
__pc_name__ = 'ExportHtml'
CSS = '''