extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2024-12-23 06:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add bold, italic and underline font styles

Browse Source
This commit is contained in:
sharkdp 2018-05-11 13:52:12 +02:00 committed by David Peter
parent 22c8978fca
commit cb7b158172
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/terminal.rs
View File

@ -2,7 +2,7 @@ use std::fmt::Write;
use ansi_term::Colour::{Fixed, RGB}; use ansi_term::Colour::{Fixed, RGB};
use ansi_term::Style; use ansi_term::Style;
use syntect::highlighting; use syntect::highlighting::{self, FontStyle};
/// Approximate a 24 bit color value by a 8 bit ANSI code /// Approximate a 24 bit color value by a 8 bit ANSI code
fn rgb2ansi(r: u8, g: u8, b: u8) -> u8 { fn rgb2ansi(r: u8, g: u8, b: u8) -> u8 {
@ -35,11 +35,23 @@ pub fn as_terminal_escaped(
for &(ref style, text) in v.iter() { for &(ref style, text) in v.iter() {
let style = if !colored { let style = if !colored {
Style::default() Style::default()
} else if true_color { } else {
RGB(style.foreground.r, style.foreground.g, style.foreground.b).normal() let color = if true_color {
RGB(style.foreground.r, style.foreground.g, style.foreground.b)
} else { } else {
let ansi = rgb2ansi(style.foreground.r, style.foreground.g, style.foreground.b); let ansi = rgb2ansi(style.foreground.r, style.foreground.g, style.foreground.b);
Fixed(ansi).normal() Fixed(ansi)
};
if style.font_style.contains(FontStyle::BOLD) {
color.bold()
} else if style.font_style.contains(FontStyle::UNDERLINE) {
color.underline()
} else if style.font_style.contains(FontStyle::ITALIC) {
color.italic()
} else {
color.normal()
}
}; };
write!(s, "{}", style.paint(text)).unwrap(); write!(s, "{}", style.paint(text)).unwrap();