Added more options for themes.

9 files changed, 273 insertions, 43 deletions

diff --git a/themes/dark/buffer.lua b/themes/dark/buffer.lua
index 8eb5971d..2dd7d02f 100644..100755
--- a/themes/dark/buffer.lua
+++ b/themes/dark/buffer.lua
@@ -7,14 +7,9 @@ local buffer = buffer
 buffer.property['fold'] = '1'
 buffer.property['fold.by.indentation'] = '1'
 
--- Tabs and indentation.
+-- Tabs and Indentation.
 buffer.tab_width = 2
 buffer.use_tabs = false
 buffer.indent = 2
 buffer.tab_indents = true
 buffer.back_space_un_indents = true
-buffer.indentation_guides = 1
-
--- Various.
-buffer.auto_c_choose_single = true
-buffer.additional_selection_typing = true
diff --git a/themes/dark/lexer.lua b/themes/dark/lexer.lua
index f5a685a8..cd738d42 100644
--- a/themes/dark/lexer.lua
+++ b/themes/dark/lexer.lua
@@ -1,6 +1,10 @@
 -- Copyright 2007-2010 Mitchell mitchell<att>caladbolg.net. See LICENSE.
 -- Dark lexer theme for Textadept.
 
+-- Please note this theme is in a separate Lua state than Textadept's main one.
+-- This means the global variables like 'buffer', 'view', and 'gui' are not
+-- available here. Only the variables in the 'lexer' module are.
+
 module('lexer', package.seeall)
 
 colors = {
diff --git a/themes/dark/view.lua b/themes/dark/view.lua
index 5f9fb4b2..61480c24 100644..100755
--- a/themes/dark/view.lua
+++ b/themes/dark/view.lua
@@ -4,31 +4,80 @@
 local c = _SCINTILLA.constants
 local buffer = buffer
 
--- Caret.
-buffer.caret_fore = 11184810 -- 0xAA | 0xAA << 8 | 0xAA << 16
-buffer.caret_line_visible = true
-buffer.caret_line_back = 4473924 -- 0x44 | 0x44 << 8 | 0x44 << 16
+-- Multiple Selection and Virtual Space
+buffer.multiple_selection = true
+buffer.additional_selection_typing = true
+--buffer.multi_paste = 1
+--buffer.virtual_space_options = 3
+--buffer.additional_sel_alpha =
+--buffer.additional_sel_fore =
+--buffer.additional_sel_back =
+--buffer.additional_caret_fore =
+--buffer.additional_carets_blink = false
+--buffer.additional_carets_visible = false
+
+-- Scrolling.
 buffer:set_x_caret_policy(1, 20) -- CARET_SLOP
 buffer:set_y_caret_policy(13, 1) -- CARET_SLOP | CARET_STRICT | CARET_EVEN
+--buffer:set_visible_policy()
+--buffer.h_scroll_bar = false
+--buffer.v_scroll_bar = false
+--buffer.x_offset =
+--buffer.scroll_width =
+--buffer.scroll_width_tracking = true
+--buffer.end_at_last_line = false
+
+-- Whitespace
+--buffer.view_ws = 1
+--buffer.whitespace_size =
+--buffer.extra_ascent =
+--buffer.extra_descent =
+
+-- Line Endings
+--buffer.view_eol = true
 
--- Selection.
+-- Caret and Selection Styles.
 buffer:set_sel_fore(1, 3355443) -- 0x33 | 0x33 << 8 | 0x33 << 16
 buffer:set_sel_back(1, 10066329) -- 0x99 | 0x99 << 8 | 0x99 << 16
+--buffer.sel_alpha =
+--buffer.sel_eol_filled = true
+buffer.caret_fore = 11184810 -- 0xAA | 0xAA << 8 | 0xAA << 16
+buffer.caret_line_visible = true
+buffer.caret_line_back = 4473924 -- 0x44 | 0x44 << 8 | 0x44 << 16
+--buffer.caret_line_back_alpha =
+--buffer.caret_period = 0
+--buffer.caret_style = 2
+--buffer.caret_width =
+--buffer.caret_sticky = 1
 
-buffer.margin_width_n[0] = 4 + 3 * -- line number margin
+-- Line Number Margin.
+buffer.margin_width_n[0] = 4 + 3 *
   buffer:text_width(c.STYLE_LINENUMBER, '9')
 
+-- Marker Margin.
 buffer.margin_width_n[1] = 0 -- marker margin invisible
 
--- Fold margin.
-buffer:set_fold_margin_colour(1, 11184810) -- 0xAA | 0xAA << 8 | 0xAA << 16
-buffer:set_fold_margin_hi_colour(1, 11184810) -- 0xAA | 0xAA << 8 | 0xAA << 16
+-- Fold Margin.
 buffer.margin_type_n[2] = c.SC_MARGIN_SYMBOL
 buffer.margin_width_n[2] = 10
 buffer.margin_mask_n[2] = c.SC_MASK_FOLDERS
 buffer.margin_sensitive_n[2] = true
+--buffer.margin_left =
+--buffer.margin_right =
+buffer:set_fold_margin_colour(1, 11184810) -- 0xAA | 0xAA << 8 | 0xAA << 16
+buffer:set_fold_margin_hi_colour(1, 11184810) -- 0xAA | 0xAA << 8 | 0xAA << 16
+
+-- Annotations.
+buffer.annotation_visible = 2
+
+-- Other.
+--buffer.buffered_draw = false
+--buffer.two_phase_draw = false
+
+-- Indentation Guides.
+buffer.indentation_guides = 1
 
--- Fold margin markers.
+-- Fold Margin Markers.
 buffer:marker_define(c.SC_MARKNUM_FOLDEROPEN, c.SC_MARK_ARROWDOWN)
 buffer:marker_set_fore(c.SC_MARKNUM_FOLDEROPEN, 0)
 buffer:marker_set_back(c.SC_MARKNUM_FOLDEROPEN, 0)
@@ -41,7 +90,30 @@ buffer:marker_define(c.SC_MARKNUM_FOLDEREND, c.SC_MARK_EMPTY)
 buffer:marker_define(c.SC_MARKNUM_FOLDEROPENMID, c.SC_MARK_EMPTY)
 buffer:marker_define(c.SC_MARKNUM_FOLDERMIDTAIL, c.SC_MARK_EMPTY)
 
--- Various.
+-- Autocompletion.
+--buffer.auto_c_cancel_at_start = false
+buffer.auto_c_choose_single = true
+--buffer.auto_c_auto_hide = false
+--buffer.auto_c_max_height =
+--buffer.auto_c_max_width =
+
+-- Call Tips.
 buffer.call_tip_use_style = 0
+
+-- Folding.
 buffer:set_fold_flags(16)
+
+-- Line Wrapping.
+--buffer.wrap_mode = 1
+--buffer.wrap_visual_flags = 1
+--buffer.wrap_visual_flags_location = 1
+--buffer.wrap_indent_mode = 1
+--buffer.wrap_start_indent =
+
+-- Long Lines.
+--buffer.edge_mode = 1
+--buffer.edge_column = 80
+--buffer.edge_colour = 11184810 -- 0xAA | 0xAA << 8 | 0xAA << 16
+
+-- Notifications.
 buffer.mod_event_mask = c.SC_MOD_CHANGEFOLD
diff --git a/themes/light/buffer.lua b/themes/light/buffer.lua
index 610d7f25..7f61ca33 100644..100755
--- a/themes/light/buffer.lua
+++ b/themes/light/buffer.lua
@@ -7,14 +7,9 @@ local buffer = buffer
 buffer.property['fold'] = '1'
 buffer.property['fold.by.indentation'] = '1'
 
--- Tabs and indentation.
+-- Tabs and Indentation.
 buffer.tab_width = 2
 buffer.use_tabs = false
 buffer.indent = 2
 buffer.tab_indents = true
 buffer.back_space_un_indents = true
-buffer.indentation_guides = 1
-
--- Various.
-buffer.auto_c_choose_single = true
-buffer.additional_selection_typing = true
diff --git a/themes/light/lexer.lua b/themes/light/lexer.lua
index a5a8c1c7..c639060a 100644
--- a/themes/light/lexer.lua
+++ b/themes/light/lexer.lua
@@ -1,6 +1,10 @@
 -- Copyright 2007-2010 Mitchell mitchell<att>caladbolg.net. See LICENSE.
 -- Light lexer theme for Textadept.
 
+-- Please note this theme is in a separate Lua state than Textadept's main one.
+-- This means the global variables like 'buffer', 'view', and 'gui' are not
+-- available here. Only the variables in the 'lexer' module are.
+
 module('lexer', package.seeall)
 
 colors = {
diff --git a/themes/light/view.lua b/themes/light/view.lua
index d69e9ad2..38bb62af 100644..100755
--- a/themes/light/view.lua
+++ b/themes/light/view.lua
@@ -4,31 +4,80 @@
 local c = _SCINTILLA.constants
 local buffer = buffer
 
--- Caret.
-buffer.caret_fore = 3355443 -- 0x33 | 0x33 << 8 | 0x33 << 16
-buffer.caret_line_visible = true
-buffer.caret_line_back = 14540253 -- 0xDD | 0xDD << 8 | 0xDD << 16
+-- Multiple Selection and Virtual Space
+buffer.multiple_selection = true
+buffer.additional_selection_typing = true
+--buffer.multi_paste = 1
+--buffer.virtual_space_options = 3
+--buffer.additional_sel_alpha =
+--buffer.additional_sel_fore =
+--buffer.additional_sel_back =
+--buffer.additional_caret_fore =
+--buffer.additional_carets_blink = false
+--buffer.additional_carets_visible = false
+
+-- Scrolling.
 buffer:set_x_caret_policy(1, 20) -- CARET_SLOP
 buffer:set_y_caret_policy(13, 1) -- CARET_SLOP | CARET_STRICT | CARET_EVEN
+--buffer:set_visible_policy()
+--buffer.h_scroll_bar = false
+--buffer.v_scroll_bar = false
+--buffer.x_offset =
+--buffer.scroll_width =
+--buffer.scroll_width_tracking = true
+--buffer.end_at_last_line = false
+
+-- Whitespace
+--buffer.view_ws = 1
+--buffer.whitespace_size =
+--buffer.extra_ascent =
+--buffer.extra_descent =
+
+-- Line Endings
+--buffer.view_eol = true
 
--- Selection.
+-- Caret and Selection Styles.
 buffer:set_sel_fore(1, 3355443) -- 0x33 | 0x33 << 8 | 0x33 << 16
 buffer:set_sel_back(1, 10066329) -- 0x99 | 0x99 << 8 | 0x99 << 16
+--buffer.sel_alpha =
+--buffer.sel_eol_filled = true
+buffer.caret_fore = 3355443 -- 0x33 | 0x33 << 8 | 0x33 << 16
+buffer.caret_line_visible = true
+buffer.caret_line_back = 14540253 -- 0xDD | 0xDD << 8 | 0xDD << 16
+--buffer.caret_line_back_alpha =
+--buffer.caret_period = 0
+--buffer.caret_style = 2
+--buffer.caret_width =
+--buffer.caret_sticky = 1
 
-buffer.margin_width_n[0] = 4 + 3 * -- line number margin
+-- Line Number Margin.
+buffer.margin_width_n[0] = 4 + 3 *
   buffer:text_width(c.STYLE_LINENUMBER, '9')
 
+-- Marker Margin.
 buffer.margin_width_n[1] = 0 -- marker margin invisible
 
--- Fold margin.
-buffer:set_fold_margin_colour(1, 13421772) -- 0xCC | 0xCC << 8 | 0xCC << 16
-buffer:set_fold_margin_hi_colour(1, 13421772) -- 0xCC | 0xCC << 8 | 0xCC << 16
+-- Fold Margin.
 buffer.margin_type_n[2] = c.SC_MARGIN_SYMBOL
 buffer.margin_width_n[2] = 10
 buffer.margin_mask_n[2] = c.SC_MASK_FOLDERS
 buffer.margin_sensitive_n[2] = true
+--buffer.margin_left =
+--buffer.margin_right =
+buffer:set_fold_margin_colour(1, 13421772) -- 0xCC | 0xCC << 8 | 0xCC << 16
+buffer:set_fold_margin_hi_colour(1, 13421772) -- 0xCC | 0xCC << 8 | 0xCC << 16
+
+-- Annotations.
+buffer.annotation_visible = 2
+
+-- Other.
+--buffer.buffered_draw = false
+--buffer.two_phase_draw = false
+
+-- Indentation Guides.
+buffer.indentation_guides = 1
 
--- Fold margin markers.
+-- Fold Margin Markers.
 buffer:marker_define(c.SC_MARKNUM_FOLDEROPEN, c.SC_MARK_ARROWDOWN)
 buffer:marker_set_fore(c.SC_MARKNUM_FOLDEROPEN, 0)
 buffer:marker_set_back(c.SC_MARKNUM_FOLDEROPEN, 0)
@@ -41,7 +90,30 @@ buffer:marker_define(c.SC_MARKNUM_FOLDEREND, c.SC_MARK_EMPTY)
 buffer:marker_define(c.SC_MARKNUM_FOLDEROPENMID, c.SC_MARK_EMPTY)
 buffer:marker_define(c.SC_MARKNUM_FOLDERMIDTAIL, c.SC_MARK_EMPTY)
 
--- Various.
+-- Autocompletion.
+--buffer.auto_c_cancel_at_start = false
+buffer.auto_c_choose_single = true
+--buffer.auto_c_auto_hide = false
+--buffer.auto_c_max_height =
+--buffer.auto_c_max_width =
+
+-- Call Tips.
 buffer.call_tip_use_style = 0
+
+-- Folding.
 buffer:set_fold_flags(16)
+
+-- Line Wrapping.
+--buffer.wrap_mode = 1
+--buffer.wrap_visual_flags = 1
+--buffer.wrap_visual_flags_location = 1
+--buffer.wrap_indent_mode = 1
+--buffer.wrap_start_indent =
+
+-- Long Lines.
+--buffer.edge_mode = 1
+--buffer.edge_column = 80
+--buffer.edge_colour = 3355443 -- 0x33 | 0x33 << 8 | 0x33 << 16
+
+-- Notifications.
 buffer.mod_event_mask = c.SC_MOD_CHANGEFOLD
diff --git a/themes/scite/buffer.lua b/themes/scite/buffer.lua
index d22dd934..9893d81f 100644..100755
--- a/themes/scite/buffer.lua
+++ b/themes/scite/buffer.lua
@@ -7,14 +7,9 @@ local buffer = buffer
 buffer.property['fold'] = '1'
 buffer.property['fold.by.indentation'] = '1'
 
--- Tabs and indentation.
+-- Tabs and Indentation.
 buffer.tab_width = 2
 buffer.use_tabs = false
 buffer.indent = 2
 buffer.tab_indents = true
 buffer.back_space_un_indents = true
-buffer.indentation_guides = 1
-
--- Various.
-buffer.auto_c_choose_single = true
-buffer.additional_selection_typing = true
diff --git a/themes/scite/lexer.lua b/themes/scite/lexer.lua
index 2e45a8b4..2614040b 100644
--- a/themes/scite/lexer.lua
+++ b/themes/scite/lexer.lua
@@ -1,9 +1,13 @@
 -- Copyright 2007-2010 Mitchell mitchell<att>caladbolg.net. See LICENSE.
 -- SciTE lexer theme for Textadept.
 
+-- Please note this theme is in a separate Lua state than Textadept's main one.
+-- This means the global variables like 'buffer', 'view', and 'gui' are not
+-- available here. Only the variables in the 'lexer' module are.
+
 module('lexer', package.seeall)
 
-lexer.colors = {
+colors = {
   green = color('00', '7F', '00'),
   blue = color('00', '00', '7F'),
   red = color('7F', '00', '00'),
diff --git a/themes/scite/view.lua b/themes/scite/view.lua
index 71b4be2f..e5a9d7c7 100644..100755
--- a/themes/scite/view.lua
+++ b/themes/scite/view.lua
@@ -4,17 +4,79 @@
 local c = _SCINTILLA.constants
 local buffer = buffer
 
+-- Multiple Selection and Virtual Space
+buffer.multiple_selection = true
+buffer.additional_selection_typing = true
+--buffer.multi_paste = 1
+--buffer.virtual_space_options = 3
+--buffer.additional_sel_alpha =
+--buffer.additional_sel_fore =
+--buffer.additional_sel_back =
+--buffer.additional_caret_fore =
+--buffer.additional_carets_blink = false
+--buffer.additional_carets_visible = false
+
+-- Scrolling.
+buffer:set_x_caret_policy(1, 20) -- CARET_SLOP
+buffer:set_y_caret_policy(13, 1) -- CARET_SLOP | CARET_STRICT | CARET_EVEN
+--buffer:set_visible_policy()
+--buffer.h_scroll_bar = false
+--buffer.v_scroll_bar = false
+--buffer.x_offset =
+--buffer.scroll_width =
+--buffer.scroll_width_tracking = true
+--buffer.end_at_last_line = false
+
+-- Whitespace
+--buffer.view_ws = 1
+--buffer.whitespace_size =
+--buffer.extra_ascent =
+--buffer.extra_descent =
+
+-- Line Endings
+--buffer.view_eol = true
+
+-- Caret and Selection Styles.
+--buffer:set_sel_fore()
+--buffer:set_sel_back()
+--buffer.sel_alpha =
+--buffer.sel_eol_filled = true
+--buffer.caret_fore =
+--buffer.caret_line_visible = true
+--buffer.caret_line_back =
+--buffer.caret_line_back_alpha =
+--buffer.caret_period = 0
+--buffer.caret_style = 2
+--buffer.caret_width =
+--buffer.caret_sticky = 1
+
+-- Line Number Margin.
 buffer.margin_width_n[0] = 4 * buffer:text_width(c.STYLE_LINENUMBER, "9")
 
-buffer.caret_period = 500
+-- Marker Margin.
+--buffer.margin_width_n[1] = 0
 
 -- Fold margin.
 buffer.margin_type_n[2] = c.SC_MARGIN_SYMBOL
 buffer.margin_width_n[2] = 16
 buffer.margin_mask_n[2] = c.SC_MASK_FOLDERS
 buffer.margin_sensitive_n[2] = true
+--buffer.margin_left =
+--buffer.margin_right =
+--buffer:set_fold_margin_colour()
+--buffer:set_fold_margin_hi_colour()
+
+-- Annotations.
+buffer.annotation_visible = 2
+
+-- Other.
+--buffer.buffered_draw = false
+--buffer.two_phase_draw = false
 
--- Fold margin markers.
+-- Indentation Guides.
+buffer.indentation_guides = 1
+
+-- Fold Margin Markers.
 buffer:marker_define(c.SC_MARKNUM_FOLDEROPEN, c.SC_MARK_MINUS)
 buffer:marker_set_fore(c.SC_MARKNUM_FOLDEROPEN, 16777215)
 buffer:marker_set_back(c.SC_MARKNUM_FOLDEROPEN, 0)
@@ -26,4 +88,31 @@ buffer:marker_define(c.SC_MARKNUM_FOLDERTAIL, c.SC_MARK_EMPTY)
 buffer:marker_define(c.SC_MARKNUM_FOLDEREND, c.SC_MARK_EMPTY)
 buffer:marker_define(c.SC_MARKNUM_FOLDEROPENMID, c.SC_MARK_EMPTY)
 buffer:marker_define(c.SC_MARKNUM_FOLDERMIDTAIL, c.SC_MARK_EMPTY)
+
+-- Autocompletion.
+--buffer.auto_c_cancel_at_start = false
+buffer.auto_c_choose_single = true
+--buffer.auto_c_auto_hide = false
+--buffer.auto_c_max_height =
+--buffer.auto_c_max_width =
+
+-- Call Tips.
+buffer.call_tip_use_style = 0
+
+-- Folding.
 buffer:set_fold_flags(16)
+
+-- Line Wrapping.
+--buffer.wrap_mode = 1
+--buffer.wrap_visual_flags = 1
+--buffer.wrap_visual_flags_location = 1
+--buffer.wrap_indent_mode = 1
+--buffer.wrap_start_indent =
+
+-- Long Lines.
+--buffer.edge_mode = 1
+--buffer.edge_column = 80
+--buffer.edge_colour =
+
+-- Notifications.
+buffer.mod_event_mask = c.SC_MOD_CHANGEFOLD