Merge pull request #73 from mmalecot/dev

v0.27.0

Author: mmalecot

CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 0.27.0 (2025-05-09)
+
+## New formats support
+
+- FIGlet Font (FLF)
+- TrueType Collection (TTC)
+
 # Version 0.26.0 (2024-11-07)
 
 ## API

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "file-format"
-version = "0.26.0"
+version = "0.27.0"
 authors = ["Mickaël Malécot <mickael.malecot@gmail.com>"]
-edition = "2021"
+edition = "2024"
 description = "Crate for determining the file format of a given file or stream."
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -12,7 +12,7 @@ homepage = "https://github.com/mmalecot/file-format"
 repository = "https://github.com/mmalecot/file-format"
 documentation = "https://docs.rs/file-format"
 exclude = ["/.github", "/examples", "/fixtures", "/tests", ".gitattributes", ".gitignore"]
-rust-version = "1.60.0"
+rust-version = "1.85.0"
 
 [features]
 ## Reader features

README.md

@@ -253,9 +253,11 @@ identification.
 - BMFont ASCII (FNT)
 - BMFont Binary (FNT)
 - Embedded OpenType (EOT)
+- FIGlet Font (FLF)
 - Glyphs
 - OpenType (OTF)
 - TrueType (TTF)
+- TrueType Collection (TTC)
 - Web Open Font Format (WOFF)
 - Web Open Font Format 2 (WOFF2)
 

fixtures/font/sample.flf

@@ -0,0 +1 @@
+flf2a$ 6 5 16 15 16

fixtures/font/sample.ttc

@@ -768,6 +768,13 @@ formats! {
     extension = "fbz"
     kind = Ebook
 
+    format = FigletFont
+    name = "FIGlet Font"
+    short_name = "FLF"
+    media_type = "application/x-figlet"
+    extension = "flf"
+    kind = Font
+
     format = Filmbox
     name = "Filmbox"
     short_name = "FBX"
@@ -2686,6 +2693,13 @@ formats! {
     extension = "ttf"
     kind = Font
 
+    format = TruetypeCollection
+    name = "TrueType Collection"
+    short_name = "TTC"
+    media_type = "font/collection"
+    extension = "ttc"
+    kind = Font
+
     format = UltimateSoundtrackerModule
     name = "Ultimate Soundtracker Module"
     short_name = "MOD"

src/formats.rs

@@ -330,6 +330,7 @@ impl From<&[u8]> for FileFormat {
 
 /// A kind of file format.
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[non_exhaustive]
 pub enum Kind {
     /// Files and directories stored in a single, possibly compressed, archive.
     Archive,

src/lib.rs

@@ -23,6 +23,7 @@ macro_rules! formats {
     } => {
         /// A file format.
         #[derive(Clone, Copy, Debug, Eq, PartialEq)]
+        #[non_exhaustive]
         pub enum FileFormat {
             $(
                 #[doc=concat!($name, $(" (", $short_name, ")",)? ".")]

src/macros.rs

@@ -900,6 +900,9 @@ signatures! {
     value = b"\x01\x00\x02" offset = 8, b"LP" offset = 34
     value = b"\x02\x00\x02" offset = 8, b"LP" offset = 34
 
+    format = FigletFont
+    value = b"flf2a"
+
     format = GoogleDraco
     value = b"DRACO"
 
@@ -984,6 +987,9 @@ signatures! {
     format = Truetype
     value = b"\x00\x01\x00\x00\x00"
 
+    format = TruetypeCollection
+    value = b"ttcf\x00"
+
     format = VirtualMachineDisk
     value = b"COWD\x01"
     value = b"KDMV\x01"

src/signatures.rs

@@ -18,6 +18,12 @@ fn test_embedded_opentype() {
     assert_eq!(fmt, FileFormat::EmbeddedOpentype);
 }
 
+#[test]
+fn test_figlet_font() {
+    let fmt = FileFormat::from_file("fixtures/font/sample.flf").unwrap();
+    assert_eq!(fmt, FileFormat::FigletFont);
+}
+
 #[test]
 fn test_glyphs() {
     let fmt = FileFormat::from_file("fixtures/font/sample.glyphs").unwrap();
@@ -36,6 +42,12 @@ fn test_truetype() {
     assert_eq!(fmt, FileFormat::Truetype);
 }
 
+#[test]
+fn test_truetype_collection() {
+    let fmt = FileFormat::from_file("fixtures/font/sample.ttc").unwrap();
+    assert_eq!(fmt, FileFormat::TruetypeCollection);
+}
+
 #[test]
 fn test_web_open_font_format() {
     let fmt = FileFormat::from_file("fixtures/font/sample.woff").unwrap();