Ticket #3065: mc-3065-italic.patch

doc/man/mc.1.in

@@ -3609 +3609 @@
 base_color=normal=white,default:marked=magenta,default
 .fi
 .PP
-Attributes can be any of bold, underline, reverse and blink, appended by a
+Attributes can be any of bold, italic, underline, reverse and blink, appended by a
 plus sign if more than one are desired.  The special word "none" means no
 attributes, without attempting to fall back to base_color.  Example:
 .PP

doc/man/mcedit.1.in

@@ -439 +439 @@
 .B cooledit
 colors.
 .PP
-Attributes can be any of bold, underline, reverse and blink, appended by a
+Attributes can be any of bold, italic, underline, reverse and blink, appended by a
 plus sign if more than one are desired.
 .PP
 Comments may be put on a separate line starting with the hash sign (#).

doc/man/ru/mc.1.in

@@ -3999 +3999 @@
 base_color=normal=white,default:marked=magenta,default
 .fi
 .PP
-Атрибуты обозначаются словами "bold", "underline", "reverse" и "blink".
+Атрибуты обозначаются словами "bold", "italic", "underline", "reverse" и "blink".
 Чтобы использовать несколько атрибутов, их надо перечислить через символ "+".
 The special word "none" menas no attributes, without attempting to fall back
 to base_color. Пример:

lib/tty/color-internal.c

@@ -83 +83 @@
 
 mc_tty_color_table_t const attributes_table[] = {
     {"bold", A_BOLD},
+#ifdef A_ITALIC                 /* available since ncurses-5.9-20130831 / slang-pre2.3.0-107 */
+    {"italic", A_ITALIC},
+#endif /* A_ITALIC */
     {"underline", A_UNDERLINE},
     {"reverse", A_REVERSE},
     {"blink", A_BLINK},

lib/tty/color-slang.h

@@ -11 +11 @@
 /*** typedefs(not structures) and defined constants **********************************************/
 
 /* When using Slang with color, we have all the indexes free but
- * those defined here (A_BOLD, A_UNDERLINE, A_REVERSE, A_BLINK)
+ * those defined here (A_BOLD, A_ITALIC, A_UNDERLINE, A_REVERSE, A_BLINK)
  */
 
 #ifndef A_BOLD
 #define A_BOLD SLTT_BOLD_MASK
 #endif /* A_BOLD */
+#ifdef SLTT_ITALIC_MASK         /* available since slang-pre2.3.0-107 */
+#ifndef A_ITALIC
+#define A_ITALIC SLTT_ITALIC_MASK
+#endif /* A_ITALIC */
+#endif /* SLTT_ITALIC_MASK */
 #ifndef A_UNDERLINE
 #define A_UNDERLINE SLTT_ULINE_MASK
 #endif /* A_UNDERLINE */

misc/skins/sand256.ini

@@ -47 +47 @@
 #
 # Following the foreground and background colors, the third (optional) value
 # can specify special attributes to enable. Valid values are bold, underline,
-# reverse and blink. Append more with a plus sign, e.g. "underline+bold".
+# italic, reverse and blink. Append more with a plus sign, e.g. "bold+italic".
 # Leaving the field empty makes it fall back to the attributes of _default_.
 # Use any other word (e.g. "none") to prevent fallback and disable all flags.
+#
+# Italic support requires a recent enough ncurses (>= 5.9.20130831) or slang
+# (>= 2.3). All attributes are subject to support by the terminal emulator.
 
 [skin]
     description = Sand skin using 256 colors
@@ -81 +84 @@
 [core]
     _default_ = black;rgb554
     selected = ;rgb452
-    marked = rgb400
-    markselect = rgb400;rgb452
+    marked = rgb400;;italic
+    markselect = rgb400;rgb452;italic
     gauge = ;rgb452
     input = ;rgb452
     inputunchanged = gray;rgb452
@@ -90 +93 @@
     disabled = gray;rgb553
     reverse = ;rgb452
     commandlinemark = white;gray
-    header = red
+    header = red;;italic
 
 [dialog]
     _default_ = black;rgb553
     dfocus = ;rgb452
     dhotnormal = ;;underline
     dhotfocus = ;rgb452;underline
-    dtitle = ;;underline
+    dtitle = ;;italic+underline
 
 [error]
     _default_ = rgb554;rgb320;bold
@@ -105 +108 @@
     errdfocus = rgb000;rgb452;bold
     errdhotnormal = ;;bold+underline
     errdhotfocus = rgb000;rgb452;bold+underline
-    errdtitle = ;;bold+underline
+    errdtitle = ;;bold+italic+underline
 
 [filehighlight]
     directory =
@@ -126 +129 @@
     database = rgb421
 
 [menu]
-    _default_ = black;rgb452
+    _default_ = black;rgb452;italic
     menusel = ;rgb551
-    menuhot = ;;underline
-    menuhotsel = ;rgb551;underline
+    menuhot = ;;italic+underline
+    menuhotsel = ;rgb551;italic+underline
     menuinactive =
 
 [popupmenu]
     _default_ = black;rgb553
     menusel = ;rgb452;underline
-    menutitle = ;;underline
+    menutitle = ;;italic+underline
 
 [buttonbar]
-    hotkey = black;rgb554
-    button = black;rgb452
+    hotkey = black;rgb554;italic
+    button = black;rgb452;italic
 
 [statusbar]
-    _default_ = black;rgb452
+    _default_ = black;rgb452;italic
 
 [help]
     _default_ = black;rgb553
-    helpitalic = green
-    helpbold = red
+    helpitalic = green;;italic
+    helpbold = red;;bold
     helplink = blue;;underline
     helpslink = blue;;reverse
     helptitle = ;;underline
@@ -155 +158 @@
 [editor]
     _default_ = black;rgb554
     editbold = rgb400
-    editmarked = ;rgb452
+    editmarked = ;rgb452;italic
     editwhitespace = rgb400;rgb553
     editlinestate = ;rgb553
     bookmark = ;rgb551

src/args.c

@@ -369 +369 @@
                                                     "Extended colors, when 256 colors are available:\n"
                                                     "   color16 to color255, or rgb000 to rgb555 and gray0 to gray23\n\n"
                                                     "Attributes:\n"
-                                                    "   bold, underline, reverse, blink; append more with '+'\n")
+                                                    "   bold, italic, underline, reverse, blink; append more with '+'\n")
                                                     );
 /* *INDENT-ON* */