From 58a15c92f3a332026c314c0a85e53e396e8e0948 Mon Sep 17 00:00:00 2001 From: o2sh Date: Fri, 18 Oct 2019 22:16:48 +0000 Subject: [PATCH] inverse colors for tex --- resources/tex.ascii | 40 ++++++++++++++++++------------------- src/main.rs | 48 ++++++++++++++++++++++----------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/resources/tex.ascii b/resources/tex.ascii index 2ad4a84bc..16f40844c 100644 --- a/resources/tex.ascii +++ b/resources/tex.ascii @@ -1,20 +1,20 @@ -{1}############################################ -{1}###{0}TEXTEXTEXTEXTE{1}##########{0}XTEXTE{1}###{0}XTEXT{1}### -{1}###{0}TEXTEXTEXTEXTEX{1}#########{0}XTEXT{1}###{0}EXTEX{1}#### -{1}###{0}XT{1}####{0}EX{1}####{0}XT{1}###########{0}TEXT{1}####{0}EX{1}###### -{1}##{0}TE{1}#####{0}XT{1}#####{0}T{1}#############{0}EXT{1}###{0}EX{1}###### -{1}##{0}TE{1}#####{0}XT{1}####{0}EXTEXTEXTEXT{1}####{0}EXT#{0}EX{1}####### -{1}#########{0}TE{1}####{0}XTEXTEXTEXTEX{1}####{0}TEXT{1}######## -{1}#########{0}TE{1}######{0}XT{1}#######{0}EX{1}#####{0}TEX{1}######## -{1}#########{0}TE{1}######{0}XT{1}#######{0}EX{1}#####{0}TEX{1}######## -{1}#########{0}TE{1}######{0}XT{1}####{0}E{1}###{0}X{1}####{0}TEXTE{1}####### -{1}#########{0}TE{1}######{0}XT{1}####{0}E{1}#######{0}XT{1}##{0}EXT{1}###### -{1}#########{0}TE{1}######{0}XTXTEXT{1}######{0}TE{1}####{0}XTE{1}##### -{1}#########{0}TE{1}######{0}XTXTEXT{1}######{0}TE{1}####{0}XTE{1}##### -{1}########{0}TEX{1}######{0}TE{1}####{0}X{1}####{0}TEX{1}######{0}TEX{1}#### -{1}######{0}TEXTEXTE{1}###{0}XT{1}####{0}E{1}###{0}XTEXT{1}####{0}EXTEXT{1}## -{1}#################{0}TE{1}######################### -{1}#################{0}TE{1}########{0}X{1}################ -{1}#################{0}TE{1}#######{0}XT{1}################ -{1}###############{0}TEXTEXTEXTEXT{1}################ -{1}############################################ +{0}############################################ +{0}###{1}TEXTEXTEXTEXTE{0}##########{1}XTEXTE{0}###{1}XTEXT{0}### +{0}###{1}TEXTEXTEXTEXTEX{0}#########{1}XTEXT{0}###{1}EXTEX{0}#### +{0}###{1}XT{0}####{1}EX{0}####{1}XT{0}###########{1}TEXT{0}####{1}EX{0}###### +{0}##{1}TE{0}#####{1}XT{0}#####{1}T{0}#############{1}EXT{0}###{1}EX{0}###### +{0}##{1}TE{0}#####{1}XT{0}####{1}EXTEXTEXTEXT{0}####{1}EXT#{1}EX{0}####### +{0}#########{1}TE{0}####{1}XTEXTEXTEXTEX{0}####{1}TEXT{0}######## +{0}#########{1}TE{0}######{1}XT{0}#######{1}EX{0}#####{1}TEX{0}######## +{0}#########{1}TE{0}######{1}XT{0}#######{1}EX{0}#####{1}TEX{0}######## +{0}#########{1}TE{0}######{1}XT{0}####{1}E{0}###{1}X{0}####{1}TEXTE{0}####### +{0}#########{1}TE{0}######{1}XT{0}####{1}E{0}#######{1}XT{0}##{1}EXT{0}###### +{0}#########{1}TE{0}######{1}XTXTEXT{0}######{1}TE{0}####{1}XTE{0}##### +{0}#########{1}TE{0}######{1}XTXTEXT{0}######{1}TE{0}####{1}XTE{0}##### +{0}########{1}TEX{0}######{1}TE{0}####{1}X{0}####{1}TEX{0}######{1}TEX{0}#### +{0}######{1}TEXTEXTE{0}###{1}XT{0}####{1}E{0}###{1}XTEXT{0}####{1}EXTEXT{0}## +{0}#################{1}TE{0}######################### +{0}#################{1}TE{0}########{1}X{0}################ +{0}#################{1}TE{0}#######{1}XT{0}################ +{0}###############{1}TEXTEXTEXTEXT{0}################ +{0}############################################ diff --git a/src/main.rs b/src/main.rs index 627b8c998..52d9ae720 100644 --- a/src/main.rs +++ b/src/main.rs @@ -361,7 +361,6 @@ enum InfoFields { #[strum(serialize_all = "lowercase")] enum Language { Assembly, - Tex, C, Clojure, CoffeeScript, @@ -378,11 +377,14 @@ enum Language { HTML, Idris, Java, + JavaScript, Kotlin, Lisp, Lua, Nim, ObjectiveC, + Perl, + Php, PureScript, Python, R, @@ -392,11 +394,9 @@ enum Language { Shell, Swift, Tcl, + Tex, TypeScript, - JavaScript, Vue, - Perl, - Php, XML, Zig, Unknown @@ -406,7 +406,6 @@ impl fmt::Display for Language { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { Language::Assembly => write!(f, "Assembly"), - Language::Tex => write!(f, "Tex"), Language::C => write!(f, "C"), Language::Clojure => write!(f, "Clojure"), Language::CoffeeScript => write!(f, "CoffeeScript"), @@ -423,6 +422,7 @@ impl fmt::Display for Language { Language::HTML => write!(f, "HTML"), Language::Idris => write!(f, "Idris"), Language::Java => write!(f, "Java"), + Language::JavaScript => write!(f, "JavaScript"), Language::Kotlin => write!(f, "Kotlin"), Language::Lisp => write!(f, "Lisp"), Language::Lua => write!(f, "Lua"), @@ -436,12 +436,12 @@ impl fmt::Display for Language { Language::Scala => write!(f, "Scala"), Language::Shell => write!(f, "Shell"), Language::Swift => write!(f, "Swift"), + Language::Perl => write!(f, "Perl"), + Language::Php => write!(f, "Php"), Language::Tcl => write!(f, "Tcl"), + Language::Tex => write!(f, "Tex"), Language::TypeScript => write!(f, "TypeScript"), - Language::JavaScript => write!(f, "JavaScript"), Language::Vue => write!(f, "Vue"), - Language::Perl => write!(f, "Perl"), - Language::Php => write!(f, "Php"), Language::XML => write!(f, "XML"), Language::Zig => write!(f, "Zig"), Language::Unknown => write!(f, "Unknown"), @@ -930,7 +930,6 @@ impl From for Language { fn from(language: tokei::LanguageType) -> Self { match language { tokei::LanguageType::Assembly => Language::Assembly, - tokei::LanguageType::Tex => Language::Tex, tokei::LanguageType::C => Language::C, tokei::LanguageType::Clojure => Language::Clojure, tokei::LanguageType::CoffeeScript => Language::CoffeeScript, @@ -947,11 +946,14 @@ impl From for Language { tokei::LanguageType::Html => Language::HTML, tokei::LanguageType::Idris => Language::Idris, tokei::LanguageType::Java => Language::Java, + tokei::LanguageType::JavaScript => Language::JavaScript, tokei::LanguageType::Kotlin => Language::Kotlin, tokei::LanguageType::Lisp => Language::Lisp, tokei::LanguageType::Lua => Language::Lua, tokei::LanguageType::Nim => Language::Nim, tokei::LanguageType::ObjectiveC => Language::ObjectiveC, + tokei::LanguageType::Perl => Language::Perl, + tokei::LanguageType::Php => Language::Php, tokei::LanguageType::PureScript => Language::PureScript, tokei::LanguageType::Python => Language::Python, tokei::LanguageType::R => Language::R, @@ -961,11 +963,9 @@ impl From for Language { tokei::LanguageType::Sh => Language::Shell, tokei::LanguageType::Swift => Language::Swift, tokei::LanguageType::Tcl => Language::Tcl, + tokei::LanguageType::Tex => Language::Tex, tokei::LanguageType::TypeScript => Language::TypeScript, - tokei::LanguageType::JavaScript => Language::JavaScript, tokei::LanguageType::Vue => Language::Vue, - tokei::LanguageType::Perl => Language::Perl, - tokei::LanguageType::Php => Language::Php, tokei::LanguageType::Xml => Language::XML, tokei::LanguageType::Zig => Language::Zig, _ => unimplemented!(), @@ -976,7 +976,6 @@ impl From for Language { fn get_all_language_types() -> Vec { vec![ tokei::LanguageType::Assembly, - tokei::LanguageType::Tex, tokei::LanguageType::C, tokei::LanguageType::Clojure, tokei::LanguageType::CoffeeScript, @@ -993,11 +992,14 @@ fn get_all_language_types() -> Vec { tokei::LanguageType::Html, tokei::LanguageType::Idris, tokei::LanguageType::Java, + tokei::LanguageType::JavaScript, tokei::LanguageType::Kotlin, tokei::LanguageType::Lisp, tokei::LanguageType::Lua, tokei::LanguageType::Nim, tokei::LanguageType::ObjectiveC, + tokei::LanguageType::Perl, + tokei::LanguageType::Php, tokei::LanguageType::PureScript, tokei::LanguageType::Python, tokei::LanguageType::R, @@ -1007,11 +1009,9 @@ fn get_all_language_types() -> Vec { tokei::LanguageType::Sh, tokei::LanguageType::Swift, tokei::LanguageType::Tcl, + tokei::LanguageType::Tex, tokei::LanguageType::TypeScript, - tokei::LanguageType::JavaScript, tokei::LanguageType::Vue, - tokei::LanguageType::Perl, - tokei::LanguageType::Php, tokei::LanguageType::Xml, tokei::LanguageType::Zig, ] @@ -1028,7 +1028,6 @@ impl Info { match language { Language::Assembly => include_str!("../resources/assembly.ascii"), - Language::Tex => include_str!("../resources/tex.ascii"), Language::C => include_str!("../resources/c.ascii"), Language::Clojure => include_str!("../resources/clojure.ascii"), Language::CoffeeScript => include_str!("../resources/coffeescript.ascii"), @@ -1045,11 +1044,14 @@ impl Info { Language::HTML => include_str!("../resources/html.ascii"), Language::Idris => include_str!("../resources/idris.ascii"), Language::Java => include_str!("../resources/java.ascii"), + Language::JavaScript => include_str!("../resources/javascript.ascii"), Language::Kotlin => include_str!("../resources/kotlin.ascii"), Language::Lisp => include_str!("../resources/lisp.ascii"), Language::Lua => include_str!("../resources/lua.ascii"), Language::Nim => include_str!("../resources/nim.ascii"), Language::ObjectiveC => include_str!("../resources/objectivec.ascii"), + Language::Perl => include_str!("../resources/perl.ascii"), + Language::Php => include_str!("../resources/php.ascii"), Language::PureScript => include_str!("../resources/purescript.ascii"), Language::Python => include_str!("../resources/python.ascii"), Language::R => include_str!("../resources/r.ascii"), @@ -1059,11 +1061,9 @@ impl Info { Language::Shell => include_str!("../resources/shell.ascii"), Language::Swift => include_str!("../resources/swift.ascii"), Language::Tcl => include_str!("../resources/tcl.ascii"), + Language::Tex => include_str!("../resources/tex.ascii"), Language::TypeScript => include_str!("../resources/typescript.ascii"), - Language::JavaScript => include_str!("../resources/javascript.ascii"), Language::Vue => include_str!("../resources/vue.ascii"), - Language::Perl => include_str!("../resources/perl.ascii"), - Language::Php => include_str!("../resources/php.ascii"), Language::XML => include_str!("../resources/xml.ascii"), Language::Zig => include_str!("../resources/zig.ascii"), Language::Unknown => include_str!("../resources/unknown.ascii"), @@ -1081,7 +1081,6 @@ impl Info { let colors = match language { Language::Assembly => vec![Color::Cyan], - Language::Tex => vec![Color::Black, Color::White], Language::C => vec![Color::BrightBlue, Color::Blue], Language::Clojure => vec![Color::BrightBlue, Color::BrightGreen], Language::CoffeeScript => vec![Color::Red], @@ -1098,11 +1097,14 @@ impl Info { Language::HTML => vec![Color::Red, Color::White], Language::Idris => vec![Color::Red], Language::Java => vec![Color::BrightBlue, Color::Red], + Language::JavaScript => vec![Color::BrightYellow], Language::Kotlin => vec![Color::Blue, Color::Yellow, Color::Magenta], Language::Lisp => vec![Color::Yellow], Language::Lua => vec![Color::Blue], Language::Nim => vec![Color::Yellow, Color::BrightWhite], Language::ObjectiveC => vec![Color::BrightBlue, Color::Blue], + Language::Perl => vec![Color::BrightBlue], + Language::Php => vec![Color::BrightWhite], Language::PureScript => vec![Color::White], Language::Python => vec![Color::Blue, Color::Yellow], Language::R => vec![Color::White, Color::Blue], @@ -1112,11 +1114,9 @@ impl Info { Language::Shell => vec![Color::Green], Language::Swift => vec![Color::BrightRed], Language::Tcl => vec![Color::Blue, Color::White, Color::BrightBlue], + Language::Tex => vec![Color::White, Color::Black], Language::TypeScript => vec![Color::Cyan], - Language::JavaScript => vec![Color::BrightYellow], Language::Vue => vec![Color::BrightGreen, Color::Blue], - Language::Perl => vec![Color::BrightBlue], - Language::Php => vec![Color::BrightWhite], Language::XML => vec![Color::Yellow, Color::BrightBlack, Color::BrightGreen], Language::Zig => vec![Color::Yellow], Language::Unknown => vec![Color::White],