Skip to content
Merged
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
19 changes: 19 additions & 0 deletions src/markdown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ fn strip_comments(mut content: String) -> String {
fn convert_hyphens_to_em_dashes(mut content: String) -> String {
let re = Regex::new(r"(\s+--\s+)").unwrap();
content = Regex::replace_all(&re, content.as_str(), "—").to_string();

content.trim().to_string()
}

/// Format em-dashes correctly by stripping the space before/after
fn format_em_dashes(mut content: String) -> String {
let re = Regex::new(r"(\s+—\s+)").unwrap();
content = Regex::replace_all(&re, content.as_str(), "—").to_string();

content.trim().to_string()
}

Expand All @@ -51,6 +60,9 @@ fn content_to_paragraphs(mut content: String) -> Vec<Paragraph> {
// Replace double-hyphens to em-dashes
content = convert_hyphens_to_em_dashes(content);

// Strip spaces before/after an em-dash
content = format_em_dashes(content);

// Convert smart quotes to straight quotes
content = convert_smart_quotes(content);

Expand Down Expand Up @@ -356,6 +368,13 @@ mod tests {
assert!(content == "This is a test—only a test—he was told.");
}

#[test]
fn test_format_em_dash() {
let content = format_em_dashes("This is a test — only a test — he was told.".to_string());
println!("{content}");
assert!(content == "This is a test—only a test—he was told.");
}

#[test]
fn test_trim_doublespace() {
let s = "This is a test. This is only a test.\nIf this were an actual emergency, you would be instructed where to go and what to do.";
Expand Down
Loading