Skip to content

Commit

Permalink
Merge pull request #39 from allo-media/master
Browse files Browse the repository at this point in the history
A threshold of 0.0 disables ambiguous word handling.
  • Loading branch information
rtxm authored Jul 18, 2024
2 parents a7b8889 + 6080df5 commit 368e52b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "text2num"
version = "2.4.0"
version = "2.4.1"
authors = ["Allo-Media <contact@allo-media.fr>"]
edition = "2021"
license = "MIT"
Expand Down
6 changes: 3 additions & 3 deletions src/lang/fr/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ mod tests {
macro_rules! assert_replace_numbers {
($text:expr, $res:expr) => {
let f = French {};
assert_eq!(replace_numbers($text, &f, 10.0), $res)
assert_eq!(replace_numbers($text, &f, 7.0), $res)
};
}

Expand Down Expand Up @@ -500,8 +500,8 @@ mod tests {
assert_replace_numbers!("un peu moins", "un peu moins");
// assert_replace_numbers!("onze c'est un peu plus", "11 c'est un peu plus");

assert_replace_all_numbers!("le logement neuf", "le logement neuf");
assert_replace_all_numbers!("le logement neuf deux sept", "le logement 9 2 7");
assert_replace_numbers!("le logement neuf", "le logement neuf");
assert_replace_numbers!("le logement neuf deux sept", "le logement 9 2 7");
}

#[test]
Expand Down
5 changes: 3 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ text2num = "1"
# Example: check some string is a valid number in a given language.
For convenience, the builtin languages are encapsulated into the [`Language`](lang::Language) type so
For convenience, the builtin languages are encapsulated into the [`Language`] type so
you can easily switch languages at runtime.
Each builtin language support regional varieties automatically, so you don't need to specify a region.
Expand Down Expand Up @@ -193,7 +193,8 @@ pub mod word_to_digit;

pub use lang::{LangInterpretor, Language};
pub use word_to_digit::{
find_numbers, replace_numbers, rewrite_numbers, text2digits, Occurence, Token,
find_numbers, find_numbers_iter, replace_numbers, rewrite_numbers, text2digits, Occurence,
Replace, Token,
};

/// Get an interpreter for the language represented by the `language_code` ISO code.
Expand Down
2 changes: 1 addition & 1 deletion src/word_to_digit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ where
let is_ordinal = self.parser.is_ordinal();
let (digits, value) = self.parser.string_and_value();
let forget_if_isolate = (digits.len() == 1 || is_ordinal) && value < self.threshold
|| self.lang.is_ambiguous(&digits);
|| self.lang.is_ambiguous(&digits) && self.threshold > 0.0;
self.tracker
.number_end(is_ordinal, digits, value, forget_if_isolate);
}
Expand Down

0 comments on commit 368e52b

Please sign in to comment.