Re: [PATCH 2/2] color: support "italic" attribute

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Wow I wasn't expecting such a rapid response, you're awesome! :-D

Simon Courtois

On 23 June 2016 at 15:10:33, Jeff King (peff@xxxxxxxx) wrote:
> 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 
> Signed-off-by: Jeff King 
> ---
> Documentation/config.txt | 2 +-
> color.c | 8 ++++----
> color.h | 3 ++-
> t/t4026-color.sh | 4 ++--
> 4 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 58673cf..4b97d8d 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -154,7 +154,7 @@ color::
> colors (at most two) and attributes (at most one), separated
> by spaces. The colors accepted are `normal`, `black`,
> `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and
> - `white`; the attributes are `bold`, `dim`, `ul`, `blink` and
> + `white`; the attributes are `bold`, `dim`, `italic`, `ul`, `blink` and
> `reverse`. The first color given is the foreground; the
> second is the background. The position of the attribute, if
> any, doesn't matter. Attributes may be turned off specifically
> diff --git a/color.c b/color.c
> index 8f85153..698682c 100644
> --- a/color.c
> +++ b/color.c
> @@ -125,11 +125,11 @@ static int parse_color(struct color *out, const char *name, int 
> len)
> 
> static int parse_attr(const char *name, int len)
> {
> - static const int attr_values[] = { 1, 2, 4, 5, 7,
> - 22, 22, 24, 25, 27 };
> + static const int attr_values[] = { 1, 2, 3, 4, 5, 7,
> + 22, 22, 23, 24, 25, 27 };
> static const char * const attr_names[] = {
> - "bold", "dim", "ul", "blink", "reverse",
> - "nobold", "nodim", "noul", "noblink", "noreverse"
> + "bold", "dim", "italic", "ul", "blink", "reverse",
> + "nobold", "nodim", "noitalic", "noul", "noblink", "noreverse"
> };
> int i;
> for (i = 0; i < ARRAY_SIZE(attr_names); i++) {
> 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 2b32c4f..05625c5 100755
> --- a/t/t4026-color.sh
> +++ b/t/t4026-color.sh
> @@ -56,8 +56,8 @@ 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
> 

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]