diff options
| -rw-r--r-- | doc/manual.md | 19 | ||||
| -rw-r--r-- | modules/lua/ta_api | 5 | ||||
| -rw-r--r-- | modules/lua/ta_tags | 3 | ||||
| -rw-r--r-- | src/Makefile | 2 |
4 files changed, 6 insertions, 23 deletions
diff --git a/doc/manual.md b/doc/manual.md index a0fb9181..be7aebf1 100644 --- a/doc/manual.md +++ b/doc/manual.md @@ -1393,25 +1393,6 @@ A theme consists of a single Lua file, and is typically responsible for: [colors]: api.html#lexer.colors [text display settings]: api.html#lexer.styles -**Note:** the terminal version only recognizes up to 16 color values, regardless -of how many colors your terminal actually supports. (Your terminal emulator's -settings determine how to actually display these standard color values, which -may end up being completely different in practice.) For some terminals, you may -need to set a lexer style's `bold` attribute with the normal color in order to -use the light color variant. The color values the terminal version recognizes -are as follows: - -Value |Common Color| Value |Common Color ---------|------------|--------|------------ -0x000000|Black |0x404040|Light black -0x000080|Red |0x0000FF|Light red -0x008000|Green |0x00FF00|Light green -0x008080|Yellow |0x00FFFF|Light yellow -0x800000|Blue |0xFF0000|Light blue -0x800080|Magenta |0xFF00FF|Light magenta -0x808000|Cyan |0xFFFF00|Light cyan -0xC0C0C0|White |0xFFFFFF|Light white - Textadept attempts to load, in order, a given theme from the following locations: diff --git a/modules/lua/ta_api b/modules/lua/ta_api index 8b8e51dc..93576dfc 100644 --- a/modules/lua/ta_api +++ b/modules/lua/ta_api @@ -331,6 +331,7 @@ _USERHOME _G._USERHOME (string)\nThe path to the user's *~/.textadept/* director _VIEWS _G._VIEWS (table)\nTable of all views in Textadept.\nNumeric keys have view values and view keys have their associated numeric\nkeys.\n@see _G.view _print ui._print(buffer_type, ...)\nPrints the given string messages to the buffer of string type *buffer_type*.\nOpens a new buffer for printing messages to if necessary. If the message\nbuffer is already open in a view, the message is printed to that view.\nOtherwise the view is split (unless `ui.tabs` is `true`) and the message\nbuffer is displayed before being printed to.\n@param buffer_type String type of message buffer.\n@param ... Message strings.\n@usage ui._print(_L['[Message Buffer]'], message) abspath lfs.abspath(filename, prefix)\nReturns the absolute path to string *filename*.\n*prefix* or `lfs.currentdir()` is prepended to a relative filename. The\nreturned path is not guaranteed to exist.\n@param filename The relative or absolute path to a file.\n@param prefix Optional prefix path prepended to a relative filename.\n@return string absolute path +active ui.command_entry.active (boolean)\nWhether or not the command entry is active. add_dic spellchecker:add_dic(dic)\nAdds words from dictionary file path *dic* to the spellchecker.\n@param dic Path to the Hunspell dictionary file to load. add_fold_point lexer.add_fold_point(lexer, token_name, start_symbol, end_symbol)\nAdds to lexer *lexer* a fold point whose beginning and end tokens are string\n*token_name* tokens with string content *start_symbol* and *end_symbol*,\nrespectively.\nIn the event that *start_symbol* may or may not be a fold point depending on\ncontext, and that additional processing is required, *end_symbol* may be a\nfunction that ultimately returns `1` (indicating a beginning fold point),\n`-1` (indicating an ending fold point), or `0` (indicating no fold point).\nThat function is passed the following arguments:\n\n * `text`: The text being processed for fold points.\n * `pos`: The position in *text* of the beginning of the line currently\n being processed.\n * `line`: The text of the line currently being processed.\n * `s`: The position of *start_symbol* in *line*.\n * `symbol`: *start_symbol* itself.\n@param lexer The lexer to add a fold point to.\n@param token_name The token name of text that indicates a fold point.\n@param start_symbol The text that indicates the beginning of a fold point.\n@param end_symbol Either the text that indicates the end of a fold point, or\n a function that returns whether or not *start_symbol* is a beginning fold\n point (1), an ending fold point (-1), or not a fold point at all (0).\n@usage lex:add_fold_point(lexer.OPERATOR, '{', '}')\n@usage lex:add_fold_point(lexer.KEYWORD, 'if', 'end')\n@usage lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('#'))\n@usage lex:add_fold_point('custom', function(text, pos, line, s, symbol)\n ... end) add_rule lexer.add_rule(lexer, id, rule)\nAdds pattern *rule* identified by string *id* to the ordered list of rules\nfor lexer *lexer*.\n@param lexer The lexer to add the given rule to.\n@param id The id associated with this rule. It does not have to be the same\n as the name passed to `token()`.\n@param rule The LPeg pattern of the rule.\n@see modify_rule @@ -462,7 +463,7 @@ close spawn_proc:close()\nCloses standard input for process *spawn_proc*, effect close_all_buffers io.close_all_buffers()\nCloses all open buffers, prompting the user to continue if there are unsaved\nbuffers, and returns `true` if the user did not cancel.\nNo buffers are saved automatically. They must be saved manually.\n@return `true` if user did not cancel; `nil` otherwise.\n@see buffer.close cntrl lexer.cntrl (pattern)\nA pattern that matches any control character (ASCII codes 0 to 31). colorize buffer.colorize(buffer, start_pos, end_pos)\nInstructs the lexer to style and mark fold points in the range of text\nbetween *start_pos* and *end_pos*.\nIf *end_pos* is `-1`, styles and marks to the end of the buffer.\n@param buffer A buffer.\n@param start_pos The start position of the range of text in *buffer* to\n process.\n@param end_pos The end position of the range of text in *buffer* to process,\n or `-1` to process from *start_pos* to the end of *buffer*. -colors lexer.colors (table)\nMap of color names strings to color values in `0xBBGGRR` or `"#RRGGBB"`\nformat. +colors lexer.colors (table)\nMap of color name strings to color values in `0xBBGGRR` or `"#RRGGBB"`\nformat.\nNote: for applications running within a terminal emulator, only 16 color\nvalues are recognized, regardless of how many colors a user's terminal\nactually supports. (A terminal emulator's settings determines how to actually\ndisplay these recognized color values, which may end up being mapped to a\ncompletely different color set.) In order to use the light variant of a\ncolor, some terminals require a style's `bold` attribute must be set along\nwith that normal color. Recognized color values are black (0x000000), red\n(0x000080), green (0x008000), yellow (0x008080), blue (0x800000), magenta\n(0x800080), cyan (0x808000), white (0xC0C0C0), light black (0x404040), light\nred (0x0000FF), light green (0x00FF00), light yellow (0x00FFFF), light blue\n(0xFF0000), light magenta (0xFF00FF), light cyan (0xFFFF00), and light white\n(0xFFFFFF). colorselect ui.dialogs.colorselect(options)\nPrompts the user with a color selection dialog defined by dialog options\ntable *options*, returning the color selected.\nIf the user canceled the dialog, returns `nil`.\n@param options Table of key-value option pairs for the option select dialog.\n\n * `title`: The dialog's title text.\n * `color`: The initially selected color as either a number in "0xBBGGRR"\n format, or as a string in "#RRGGBB" format.\n * `palette`: The list of colors to show in the dialog's color palette.\n Up to 20 colors can be specified as either numbers in "0xBBGGRR" format\n or as strings in "#RRGGBB" format. If `true` (no list was given), a\n default palette is shown.\n * `string_output`: Return the selected color in string "#RRGGBB" format\n instead of numeric "0xBBGGRR" format. The default value is `false`.\n * `float`: Show the dialog on top of all desktop windows. The default value\n is `false`.\n@usage ui.dialogs.colorselect{title = 'Foreground color', color = 0x000000,\n palette = {'#000000', 0x0000FF, '#00FF00', 0xFF0000}}\n@return selected color column buffer.column (table, Read-only)\nTable of column numbers (taking tab widths into account) per position.\nMulti-byte characters count as single characters. command_entry ui.command_entry (module)\nTextadept's Command Entry.\nIt supports multiple modes that each have their own functionality (such as\nrunning Lua code and filtering text through shell commands) and history. @@ -497,7 +498,7 @@ cycle_history_next lua_repl.cycle_history_next()\nCycle forward through command cycle_history_prev lua_repl.cycle_history_prev()\nCycle backward through command history, taking into account commands with\nmultiple lines. debugger _G.debugger (module)\n[Experimental]\nLanguage debugging support.\n\nAll this module does is emit debugger events. Submodules that implement\ndebuggers listen for these events and act on them.\n\nThis module is not loaded by default. `require('debugger')` must be called\nfrom *~/.textadept/init.lua*. dec_num lexer.dec_num (pattern)\nA pattern that matches a decimal number. -default_filter lfs.default_filter (table)\nThe filter table containing common binary file extensions and version control\ndirectories to exclude when iterating over files and directories using\n`walk`.\n@see walk +default_filter lfs.default_filter (table)\nThe filter table containing common binary file extensions and version control\ndirectories to exclude when iterating over files and directories using\n`walk`.\nExtensions excluded: a, bmp, bz2, class, dll, exe, gif, gz, jar, jpeg, jpg,\no, pdf, png, so, tar, tgz, tif, tiff, xz, and zip.\nDirectories excluded: .bzr, .git, .hg, .svn, _FOSSIL_, and node_modules.\n@see walk del_line_left buffer.del_line_left(buffer)\nDeletes the range of text from the caret to the beginning of the current\nline.\n@param buffer A buffer. del_line_right buffer.del_line_right(buffer)\nDeletes the range of text from the caret to the end of the current line.\n@param buffer A buffer. del_word_left buffer.del_word_left(buffer)\nDeletes the word to the left of the caret, including any leading non-word\ncharacters.\n`buffer.word_chars` contains the set of characters that constitute words.\n@param buffer A buffer. diff --git a/modules/lua/ta_tags b/modules/lua/ta_tags index 82fe53ee..201429d5 100644 --- a/modules/lua/ta_tags +++ b/modules/lua/ta_tags @@ -339,6 +339,7 @@ _USERHOME _HOME/core/init.lua /^module('_G')]]$/;" F _VIEWS _HOME/core/init.lua /^local _VIEWS$/;" t _print _HOME/core/ui.lua /^function ui._print(buffer_type, ...)$/;" f class:ui abspath _HOME/core/lfs_ext.lua /^function lfs.abspath(filename, prefix)$/;" f class:lfs +active _HOME/modules/textadept/command_entry.lua /^module('ui.command_entry')]]$/;" F class:ui.command_entry add_dic _HOME/modules/spellcheck/init.lua /^function spellchecker:add_dic(dic) end$/;" f class:spellchecker add_fold_point _HOME/lexers/lexer.lua /^function M.add_fold_point(lexer, token_name, start_symbol, end_symbol)$/;" f class:lexer add_rule _HOME/lexers/lexer.lua /^function M.add_rule(lexer, id, rule)$/;" f class:lexer @@ -507,7 +508,7 @@ debugger _HOME/modules/debugger/init.lua /^module('debugger')]]$/;" m debugger.ansi_c _HOME/modules/debugger/ansi_c/init.lua /^module('debugger.ansi_c')]]$/;" m debugger.lua _HOME/modules/debugger/lua/init.lua /^module('debugger.lua')]]$/;" m dec_num _HOME/lexers/lexer.lua /^module('lexer')]=]$/;" F class:lexer -default_filter _HOME/core/lfs_ext.lua /^lfs.default_filter = {$/;" t class:lfs +default_filter _HOME/core/lfs_ext.lua /^lfs.default_filter = {--[[Extensions]]'!.a','!.bmp','!.bz2','!.class','!.dll','!.exe','!.gif','!.gz','!.jar','!.jpeg','!.jpg','!.o','!.pdf','!.png','!.so','!.tar','!.tgz','!.tif','!.tiff','!.xz','!.zip',--[[Directories]]'!/%.bzr$','!/%.git$','!/%.hg$','!/%.svn$','!/_FOSSIL_$','!/node_modules$'}$/;" t class:lfs del_line_left _HOME/core/.buffer.luadoc /^function del_line_left(buffer) end$/;" f class:buffer del_line_right _HOME/core/.buffer.luadoc /^function del_line_right(buffer) end$/;" f class:buffer del_word_left _HOME/core/.buffer.luadoc /^function del_word_left(buffer) end$/;" f class:buffer diff --git a/src/Makefile b/src/Makefile index 3b685428..952b834f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -376,7 +376,7 @@ else gtdialog_url = http://foicica.com/hg/gtdialog/archive/tip.zip endif -scintilla_zip = 9e79ba3e1394.zip +scintilla_zip = ce12cbc5af8e.zip lua_tgz = lua-5.3.5.tar.gz lpeg_tgz = lpeg-1.0.2.tar.gz lfs_zip = v1_7_0_2.zip |