pff2: Separate Bitmap struct for better indexing

The bitmap and its properties have been moved to a separate struct,
so that it can implement iterators for easier rendering of the bitmap

Cargo.toml

@@ -6,10 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.79"
 clap = { version = "4.4.18", features = ["derive"] }
+log = "0.4.20"
 nom = "7.1.3"
 thiserror = "1.0.56"
 
 [dev-dependencies]
 test-case = "3.3.1"
+anyhow = "1.0.79"

examples/pff2.rs

@@ -1,35 +1,41 @@
-//! A minimal font.pf2 parser impl that prints the parsed Rust struct
+//! A minimal font.pf2 parser impl that prints a glyph from a PFF2 font
 
-use std::fs::read;
+use std::{fs::read, path::PathBuf};
 
-use args::Args;
 use clap::Parser as _;
-use theme_parser::parser::pff2::Parser;
+use theme_parser::parser::pff2::{Glyph, Parser};
 
-mod args {
-    use std::path::PathBuf;
+#[derive(clap::Parser)]
+struct Args {
+    #[clap(long, short = 'f')]
+    pub font_file: PathBuf,
 
-    use clap::Parser;
-
-    #[derive(Parser)]
-    pub struct Args {
-        #[clap(long, short = 'f')]
-        pub font_file: PathBuf,
-    }
+    #[clap(long = "char", short)]
+    pub character: char,
 }
 
+const SQUARE_BLOCK: &str = "\u{2588}\u{2588}";
+
 fn main() -> anyhow::Result<()> {
     let args = Args::parse();
 
     let data = read(args.font_file)?;
-    let font = Parser::parse(&data)?.validate();
+    let font = Parser::parse(&data)?.validate()?;
+
+    println!("{}", font.name);
 
-    let print = format!("{font:#?}")
-        .split("\n")
-        .take(100)
-        .fold(String::new(), |print, line| print + line + "\n");
+    let glyph = font.glyph(args.character).unwrap();
 
-    println!("{print}");
+    render_glyph(glyph);
 
     Ok(())
 }
+
+fn render_glyph(glyph: &Glyph) {
+    for row in &glyph.bitmap {
+        for col in row {
+            print!("{}", if col { SQUARE_BLOCK } else { "  " });
+        }
+        println!();
+    }
+}

src/lib.rs

@@ -4,11 +4,20 @@ use std::rc::Rc;
 #[macro_use]
 extern crate test_case;
 
+#[macro_use]
+extern crate log;
+
 extern crate thiserror;
 
 pub mod parser {
     pub mod pff2;
     pub mod theme_txt;
 }
 
+pub mod render {
+    pub mod pff2;
+}
+
 pub type OwnedSlice<T> = Rc<T>;
+
+trait Sealed {}