Skip to content
Open
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
4 changes: 3 additions & 1 deletion src/formats/pdf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
//! [pdf-inspector]: https://github.com/firecrawl/pdf-inspector

use crate::error::ConvertError;
use crate::shared::text::expand_ligatures;
use pdf_inspector::PdfError;

pub fn to_markdown(bytes: &[u8]) -> Result<String, ConvertError> {
Expand All @@ -28,7 +29,8 @@ pub fn to_markdown(bytes: &[u8]) -> Result<String, ConvertError> {
log::warn!("broken font encodings detected; extracted text may be garbled");
}
match result.markdown {
Some(mut markdown) if !markdown.trim().is_empty() => {
Some(markdown) if !markdown.trim().is_empty() => {
let mut markdown = expand_ligatures(&markdown);
if !markdown.ends_with('\n') {
markdown.push('\n');
}
Expand Down
68 changes: 67 additions & 1 deletion src/shared/text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@
/// regular space, strip soft hyphens. Line breaks become single spaces; a
/// CRLF pair is one break. U+200C (ZWNJ) and U+200D (ZWJ) are **preserved**:
/// they carry meaning in Arabic/Indic shaping and emoji sequences.
/// Typographic ligatures (ff, fi, fl, ffi, ffl, st) are expanded to their
/// constituent letters so words are not silently corrupted.
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
pub fn clean_text(text: &str) -> String {
let mut out = String::with_capacity(text.len());
let mut chars = text.chars().peekable();
while let Some(c) = chars.next() {
// Expand typographic ligatures to ASCII equivalents.
if let Some(expansion) = ligature_expansion(c) {
out.push_str(expansion);
continue;
}
match c {
'\u{a0}' => out.push(' '),
'\u{ad}' | '\u{200b}' | '\u{feff}' => {}
Expand All @@ -26,6 +33,42 @@ pub fn clean_text(text: &str) -> String {
out
}

/// The ASCII expansion for a typographic ligature (U+FB00–U+FB06:
/// ff fi fl ffi ffl ſt st), or `None` for any other character.
fn ligature_expansion(c: char) -> Option<&'static str> {
match c {
'\u{fb00}' => Some("ff"),
'\u{fb01}' => Some("fi"),
'\u{fb02}' => Some("fl"),
'\u{fb03}' => Some("ffi"),
'\u{fb04}' => Some("ffl"),
'\u{fb05}' | '\u{fb06}' => Some("st"),
_ => None,
}
}

/// Expand typographic ligatures to their constituent ASCII letters.
///
/// The PDF extraction path uses this directly instead of [`clean_text`]:
/// PDF Markdown must keep its line breaks, which `clean_text` collapses.
pub(crate) fn expand_ligatures(text: &str) -> String {
// `str::contains` takes a `Pattern`, and `RangeInclusive<char>` only
// implements `Pattern` on nightly, so test chars explicitly. Membership
// comes from `ligature_expansion` so the fast path cannot drift from
// the expansion table.
if !text.chars().any(|c| ligature_expansion(c).is_some()) {
return text.to_string();
}
let mut out = String::with_capacity(text.len());
for c in text.chars() {
match ligature_expansion(c) {
Some(expansion) => out.push_str(expansion),
None => out.push(c),
}
}
out
}

/// Collapse whitespace runs to single spaces.
pub fn collapse_ws(text: &str) -> String {
let mut out = String::with_capacity(text.len());
Expand All @@ -46,7 +89,7 @@ pub fn collapse_ws(text: &str) -> String {

#[cfg(test)]
mod tests {
use super::clean_text;
use super::{clean_text, expand_ligatures};

#[test]
fn join_controls_preserved() {
Expand All @@ -58,4 +101,27 @@ mod tests {
fn layout_invisibles_stripped() {
assert_eq!(clean_text("a\u{ad}b\u{200b}c\u{feff}d\u{a0}e"), "abcd e");
}

#[test]
fn ligatures_expanded() {
assert_eq!(clean_text("classi\u{fb01}es"), "classifies");
assert_eq!(clean_text("a\u{fb00}ected"), "affected");
assert_eq!(clean_text("de\u{fb02}ect"), "deflect");
assert_eq!(clean_text("di\u{fb03}cult"), "difficult");
assert_eq!(clean_text("wa\u{fb04}e"), "waffle");
assert_eq!(clean_text("fa\u{fb05}"), "fast");
assert_eq!(clean_text("ju\u{fb06}"), "just");
}

#[test]
fn expand_ligatures_pdf_path() {
assert_eq!(
expand_ligatures("\u{fb00}\u{fb01}\u{fb02}\u{fb03}\u{fb04}\u{fb05}\u{fb06}"),
"fffiflffifflstst"
);
// Unlike clean_text, the PDF path must keep line breaks.
assert_eq!(expand_ligatures("a\nb\rc"), "a\nb\rc");
// Fast path: text without ligatures is returned unchanged.
assert_eq!(expand_ligatures("plain text"), "plain text");
}
}