Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ For reference here are the sizes associated with their different functions
| ---: | ---: | ---: |
| [`acknowledgement::listing()`](https://docs.rs/two-face/latest/two_face/acknowledgement/fn.listing.html) | 10 | - |
| [`syntax::extra_newlines()`](https://docs.rs/two-face/latest/two_face/syntax/fn.extra_newlines.html) (onig) | 920 | 360 |
| ^^ (fancy) | 865 | 360 |
| ^^ (fancy) | 900 | 360 |
| [`syntax::extra_no_newlines()`](https://docs.rs/two-face/latest/two_face/syntax/fn.extra_no_newlines.html) (onig) | 919 | 359 |
| ^^ (fancy) | 864 | 359 |
| ^^ (fancy) | 899 | 359 |
| [`theme::extra()`](https://docs.rs/two-face/latest/two_face/theme/index.html) | 45 | 5 |

In short the syntax definitions are the real chonky part, and if you're
Expand All @@ -115,14 +115,14 @@ The full listing of all syntaxes included in [`two_face::syntax`](https://docs.r
| I | INI |
| J | Java†, Javadoc†, Java Server Page (JSP)†, JavaScript†, JavaScript (Babel)\*, Jinja2, JQ, JSON†, Julia |
| K | Kotlin |
| L | LaTeX†, LaTeX Log†, Lean, LESS, Lisp†, Literate Haskell†, LiveScript\*, LLVM, Lua† |
| L | LaTeX†, LaTeX Log†, Lean, LESS, Lisp†, Literate Haskell†, LiveScript, LLVM, Lua† |
| M | Makefile†, Manpage, Markdown†, MATLAB†, Mediawiki, MutliMarkdown† |
| N | NAnt Build File†, Nginx, Nim, Ninja, Nix, NSIS |
| O | Objective-C†, Objective-C++†, OCaml†, OCamllex†, OCamlyacc†, Org Mode |
| P | Pascal†, Perl†, PHP†, PowerShell\*, Protobuf, Puppet, PureScript, Python† |
| Q | QML |
| R | R†, Racket, Rd†, Rego, Regular Expression†, Requirements.txt, reStructuredText†, Robot Framework, Ruby†, Ruby Haml†, Ruby on Rails†, Ruby Slim, Rust† |
| S | Sass\*, Scala†, SCSS, Salt State SLS\*, SML, Solidity, SQL†, Strace, Stylus, Svelte, Swift, SystemVerilog |
| S | Sass, Scala†, SCSS, Salt State SLS\*, SML, Solidity, SQL†, Strace, Stylus, Svelte, Swift, SystemVerilog |
| T | Tcl†, Terraform, TeX†, Textile†, Todo.txt, TOML, TypeScript, TypescriptReact |
| V | Varlink, Verilog, VimL, Vue, Vyper |
| W | WGSL |
Expand Down
Binary file modified generated/syntaxes-fancy-newlines.bin
Binary file not shown.
Binary file modified generated/syntaxes-fancy-no-newlines.bin
Binary file not shown.
Binary file modified generated/themes.bin
Binary file not shown.
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
//! | ---: | ---: | ---: |
//! | [`acknowledgement::listing()`] | 10 | - |
//! | [`syntax::extra_newlines()`] (onig) | 920 | 360 |
//! | ^^ (fancy) | 865 | 360 |
//! | ^^ (fancy) | 900 | 360 |
//! | [`syntax::extra_no_newlines()`] (onig) | 919 | 359 |
//! | ^^ (fancy) | 864 | 359 |
//! | ^^ (fancy) | 899 | 359 |
//! | [`theme::extra()`] | 45 | 5 |
//!
//! In short the syntax definitions are the real chonky part, and if you're
Expand All @@ -108,14 +108,14 @@
//! | I | INI |
//! | J | Java†, Javadoc†, Java Server Page (JSP)†, JavaScript†, JavaScript (Babel)\*, Jinja2, JQ, JSON†, Julia |
//! | K | Kotlin |
//! | L | LaTeX†, LaTeX Log†, Lean, LESS, Lisp†, Literate Haskell†, LiveScript\*, LLVM, Lua† |
//! | L | LaTeX†, LaTeX Log†, Lean, LESS, Lisp†, Literate Haskell†, LiveScript, LLVM, Lua† |
//! | M | Makefile†, Manpage, Markdown†, MATLAB†, Mediawiki, MutliMarkdown† |
//! | N | NAnt Build File†, Nginx, Nim, Ninja, Nix, NSIS |
//! | O | Objective-C†, Objective-C++†, OCaml†, OCamllex†, OCamlyacc†, Org Mode |
//! | P | Pascal†, Perl†, PHP†, PowerShell\*, Protobuf, Puppet, PureScript, Python† |
//! | Q | QML |
//! | R | R†, Racket, Rd†, Rego, Regular Expression†, Requirements.txt, reStructuredText†, Robot Framework, Ruby†, Ruby Haml†, Ruby on Rails†, Ruby Slim, Rust† |
//! | S | Sass\*, Scala†, SCSS, Salt State SLS\*, SML, Solidity, SQL†, Strace, Stylus, Svelte, Swift, SystemVerilog |
//! | S | Sass, Scala†, SCSS, Salt State SLS\*, SML, Solidity, SQL†, Strace, Stylus, Svelte, Swift, SystemVerilog |
//! | T | Tcl†, Terraform, TeX†, Textile†, Todo.txt, TOML, TypeScript, TypescriptReact |
//! | V | Varlink, Verilog, VimL, Vue, Vyper |
//! | W | WGSL |
Expand Down
2 changes: 1 addition & 1 deletion src/theme/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ pub enum EmbeddedThemeName {
/// <pre style="background-color:#3f3f3f;">
/// <span style="color:#a0cfa1;">#</span><span style="color:#87ae86;"> There currently is no ternary operator like true ? &quot;yes&quot; : &quot;no&quot;
/// </span><span style="color:#a0cfa1;">#</span><span style="color:#87ae86;"> So the following is suggested
/// </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">no</span><span style="color:#d6d6d680;">&quot; </span><span style="color:#ececec;">= </span><span style="color:#fed6af;">if </span><span style="font-weight:bold;color:#87d6d5;">1 </span><span style="color:#ececec;">== </span><span style="font-weight:bold;color:#87d6d5;">0</span><span style="color:#dedede;">, </span><span style="font-weight:bold;color:#d58684;">do: </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">yes</span><span style="color:#d6d6d680;">&quot;</span><span style="color:#dedede;">, </span><span style="font-weight:bold;color:#d58684;">else: </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">no</span><span style="color:#d6d6d680;">&quot;
/// </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">no</span><span style="color:#d6d6d680;">&quot; </span><span style="color:#ececec;">= </span><span style="color:#fed6af;">if </span><span style="color:#87d6d5;">1 </span><span style="color:#ececec;">== </span><span style="color:#87d6d5;">0</span><span style="color:#dedede;">, </span><span style="color:#cc9495;">do: </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">yes</span><span style="color:#d6d6d680;">&quot;</span><span style="color:#dedede;">, </span><span style="color:#cc9495;">else: </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">no</span><span style="color:#d6d6d680;">&quot;
/// </span></pre>
Zenburn,
}
Expand Down
16 changes: 7 additions & 9 deletions tests/docs_watchdog/readme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ fn embedded_asset_sizes() {
assert_eq!(10, kib(TwoFaceAsset::AckFull));

assert_eq!(920, kib(TwoFaceAsset::SynOnigNewlines));
assert_eq!(865, kib(TwoFaceAsset::SynFancyNewlines));
assert_eq!(900, kib(TwoFaceAsset::SynFancyNewlines));

assert_eq!(919, kib(TwoFaceAsset::SynOnigNoNewlines));
assert_eq!(864, kib(TwoFaceAsset::SynFancyNoNewlines));
assert_eq!(899, kib(TwoFaceAsset::SynFancyNoNewlines));

assert_eq!(45, kib(TwoFaceAsset::Themes));
}
Expand Down Expand Up @@ -50,7 +50,7 @@ const EXPECTED: &[&str] = &[
// K
"Kotlin",
// L
"LaTeX", "LaTeX Log", "Lean", "Less", "Lisp", "Literate Haskell", "LLVM", "Lua",
"LaTeX", "LaTeX Log", "Lean", "Less", "Lisp", "Literate Haskell", "LiveScript", "LLVM", "Lua",
// M
"Makefile", "Manpage", "Markdown", "MATLAB", "MediaWiki", "MultiMarkdown",
// N
Expand All @@ -66,7 +66,7 @@ const EXPECTED: &[&str] = &[
"reStructuredText", "Robot Framework", "Ruby", "Ruby Haml", "Ruby Slim", "Ruby on Rails",
"Rust",
// S
"Scala", "SCSS", "Solidity", "SML", "SQL", "Strace", "Stylus", "Svelte", "Swift",
"Sass", "Scala", "SCSS", "Solidity", "SML", "SQL", "Strace", "Stylus", "Svelte", "Swift",
"SystemVerilog",
// T
"Tcl", "Terraform", "TeX", "Textile", "Todo.txt", "TOML", "TypeScript", "TypeScriptReact",
Expand Down Expand Up @@ -97,7 +97,7 @@ const EXPECTED: &[&str] = &[
// Misc
"Java Properties", "JavaScript (Rails)", "jsonnet", "Vue Component", "camlp4", "Plain Text",
"R Console", "SQL (Rails)", "Protocol Buffer (TEXT)", "gnuplot", "HTTP Request and Response",
"log", "syslog", "Highlight non-printables", "Dockerfile (with bash)",
"log", "syslog", "Highlight non-printables", "Dockerfile (with bash)", "Command Help",
];

/// Some syntax definitions use regex features that aren't supported by `fancy-regex`
Expand All @@ -107,17 +107,15 @@ const ONIG_ONLY: &[&str] = &[
"ARM Assembly",
// J
"JavaScript (Babel)",
// L
"LiveScript",
// P
"PowerShell",
// S
"Salt State (SLS)", "Sass",
"Salt State (SLS)",

// -- Not worth displaying in docs --

// Misc
"Command Help", "VimHelp",
"VimHelp",
];

#[test]
Expand Down
2 changes: 1 addition & 1 deletion tests/docs_watchdog/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ fn zenburn() {
<pre style="background-color:#3f3f3f;">
<span style="color:#a0cfa1;">#</span><span style="color:#87ae86;"> There currently is no ternary operator like true ? &quot;yes&quot; : &quot;no&quot;
</span><span style="color:#a0cfa1;">#</span><span style="color:#87ae86;"> So the following is suggested
</span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">no</span><span style="color:#d6d6d680;">&quot; </span><span style="color:#ececec;">= </span><span style="color:#fed6af;">if </span><span style="font-weight:bold;color:#87d6d5;">1 </span><span style="color:#ececec;">== </span><span style="font-weight:bold;color:#87d6d5;">0</span><span style="color:#dedede;">, </span><span style="font-weight:bold;color:#d58684;">do: </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">yes</span><span style="color:#d6d6d680;">&quot;</span><span style="color:#dedede;">, </span><span style="font-weight:bold;color:#d58684;">else: </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">no</span><span style="color:#d6d6d680;">&quot;
</span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">no</span><span style="color:#d6d6d680;">&quot; </span><span style="color:#ececec;">= </span><span style="color:#fed6af;">if </span><span style="color:#87d6d5;">1 </span><span style="color:#ececec;">== </span><span style="color:#87d6d5;">0</span><span style="color:#dedede;">, </span><span style="color:#cc9495;">do: </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">yes</span><span style="color:#d6d6d680;">&quot;</span><span style="color:#dedede;">, </span><span style="color:#cc9495;">else: </span><span style="color:#d6d6d680;">&quot;</span><span style="color:#d68686;">no</span><span style="color:#d6d6d680;">&quot;
</span></pre>
"#
);
Expand Down
Loading