Skip to content

Commit 368e52b

Browse files
authored
Merge pull request #39 from allo-media/master
A threshold of 0.0 disables ambiguous word handling.
2 parents a7b8889 + 6080df5 commit 368e52b

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "text2num"
3-
version = "2.4.0"
3+
version = "2.4.1"
44
authors = ["Allo-Media <[email protected]>"]
55
edition = "2021"
66
license = "MIT"

src/lang/fr/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ mod tests {
260260
macro_rules! assert_replace_numbers {
261261
($text:expr, $res:expr) => {
262262
let f = French {};
263-
assert_eq!(replace_numbers($text, &f, 10.0), $res)
263+
assert_eq!(replace_numbers($text, &f, 7.0), $res)
264264
};
265265
}
266266

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

503-
assert_replace_all_numbers!("le logement neuf", "le logement neuf");
504-
assert_replace_all_numbers!("le logement neuf deux sept", "le logement 9 2 7");
503+
assert_replace_numbers!("le logement neuf", "le logement neuf");
504+
assert_replace_numbers!("le logement neuf deux sept", "le logement 9 2 7");
505505
}
506506

507507
#[test]

src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ text2num = "1"
1818
1919
# Example: check some string is a valid number in a given language.
2020
21-
For convenience, the builtin languages are encapsulated into the [`Language`](lang::Language) type so
21+
For convenience, the builtin languages are encapsulated into the [`Language`] type so
2222
you can easily switch languages at runtime.
2323
2424
Each builtin language support regional varieties automatically, so you don't need to specify a region.
@@ -193,7 +193,8 @@ pub mod word_to_digit;
193193

194194
pub use lang::{LangInterpretor, Language};
195195
pub use word_to_digit::{
196-
find_numbers, replace_numbers, rewrite_numbers, text2digits, Occurence, Token,
196+
find_numbers, find_numbers_iter, replace_numbers, rewrite_numbers, text2digits, Occurence,
197+
Replace, Token,
197198
};
198199

199200
/// Get an interpreter for the language represented by the `language_code` ISO code.

src/word_to_digit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ where
374374
let is_ordinal = self.parser.is_ordinal();
375375
let (digits, value) = self.parser.string_and_value();
376376
let forget_if_isolate = (digits.len() == 1 || is_ordinal) && value < self.threshold
377-
|| self.lang.is_ambiguous(&digits);
377+
|| self.lang.is_ambiguous(&digits) && self.threshold > 0.0;
378378
self.tracker
379379
.number_end(is_ordinal, digits, value, forget_if_isolate);
380380
}

0 commit comments

Comments
 (0)