From 7f0de1be63a9f6890d724d93c765645ce41176d3 Mon Sep 17 00:00:00 2001 From: peoc peocik Date: Mon, 12 Mar 2018 15:05:02 +0200 Subject: [PATCH 1/4] addedelse: --- caster/lib/ccr/core/nav.py | 3 ++- caster/lib/textformat.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/caster/lib/ccr/core/nav.py b/caster/lib/ccr/core/nav.py index 748695d64..1ac23d778 100644 --- a/caster/lib/ccr/core/nav.py +++ b/caster/lib/ccr/core/nav.py @@ -148,7 +148,7 @@ class Navigation(MergeRule): "peek format": R(Function(textformat.peek_text_format), rdescript="Peek Format"), "( | | ) (bow|bowel) [brunt]": R(Function(textformat.master_format_text), rdescript="Text Format"), "format ": R(Function(textformat.prior_text_format), rdescript="Last Text Format"), - + " format ": R(Function(textformat.partial_format_text), rdescript="Partial Text Format"), "dredge": R(Key("a-tab"), rdescript="Alt-Tab"), } @@ -167,6 +167,7 @@ class Navigation(MergeRule): Choice("semi", {"dock": ";", "doc": ";", "sink": "" }), + Choice("word_limit",{"single": 1,"double": 2,"triple":3}), diff --git a/caster/lib/textformat.py b/caster/lib/textformat.py index 12d52d823..052bbaea0 100644 --- a/caster/lib/textformat.py +++ b/caster/lib/textformat.py @@ -66,7 +66,11 @@ def get_text_format_description(capitalization, spacing): def master_format_text(capitalization, spacing, textnv): capitalization, spacing = normalize_text_format(capitalization, spacing) - Text(get_formatted_text(capitalization, spacing, str(textnv))).execute() + Text(get_formatted_text(capitalization, spacing, str(textnv))).execute() + +def partial_format_text(word_limit,capitalization, spacing, textnv): + capitalization, spacing = normalize_text_format(capitalization, spacing) + Text(get_formatted_text(capitalization, spacing, " ".join(str(textnv).split(" ")[0:word_limit]))).execute() def get_formatted_text(capitalization, spacing, t): tlen = len(t) From fc4192003e75fe17d2edc4de615535fb5dcc836b Mon Sep 17 00:00:00 2001 From: peoc peocik Date: Mon, 12 Mar 2018 15:10:57 +0200 Subject: [PATCH 2/4] added the partial format command, which keeps the first n (0 to 4) words, with the rest of the utterance acting as context to increase accuracy --- caster/lib/ccr/core/nav.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caster/lib/ccr/core/nav.py b/caster/lib/ccr/core/nav.py index 1ac23d778..86b270937 100644 --- a/caster/lib/ccr/core/nav.py +++ b/caster/lib/ccr/core/nav.py @@ -167,7 +167,7 @@ class Navigation(MergeRule): Choice("semi", {"dock": ";", "doc": ";", "sink": "" }), - Choice("word_limit",{"single": 1,"double": 2,"triple":3}), + Choice("word_limit",{"single": 1,"double": 2,"triple":3,"Quadra":4}), From 56165adea060216c976b0413d3aa9dc3a8f47890 Mon Sep 17 00:00:00 2001 From: peoc peocik Date: Tue, 13 Mar 2018 11:38:48 +0200 Subject: [PATCH 3/4] Fixed formatting not being applied on partial text --- caster/lib/textformat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/caster/lib/textformat.py b/caster/lib/textformat.py index 052bbaea0..828fb3516 100644 --- a/caster/lib/textformat.py +++ b/caster/lib/textformat.py @@ -68,9 +68,9 @@ def master_format_text(capitalization, spacing, textnv): capitalization, spacing = normalize_text_format(capitalization, spacing) Text(get_formatted_text(capitalization, spacing, str(textnv))).execute() -def partial_format_text(word_limit,capitalization, spacing, textnv): - capitalization, spacing = normalize_text_format(capitalization, spacing) - Text(get_formatted_text(capitalization, spacing, " ".join(str(textnv).split(" ")[0:word_limit]))).execute() +def partial_format_text(word_limit,capitalization, spacing, textnv): + global _CAPITALIZATION, _SPACING + Text(get_formatted_text(_CAPITALIZATION, _SPACING, " ".join(str(textnv).split(" ")[0:word_limit]))).execute() def get_formatted_text(capitalization, spacing, t): tlen = len(t) From 4cace92ab37101d1a825b40ee37d3a4e89a2b08d Mon Sep 17 00:00:00 2001 From: peoc peocik Date: Tue, 13 Mar 2018 11:45:06 +0200 Subject: [PATCH 4/4] Removed unnecessary arguments from partial_format Function --- caster/lib/textformat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caster/lib/textformat.py b/caster/lib/textformat.py index 828fb3516..be1e2fcce 100644 --- a/caster/lib/textformat.py +++ b/caster/lib/textformat.py @@ -68,7 +68,7 @@ def master_format_text(capitalization, spacing, textnv): capitalization, spacing = normalize_text_format(capitalization, spacing) Text(get_formatted_text(capitalization, spacing, str(textnv))).execute() -def partial_format_text(word_limit,capitalization, spacing, textnv): +def partial_format_text(word_limit,textnv): global _CAPITALIZATION, _SPACING Text(get_formatted_text(_CAPITALIZATION, _SPACING, " ".join(str(textnv).split(" ")[0:word_limit]))).execute()