Update changelog

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Unreleased
 
-- Switched simd base64 crate for one that works on stable (from `vb64` to `base64_simd`)
-- Allow boolean arguments to function as flags, without a `true` or `false` argument following the flag itself
-- Fix cropping issues when zooming out too much while using kitty protocol
-
-# v0.4.3
-
 - Fix issue with some terminals hanging on startup
 - Fix issues with some iterm2-backend terminals not displaying anything
 - Allow using ctrl+scroll to zoom in/out while zoomed using kitty backend

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tdf-viewer"
-version = "0.4.3"
+version = "0.4.2"
 authors = ["June Welker <junewelker@gmail.com>"]
 edition = "2024"
 description = "A terminal viewer for PDFs"
@@ -49,7 +49,7 @@ log = "0.4.27"
 flexi_logger = "0.31"
 
 # for tracing with tokio-console
-console-subscriber = { version = "0.5.0", optional = true }
+console-subscriber = { version = "0.4.0", optional = true }
 csscolorparser = { version = "0.7.0" }
 
 [profile.production]
@@ -57,7 +57,8 @@ inherits = "release"
 lto = "fat"
 
 [features]
-default = []
+default = ["nightly"]
+nightly = ["ratatui-image/vb64"]
 tracing = ["tokio/tracing", "dep:console-subscriber"]
 epub = ["mupdf/epub"]
 cbz = ["mupdf/cbz"]
@@ -92,7 +93,7 @@ checked_conversions = "warn"
 copy_iterator = "warn"
 default_trait_access = "warn"
 doc_link_with_quotes = "warn"
-empty_enums = "warn"
+empty_enum = "warn"
 explicit_into_iter_loop = "warn"
 explicit_iter_loop = "warn"
 filter_map_next = "warn"

README.md

@@ -16,9 +16,7 @@ Designed to be performant, very responsive, and work well with even very large P
 ## Installation
 
 1. Get the rust toolchain from [rustup.rs](https://rustup.rs)
-2. Run `cargo install --git https://github.com/itsjunetime/tdf.git`
+2. Run `rustup install nightly && cargo +nightly install --git https://github.com/itsjunetime/tdf.git`
-
-If you want to use this with `epub`s or `cbz`s, add `--features epub` or `--features cbz` to the command line (or `--features cbz,epub` for both)
 
 ## To Build
 First, you need to install the system dependencies. This will generally only include `libfontconfig` and `clang`. If you're on linux, these will probably show up in your package manager as something like `libfontconfig1-devel` or `libfontconfig-dev` and just `clang`.
@@ -27,7 +25,7 @@ If it turns out that you're missing one of these, it will fail to compile and te
 
 1. Get the rust toolchain from [rustup.rs](https://rustup.rs)
 2. Clone the repo and `cd` into it
-3. Run `cargo build --release`
+3. Run `cargo +nightly build --release`
 
 The binary should then be found at `./target/release/tdf`.
 

src/main.rs

@@ -83,11 +83,11 @@ async fn inner_main() -> Result<(), WrappedErr> {
 	let flags = xflags::parse_or_exit! {
 		/// Display the pdf with the pages starting at the right hand size and moving left and
 		/// adjust input keys to match
-		optional -r,--r-to-l
+		optional -r,--r-to-l r_to_l: bool
 		/// The maximum number of pages to display together, horizontally, at a time
 		optional -m,--max-wide max_wide: NonZeroUsize
 		/// Fullscreen the pdf (hide document name, page count, etc)
-		optional -f,--fullscreen
+		optional -f,--fullscreen fullscreen: bool
 		/// The number of pages to prerender surrounding the currently-shown page; 0 means no
 		/// limit. By default, there is no limit.
 		optional -p,--prerender prerender: usize
@@ -267,7 +267,12 @@ async fn inner_main() -> Result<(), WrappedErr> {
 		|| "Unknown file".into(),
 		|n| n.to_string_lossy().to_string()
 	);
-	let tui = Tui::new(file_name, flags.max_wide, flags.r_to_l, is_kitty);
+	let tui = Tui::new(
+		file_name,
+		flags.max_wide,
+		flags.r_to_l.unwrap_or_default(),
+		is_kitty
+	);
 
 	let backend = CrosstermBackend::new(std::io::stdout());
 	let mut term = Terminal::new(backend).map_err(|e| {
@@ -295,7 +300,7 @@ async fn inner_main() -> Result<(), WrappedErr> {
 		})?;
 	}
 
-	let fullscreen = flags.fullscreen;
+	let fullscreen = flags.fullscreen.unwrap_or_default();
 	let main_area = Tui::main_layout(&term.get_frame(), fullscreen);
 	to_renderer
 		.send(RenderNotif::Area(main_area.page_area))

src/tui.rs

@@ -205,28 +205,23 @@ impl Tui {
 
 					log::debug!("zoom is now {zoom:#?}");
 					log::debug!("img_area is {img_area:#?}");
-					log::debug!("img dimensions are {cell_w}x{cell_h}");
-
-					let img_width = f32::from(cell_w);
-					let img_height = f32::from(cell_h);
-
-					let img_aspect_ratio = img_width / img_height;
 
 					if zoom.level < 0 {
-						let old_width = img_area.width;
+						img_area = Rect {
-						img_area.width = img_area
+							width: img_area
 								.width
 								.saturating_sub((zoom.level * 2).unsigned_abs())
-							.max((f32::from(img_area.height) * img_aspect_ratio) as u16);
+								.max(1),
-						img_area.x += (old_width - img_area.width) / 2;
+							x: img_area.x + (zoom.level.unsigned_abs().min(img_area.width / 2)),
+							..img_area
+						}
+					}
 
 					log::debug!("after adjustment, img_area is {img_area:#?}");
 
-						// TODO: Find a way to detect when we've hit the maximum zoom-out and stop
-						// more zooming out
-					}
-
 					// Ugh I don't like this logic. I wish we could simplify it.
+					let img_width = f32::from(cell_w);
+					let img_height = f32::from(cell_h);
 					let img_area_width = f32::from(img_area.width);
 					let img_area_height = f32::from(img_area.height);
 					let available_to_real_width_ratio = img_area_width / img_width;
@@ -792,7 +787,7 @@ impl Tui {
 		}
 	}
 
-	// I want this to always return an option 'cause I just use it to return from `Self::handle_event`
+	// I want this to always return 0 'cause I just use it to return from `Self::handle_event`]
 	#[expect(clippy::unnecessary_wraps)]
 	fn update_zoom(&mut self, f: impl FnOnce(&mut Zoom)) -> Option<InputAction> {
 		if let Some(z) = &mut self.zoom {