Merge branch 'dev' into bhajneet/issue175

shabados · Nov 2, 2020 · aac5778 · aac5778
2 parents 44f2cbb + 4adbf3f
commit aac5778
Show file tree

Hide file tree

Showing 2 changed files with 131 additions and 44 deletions.
diff --git a/lib/stripEndings.js b/lib/stripEndings.js
@@ -21,11 +21,14 @@ const numberClass = getRegexClass( [
 // Rahao in English, ASCII, Unicode
 const pauseGroup = getRegexGroup( [ 'ਰਹਾਉ', toAscii( 'ਰਹਾਉ' ), 'Pause' ] )
 
+// Matchers to strip out of input string
 const matchers = [
-  // || Rahao || style endings
-  ` ?${endingClass} ?${pauseGroup}( .*)?${endingClass}`,
-  // Endings followed by any number => match the rest of the line
-  ` ?(${endingClass}|${optionalEndingClass}?)${numberClass}.*`,
+  // Any pause (ending + pause word) => match the rest of the line
+  ` ?${endingClass} ?${pauseGroup}.*`,
+  // Any ending followed by any number => match the rest of the line
+  ` ?(${endingClass}|${optionalEndingClass})${numberClass}.*`,
+  // Any sequence at the end of a line with numbers, periods, and spaces beginning with a number
+  ` ?${numberClass}(${numberClass}|[. ])*$`,
   // Clean up any lingering ending characters
   ` ?${brokenEndingClass}`,
   ` ?${endingClass}`,