From 46961eb43d5f6edfb31cf042664efea7b45b935f Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 15 Oct 2016 19:11:00 -0400 Subject: [PATCH] w/ with --- TODO.md | 5 +++++ config.toml | 4 ++-- dictionary/abbreviations.dict | 4 ++++ dictionary/cmudict-0.7b | 4 ++-- src/lang/abbr.rs | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/TODO.md b/TODO.md index 3a9906a5f0..b99903d6ba 100644 --- a/TODO.md +++ b/TODO.md @@ -23,6 +23,11 @@ Parsing Synthesis - Get rid of static with "Uhhh", "Ummm" of variable length (option). + - Syllables: + - http://cdmckay.org/blog/2012/08/15/counting-syllables-and-detecting-rhyme-in-php/ + - http://stackoverflow.com/questions/33111685/convert-arpabet-to-ipa-with-stress + - Or scrape something: + - http://www.syllablecount.com/syllables/biologically Cleanup - Refactor into a very well-defined "SpeakRequest" with all diff --git a/config.toml b/config.toml index e9b8d80b37..d6248a3a52 100644 --- a/config.toml +++ b/config.toml @@ -20,6 +20,6 @@ # Logging verbosity log_handler = false - log_parsing = true - log_synthesis = false + log_parsing = false + log_synthesis = true diff --git a/dictionary/abbreviations.dict b/dictionary/abbreviations.dict index 53e8b4e187..8892b0ae97 100644 --- a/dictionary/abbreviations.dict +++ b/dictionary/abbreviations.dict @@ -13,6 +13,10 @@ BRB be right back ; This is a hack. They'll simply work due to the order of parsing. ; --------------------------- 911 nine one one +WWI world war one +WWII world war two +WWIII world war three +w/ with ; States ; Some of these are commented out as they may interfere with words diff --git a/dictionary/cmudict-0.7b b/dictionary/cmudict-0.7b index e0d2bee55b..65485a10e0 100644 --- a/dictionary/cmudict-0.7b +++ b/dictionary/cmudict-0.7b @@ -109956,8 +109956,8 @@ SIDEARM S AY1 D AA0 R M SIDEARMS S AY1 D AA0 R M Z SIDEBAR S AY1 D B AA2 R SIDEBARS S AY1 D B AA2 R Z -SIDED S AY1 D AH0 D -SIDED(1) S AY1 D IH0 D +SIDED(1) S AY1 D AH0 D +SIDED S AY1 D IH0 D SIDEK S AY1 D EH2 K SIDEKICK S AY1 D K IH2 K SIDELINE S AY1 D L AY2 N diff --git a/src/lang/abbr.rs b/src/lang/abbr.rs index e033a4d18b..9a07e11133 100644 --- a/src/lang/abbr.rs +++ b/src/lang/abbr.rs @@ -36,7 +36,7 @@ impl AbbreviationsMap { // Format resembles the following, // "OMG oh my god" - let re = Regex::new(r"^([\w-']+)\s+(.*)\n$").unwrap(); + let re = Regex::new(r"^([\w-'/]+)\s+(.*)\n$").unwrap(); while try!(reader.read_line(&mut buffer)) > 0 { match re.captures(&buffer) {