Implement word-ending operator

sammdot · Apr 21, 2021 · acd85f0 · acd85f0
1 parent 3224aea
commit acd85f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/translation.rs b/src/translation.rs
@@ -218,6 +218,7 @@ fn operator(input: &str) -> IResult<&str, Object> {
       )), tag("}")))(input)?;
   Ok((input, match oper {
     "^" => Object::AttachRaw,
+    "$" => Object::WordEnd,
     "*" => Object::RetroToggleStar,
     "*+" => Object::RepeatLastStroke,
     "*?" => Object::RetroInsertSpace,
@@ -370,6 +371,7 @@ pub fn format_plover_to_rtf(tl: &str) -> String {
         _ => match obj {
           Object::Noop => "{\\*\\cxplvrnop}",
           Object::Cancel => "{\\*\\cxplvrcancel}",
+          Object::WordEnd => "{\\*\\cxplvrwdend}",
           Object::DeleteStroke => "\\cxdstroke ",
           Object::RepeatLastStroke => "{\\*\\cxplvrrpt}",
           Object::RetroToggleStar => "{\\*\\cxplvrast}",

diff --git a/src/translation_model.rs b/src/translation_model.rs
@@ -18,6 +18,7 @@ pub enum ParagraphMode {
 pub enum Object {
   Cancel,
   Noop,
+  WordEnd,
   DeleteStroke,
   RepeatLastStroke,
   RetroToggleStar,

diff --git a/src/translation_parse.rs b/src/translation_parse.rs
@@ -41,6 +41,7 @@ fn no_arg_group(input: &str) -> IResult<&str, Object> {
   Ok((input, match label {
     "cxplvrnop" => Object::Noop,
     "cxplvrcancel" => Object::Cancel,
+    "cxplvrwdend" => Object::WordEnd,
     "cxplvrast" => Object::RetroToggleStar,
     "cxplvrrpt" => Object::RepeatLastStroke,
     "cxplvrrtisp" => Object::RetroInsertSpace,
@@ -280,6 +281,7 @@ pub fn format_rtf_to_plover(tl: &str) -> String {
         _ => match obj {
           Object::Cancel => "{}",
           Object::Noop => "{#}",
+          Object::WordEnd => "{$}",
           Object::DeleteStroke => "=undo",
           Object::RepeatLastStroke => "{*+}",
           Object::RetroToggleStar => "{*}",