Updated properties based on Scinterm updates.

Requires Scinterm r118 (changeset 8a7943225c5a).

2 files changed, 45 insertions, 55 deletions

diff --git a/doc/manual.md b/doc/manual.md
index 4684449e..8613b0c0 100644
--- a/doc/manual.md
+++ b/doc/manual.md
@@ -1783,26 +1783,23 @@ As a special case, the empty capture `()` captures the current string position
 ## Curses Compatibility
 
 Textadept 5.5 beta introduced a curses version that is capable of running in a
-terminal emulator. However, it lacks some GUI features due to curses'
-non-existant graphics capabilities:
+terminal emulator. However, it lacks some GUI features due to the terminal's
+constraints:
 
 * No alpha values or transparency.
 * No images in autocompletion lists. Instead, autocompletion lists show the
   first character in the string passed to [`buffer.register_image()`][].
 * No buffered or two-phase drawing.
-* No arrows on call tips.
 * Carets cannot have a period, line style, or width.
 * No drag and drop.
 * Edge lines may be obscured by text.
-* Extra line ascent or descent renders improperly.
-* No fold lines.
+* No extra line ascent or descent.
+* No fold lines above and below lines.
 * No hotspot underlines on mouse hover.
-* No indentation guides.
 * No indicators other than `INDIC_ROUNDBOX` and `INDIC_STRAIGHTBOX`, although
   neither has translucent drawing and `INDIC_ROUNDBOX` does not have rounded
   corners.
-* When scrolling to the right, long lines overwrite margins.
-* No marker symbols other than `MARK_CHARACTER`.
+* Some complex marker symbols are not drawn properly or at all.
 * No mouse cursor types.
 * Only up to 16 colors recognized, regardless of how many colors the terminal
   supports. They are: black (`0x000000`), red (`0x800000`), green (`0x008000`),
@@ -1814,11 +1811,8 @@ non-existant graphics capabilities:
   use these color values. Your terminal will remap them automatically.
   Unrecognized colors default to white. For some terminals, you may need to set
   a lexer style's `bold` attribute to use the light color variant.
-* No scroll bars.
 * Not all key sequences recognized properly.
 * No style settings like font name, font size, or italics.
-* No tab character arrows when viewing whitespace.
-* No visual wrap flags.
 * No X selection, primary or secondary, integration with the clipboard.
 * No zoom.
 
diff --git a/properties.lua b/properties.lua
index 020c1a03..972748bf 100644
--- a/properties.lua
+++ b/properties.lua
@@ -18,7 +18,7 @@ buffer:set_x_caret_policy(buffer.CARET_SLOP, 20)
 buffer:set_y_caret_policy(buffer.CARET_SLOP + buffer.CARET_STRICT +
                           buffer.CARET_EVEN, 1)
 --buffer:set_visible_policy()
---buffer.h_scroll_bar = false
+--buffer.h_scroll_bar = CURSES
 --buffer.v_scroll_bar = false
 --buffer.scroll_width =
 --buffer.scroll_width_tracking = true
@@ -75,51 +75,47 @@ buffer.use_tabs = false
 --buffer.indent = 2
 buffer.tab_indents = true
 buffer.back_space_un_indents = true
-buffer.indentation_guides = buffer.IV_LOOKBOTH
+buffer.indentation_guides = not CURSES and buffer.IV_LOOKBOTH or buffer.IV_NONE
 
 -- Margin Markers.
-local symbol = not CURSES and buffer.MARK_FULLRECT or
-               buffer.MARK_CHARACTER + string.byte(' ')
-buffer:marker_define(textadept.bookmarks.MARK_BOOKMARK, symbol)
-buffer:marker_define(textadept.run.MARK_WARNING, symbol)
-buffer:marker_define(textadept.run.MARK_ERROR, symbol)
-if not CURSES then
-  -- Arrow Folding Symbols.
---  buffer:marker_define(buffer.MARKNUM_FOLDEROPEN, buffer.MARK_ARROWDOWN)
---  buffer:marker_define(buffer.MARKNUM_FOLDER, buffer.MARK_ARROW)
---  buffer:marker_define(buffer.MARKNUM_FOLDERSUB, buffer.MARK_EMPTY)
---  buffer:marker_define(buffer.MARKNUM_FOLDERTAIL, buffer.MARK_EMPTY)
---  buffer:marker_define(buffer.MARKNUM_FOLDEREND, buffer.MARK_EMPTY)
---  buffer:marker_define(buffer.MARKNUM_FOLDEROPENMID, buffer.MARK_EMPTY)
---  buffer:marker_define(buffer.MARKNUM_FOLDERMIDTAIL, buffer.MARK_EMPTY)
-  -- Plus/Minus Folding Symbols.
---  buffer:marker_define(buffer.MARKNUM_FOLDEROPEN, buffer.MARK_MINUS)
---  buffer:marker_define(buffer.MARKNUM_FOLDER, buffer.MARK_PLUS)
---  buffer:marker_define(buffer.MARKNUM_FOLDERSUB, buffer.MARK_EMPTY)
---  buffer:marker_define(buffer.MARKNUM_FOLDERTAIL, buffer.MARK_EMPTY)
---  buffer:marker_define(buffer.MARKNUM_FOLDEREND, buffer.MARK_EMPTY)
---  buffer:marker_define(buffer.MARKNUM_FOLDEROPENMID, buffer.MARK_EMPTY)
---  buffer:marker_define(buffer.MARKNUM_FOLDERMIDTAIL, buffer.MARK_EMPTY)
-  -- Circle Tree Folding Symbols.
---  buffer:marker_define(buffer.MARKNUM_FOLDEROPEN, buffer.MARK_CIRCLEMINUS)
---  buffer:marker_define(buffer.MARKNUM_FOLDER, buffer.MARK_CIRCLEPLUS)
---  buffer:marker_define(buffer.MARKNUM_FOLDERSUB, buffer.MARK_VLINE)
---  buffer:marker_define(buffer.MARKNUM_FOLDERTAIL, buffer.MARK_LCORNERCURVE)
---  buffer:marker_define(buffer.MARKNUM_FOLDEREND,
---                       buffer.MARK_CIRCLEPLUSCONNECTED)
---  buffer:marker_define(buffer.MARKNUM_FOLDEROPENMID,
---                       buffer.MARK_CIRCLEMINUSCONNECTED)
---  buffer:marker_define(buffer.MARKNUM_FOLDERMIDTAIL, buffer.MARK_TCORNERCURVE)
-  -- Box Tree Folding Symbols.
-  buffer:marker_define(buffer.MARKNUM_FOLDEROPEN, buffer.MARK_BOXMINUS)
-  buffer:marker_define(buffer.MARKNUM_FOLDER, buffer.MARK_BOXPLUS)
-  buffer:marker_define(buffer.MARKNUM_FOLDERSUB, buffer.MARK_VLINE)
-  buffer:marker_define(buffer.MARKNUM_FOLDERTAIL, buffer.MARK_LCORNER)
-  buffer:marker_define(buffer.MARKNUM_FOLDEREND, buffer.MARK_BOXPLUSCONNECTED)
-  buffer:marker_define(buffer.MARKNUM_FOLDEROPENMID,
-                       buffer.MARK_BOXMINUSCONNECTED)
-  buffer:marker_define(buffer.MARKNUM_FOLDERMIDTAIL, buffer.MARK_TCORNER)
-end
+buffer:marker_define(textadept.bookmarks.MARK_BOOKMARK, buffer.MARK_FULLRECT)
+buffer:marker_define(textadept.run.MARK_WARNING, buffer.MARK_FULLRECT)
+buffer:marker_define(textadept.run.MARK_ERROR, buffer.MARK_FULLRECT)
+-- Arrow Folding Symbols.
+--buffer:marker_define(buffer.MARKNUM_FOLDEROPEN, buffer.MARK_ARROWDOWN)
+--buffer:marker_define(buffer.MARKNUM_FOLDER, buffer.MARK_ARROW)
+--buffer:marker_define(buffer.MARKNUM_FOLDERSUB, buffer.MARK_EMPTY)
+--buffer:marker_define(buffer.MARKNUM_FOLDERTAIL, buffer.MARK_EMPTY)
+--buffer:marker_define(buffer.MARKNUM_FOLDEREND, buffer.MARK_EMPTY)
+--buffer:marker_define(buffer.MARKNUM_FOLDEROPENMID, buffer.MARK_EMPTY)
+--buffer:marker_define(buffer.MARKNUM_FOLDERMIDTAIL, buffer.MARK_EMPTY)
+-- Plus/Minus Folding Symbols.
+--buffer:marker_define(buffer.MARKNUM_FOLDEROPEN, buffer.MARK_MINUS)
+--buffer:marker_define(buffer.MARKNUM_FOLDER, buffer.MARK_PLUS)
+--buffer:marker_define(buffer.MARKNUM_FOLDERSUB, buffer.MARK_EMPTY)
+--buffer:marker_define(buffer.MARKNUM_FOLDERTAIL, buffer.MARK_EMPTY)
+--buffer:marker_define(buffer.MARKNUM_FOLDEREND, buffer.MARK_EMPTY)
+--buffer:marker_define(buffer.MARKNUM_FOLDEROPENMID, buffer.MARK_EMPTY)
+--buffer:marker_define(buffer.MARKNUM_FOLDERMIDTAIL, buffer.MARK_EMPTY)
+-- Circle Tree Folding Symbols.
+--buffer:marker_define(buffer.MARKNUM_FOLDEROPEN, buffer.MARK_CIRCLEMINUS)
+--buffer:marker_define(buffer.MARKNUM_FOLDER, buffer.MARK_CIRCLEPLUS)
+--buffer:marker_define(buffer.MARKNUM_FOLDERSUB, buffer.MARK_VLINE)
+--buffer:marker_define(buffer.MARKNUM_FOLDERTAIL, buffer.MARK_LCORNERCURVE)
+--buffer:marker_define(buffer.MARKNUM_FOLDEREND,
+--                     buffer.MARK_CIRCLEPLUSCONNECTED)
+--buffer:marker_define(buffer.MARKNUM_FOLDEROPENMID,
+--                     buffer.MARK_CIRCLEMINUSCONNECTED)
+--buffer:marker_define(buffer.MARKNUM_FOLDERMIDTAIL, buffer.MARK_TCORNERCURVE)
+-- Box Tree Folding Symbols.
+buffer:marker_define(buffer.MARKNUM_FOLDEROPEN, buffer.MARK_BOXMINUS)
+buffer:marker_define(buffer.MARKNUM_FOLDER, buffer.MARK_BOXPLUS)
+buffer:marker_define(buffer.MARKNUM_FOLDERSUB, buffer.MARK_VLINE)
+buffer:marker_define(buffer.MARKNUM_FOLDERTAIL, buffer.MARK_LCORNER)
+buffer:marker_define(buffer.MARKNUM_FOLDEREND, buffer.MARK_BOXPLUSCONNECTED)
+buffer:marker_define(buffer.MARKNUM_FOLDEROPENMID,
+                     buffer.MARK_BOXMINUSCONNECTED)
+buffer:marker_define(buffer.MARKNUM_FOLDERMIDTAIL, buffer.MARK_TCORNER)
 --buffer:marker_enable_highlight(true)
 
 -- Indicators.