git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Simon Courtois <scourtois@cubyx.fr>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 6/7] color: support "italic" attribute
Date: Thu, 23 Jun 2016 13:39:07 -0400	[thread overview]
Message-ID: <20160623173907.GF15774@sigill.intra.peff.net> (raw)
In-Reply-To: <20160623173048.GA19923@sigill.intra.peff.net>

We already support bold, underline, and similar attributes.
Let's add italic to the mix.  According to the Wikipedia
page on ANSI colors, this attribute is "not widely
supported", but it does seem to work on my xterm.

We don't have to bump the maximum color size because we were
already over-allocating it (but we do adjust the comment
appropriately).

Requested-by: Simon Courtois <scourtois@cubyx.fr>
Signed-off-by: Jeff King <peff@peff.net>
---
 Documentation/config.txt | 9 +++++----
 color.c                  | 1 +
 color.h                  | 3 ++-
 t/t4026-color.sh         | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4b13c90..c7818ff 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -163,10 +163,11 @@ Colors may also be given as numbers between 0 and 255; these use ANSI
 your terminal supports it, you may also specify 24-bit RGB values as
 hex, like `#ff0ab3`.
 +
-The accepted attributes are `bold`, `dim`, `ul`, `blink`, and `reverse`.
-The position of any attributes with respect to the colors (before, after,
-or in between), doesn't matter. Specific attributes may be turned off
-by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc).
+The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, and
+`italic`.  The position of any attributes with respect to the colors
+(before, after, or in between), doesn't matter. Specific attributes may
+be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
+`no-ul`, etc).
 +
 For git's pre-defined color slots, the attributes are meant to be reset
 at the beginning of each item in the colored output. So setting
diff --git a/color.c b/color.c
index a02a935..dcfaea8 100644
--- a/color.c
+++ b/color.c
@@ -133,6 +133,7 @@ static int parse_attr(const char *name, size_t len)
 #define ATTR(x, val, neg) { (x), strlen(x), (val), (neg) }
 		ATTR("bold",      1, 22),
 		ATTR("dim",       2, 22),
+		ATTR("italic",    3, 23),
 		ATTR("ul",        4, 24),
 		ATTR("blink",     5, 25),
 		ATTR("reverse",   7, 27)
diff --git a/color.h b/color.h
index e24fa0b..3af01a6 100644
--- a/color.h
+++ b/color.h
@@ -16,7 +16,8 @@ struct strbuf;
  *
  * The space for attributes is also slightly overallocated, as
  * the negation for some attributes is the same (e.g., nobold and nodim).
- * We also allocate space for 6 attributes (even though we have only 5).
+ *
+ * We allocate space for 6 attributes.
  */
 #define COLOR_MAXLEN 70
 
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 2065752..13690f7 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -60,8 +60,9 @@ test_expect_success 'long color specification' '
 
 test_expect_success 'absurdly long color specification' '
 	color \
-	  "#ffffff #ffffff bold nobold dim nodim ul noul blink noblink reverse noreverse" \
-	  "[1;2;4;5;7;22;24;25;27;38;2;255;255;255;48;2;255;255;255m"
+	  "#ffffff #ffffff bold nobold dim nodim italic noitalic
+	   ul noul blink noblink reverse noreverse" \
+	  "[1;2;3;4;5;7;22;23;24;25;27;38;2;255;255;255;48;2;255;255;255m"
 '
 
 test_expect_success '0-7 are aliases for basic ANSI color names' '
-- 
2.9.0.209.g845fbc1


  parent reply	other threads:[~2016-06-23 17:39 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-23 11:54 Italics formatting Simon Courtois
2016-06-23 13:08 ` [PATCH 0/2] more ANSI attributes Jeff King
2016-06-23 13:09   ` [PATCH 1/2] color: fix max-size comment Jeff King
2016-06-23 13:10   ` [PATCH 2/2] color: support "italic" attribute Jeff King
2016-06-23 13:57     ` Simon Courtois
2016-06-23 16:46     ` Junio C Hamano
2016-06-23 16:47       ` Jeff King
2016-06-23 17:30   ` [PATCH v2 0/7] more ANSI attributes Jeff King
2016-06-23 17:31     ` [PATCH v2 1/7] color: fix max-size comment Jeff King
2016-06-23 17:32     ` [PATCH v2 2/7] doc: refactor description of color format Jeff King
2016-06-23 17:33     ` [PATCH v2 3/7] add skip_prefix_mem helper Jeff King
2016-06-23 17:38     ` [PATCH v2 4/7] color: refactor parse_attr Jeff King
2016-06-23 17:38     ` [PATCH v2 5/7] color: allow "no-" for negating attributes Jeff King
2016-06-23 17:39     ` Jeff King [this message]
2016-06-23 18:34       ` [PATCH v2 6/7] color: support "italic" attribute Junio C Hamano
2016-06-23 18:36         ` Jeff King
2016-06-23 17:40     ` [PATCH v2 7/7] color: support strike-through attribute Jeff King
2016-06-23 18:36       ` Junio C Hamano
2016-06-23 18:39         ` Jeff King
2016-06-23 18:52           ` Junio C Hamano
2016-06-23 19:03             ` Junio C Hamano
2016-06-23 19:04             ` Jeff King
2016-06-23 19:11               ` Junio C Hamano
2016-06-23 19:56           ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160623173907.GF15774@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=scourtois@cubyx.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).