diff --git a/NOTICE b/NOTICE index f1dc8950b..9fef0f4e0 100644 --- a/NOTICE +++ b/NOTICE @@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ ================================================================================ -Syntaxes in `assets/data/syntect.bin` are generated from syntax definitions +Syntaxes in `library/assets/syntect.bin` are generated from syntax definitions which can be found here: https://github.com/sharkdp/bat/tree/master/assets/syntaxes diff --git a/assets/data/cj_linebreak_data.postcard b/library/assets/cj_linebreak_data.postcard similarity index 100% rename from assets/data/cj_linebreak_data.postcard rename to library/assets/cj_linebreak_data.postcard diff --git a/assets/data/icudata.postcard b/library/assets/icudata.postcard similarity index 100% rename from assets/data/icudata.postcard rename to library/assets/icudata.postcard diff --git a/assets/data/syntect.bin b/library/assets/syntect.bin similarity index 100% rename from assets/data/syntect.bin rename to library/assets/syntect.bin diff --git a/library/src/layout/par.rs b/library/src/layout/par.rs index 2d0944ceb..6170a34d8 100644 --- a/library/src/layout/par.rs +++ b/library/src/layout/par.rs @@ -1016,23 +1016,23 @@ fn linebreak_optimized<'a>(vt: &Vt, p: &'a Preparation<'a>, width: Abs) -> Vec = Lazy::new(|| { diff --git a/library/src/text/raw.rs b/library/src/text/raw.rs index 747a75d18..1cb3cab1c 100644 --- a/library/src/text/raw.rs +++ b/library/src/text/raw.rs @@ -343,9 +343,8 @@ fn to_syn(RgbaColor { r, g, b, a }: RgbaColor) -> synt::Color { /// syntaxes/02_Extra/VimHelp.sublime-syntax /// syntaxes/02_Extra/cmd-help/syntaxes/cmd-help.sublime-syntax /// ``` -static SYNTAXES: Lazy = Lazy::new(|| { - syntect::dumps::from_binary(include_bytes!("../../../assets/data/syntect.bin")) -}); +static SYNTAXES: Lazy = + Lazy::new(|| syntect::dumps::from_binary(include_bytes!("../../assets/syntect.bin"))); /// The default theme used for syntax highlighting. pub static THEME: Lazy = Lazy::new(|| synt::Theme {