Ignoring multiwords while moving word index

reading_machine/src/Config.cpp

@@ -443,14 +443,34 @@ bool Config::moveWordIndex(int relativeMovement)
   if (!canMoveWordIndex(relativeMovement))
     return false;
 
-  wordIndex += relativeMovement;
+  int dir = 1;
+  if (relativeMovement < 0)
+    dir = -1; 
+
+  int movementDone = 0;
+  if (isMultiwordPredicted(wordIndex))
+    wordIndex += dir;
+  while (movementDone != relativeMovement)
+  {
+    if (isMultiwordPredicted(wordIndex))
+      wordIndex += dir;
+    wordIndex += dir;
+    movementDone += dir;
+    if (isMultiwordPredicted(wordIndex))
+      wordIndex += dir;
+  }
 
   return true;
 }
 
 void Config::moveWordIndexRelaxed(int relativeMovement)
 {
-  while (!moveWordIndex(relativeMovement));
+  int dir = 1;
+  if (relativeMovement < 0)
+    dir = -1;
+  for (int i = 0; i < abs(relativeMovement); i++)
+    if (!moveWordIndex(dir))
+      break;
 }
 
 bool Config::canMoveWordIndex(int relativeMovement) const