Merge branch 'master' into LT22190Comp

Author: AndyBlack

src/AssemblyInfo.props

@@ -1,9 +1,9 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.7.2</Version>
+		<Version>3.7.3</Version>
 		<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
-		<AssemblyVersion>3.7.2.0</AssemblyVersion>
-		<FileVersion>3.7.2.0</FileVersion>
+		<AssemblyVersion>3.7.3.0</AssemblyVersion>
+		<FileVersion>3.7.3.0</FileVersion>
 		<Company>SIL Global</Company>
 		<Authors>SIL Global</Authors>
 		<Product>Machine</Product>

src/SIL.Machine/PunctuationAnalysis/QuotationMarkStringMatch.cs

@@ -75,7 +75,7 @@ public string PreviousCharacter
                     if (previousSegment != null && !TextSegment.MarkerIsInPrecedingContext(UsfmMarkerType.Paragraph))
                     {
                         return new StringInfo(previousSegment.Text).SubstringByTextElements(
-                            previousSegment.Text.Length - 1,
+                            StringInfo.ParseCombiningCharacters(previousSegment.Text).Length - 1,
                             1
                         );
                     }

tests/SIL.Machine.Tests/PunctuationAnalysis/QuotationMarkStringMatchTests.cs

@@ -188,13 +188,24 @@ public void GetPreviousCharacter()
             0,
             1
         );
-        ;
+        Assert.IsNull(quotationMarkStringMatch.PreviousCharacter);
+
         quotationMarkStringMatch = new QuotationMarkStringMatch(
             new TextSegment.Builder().SetText("\u201c\u201d").Build(),
             1,
             2
         );
         Assert.That(quotationMarkStringMatch.PreviousCharacter, Is.EqualTo("“"));
+
+        quotationMarkStringMatch = new QuotationMarkStringMatch(
+            new TextSegment.Builder()
+                .SetText("\"उत्पत्ति पुस्तकले")
+                .SetPreviousSegment(new TextSegment.Builder().SetText("उत्पत्ति पुस्तकले").Build())
+                .Build(),
+            0,
+            1
+        );
+        Assert.That(quotationMarkStringMatch.PreviousCharacter, Is.EqualTo("ले"));
     }
 
     [Test]