Expose chapter numbers when finding best chapter strategies

src/SIL.Machine/PunctuationAnalysis/Chapter.cs

@@ -5,11 +5,13 @@ namespace SIL.Machine.PunctuationAnalysis
 {
     public class Chapter
     {
-        public Chapter(IEnumerable<Verse> verses)
+        public Chapter(IEnumerable<Verse> verses, int chapterNumber = 0)
         {
             Verses = verses.ToList();
+            ChapterNumber = chapterNumber;
         }
 
-        public List<Verse> Verses { get; set; }
+        public List<Verse> Verses { get; private set; }
+        public int ChapterNumber { get; private set; }
     }
 }

src/SIL.Machine/PunctuationAnalysis/QuotationMarkUpdateFirstPass.cs

@@ -46,12 +46,12 @@ int depth in Enumerable.Range(1, Math.Min(oldQuoteConvention.NumLevels, newQuote
             return true;
         }
 
-        public List<QuotationMarkUpdateStrategy> FindBestChapterStrategies()
+        public List<(int ChapterNumber, QuotationMarkUpdateStrategy Strategy)> FindBestChapterStrategies()
         {
-            var bestActionsByChapter = new List<QuotationMarkUpdateStrategy>();
+            var bestActionsByChapter = new List<(int ChapterNumber, QuotationMarkUpdateStrategy Strategy)>();
             foreach (Chapter chapter in GetChapters())
             {
-                bestActionsByChapter.Add(FindBestStrategyForChapter(chapter));
+                bestActionsByChapter.Add((chapter.ChapterNumber, FindBestStrategyForChapter(chapter)));
             }
             return bestActionsByChapter;
         }

src/SIL.Machine/PunctuationAnalysis/TextSegment.cs

@@ -189,8 +189,8 @@ public SurrogatePairString(string stringValue)
             _stringValue = stringValue;
             IEnumerable<(int StringIndex, int SurrogatePairIndex)> indexPairs = _stringValue
                 .Select((c, stringIndex) => (c, stringIndex))
-                .Where(tup => !char.IsLowSurrogate(tup.c))
-                .Select((tup, surrogatePairIndex) => (tup.stringIndex, surrogatePairIndex));
+                .Where(tuple => !char.IsLowSurrogate(tuple.c))
+                .Select((tuple, surrogatePairIndex) => (tuple.stringIndex, surrogatePairIndex));
             _surrogatePairIndexByStringIndex = new Dictionary<int, int>();
             _stringIndexBySurrogatePairIndex = new Dictionary<int, int>();
             foreach ((int stringIndex, int surrogatePairIndex) in indexPairs)

src/SIL.Machine/PunctuationAnalysis/UsfmStructureExtractor.cs

@@ -164,7 +164,7 @@ public List<Chapter> GetChapters(IReadOnlyDictionary<int, List<int>> includeChap
                 {
                     if (currentChapterVerses.Count > 0)
                     {
-                        chapters.Add(new Chapter(currentChapterVerses));
+                        chapters.Add(new Chapter(currentChapterVerses, currentChapter));
                     }
                     currentChapterVerses = new List<Verse>();
                 }
@@ -176,7 +176,7 @@ public List<Chapter> GetChapters(IReadOnlyDictionary<int, List<int>> includeChap
             }
             if (currentChapterVerses.Count > 0)
             {
-                chapters.Add(new Chapter(currentChapterVerses));
+                chapters.Add(new Chapter(currentChapterVerses, currentChapter));
             }
             return chapters;
         }

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

@@ -41,12 +41,16 @@ of the field which Yahweh God had made.
         );
 
         UsfmParser.Parse(normalizedUsfm, quotationMarkDenormalizationFirstPass);
-        List<QuotationMarkUpdateStrategy> bestChapterStrategies =
+        List<(int ChapterNumber, QuotationMarkUpdateStrategy Strategy)> bestChapterStrategies =
             quotationMarkDenormalizationFirstPass.FindBestChapterStrategies();
 
+        Assert.That(bestChapterStrategies.Select(tuple => tuple.ChapterNumber).SequenceEqual([1]));
+
         var quotationMarkDenormalizer = new QuotationMarkDenormalizationUsfmUpdateBlockHandler(
             standardEnglishQuoteConvention,
-            new QuotationMarkUpdateSettings(chapterStrategies: bestChapterStrategies)
+            new QuotationMarkUpdateSettings(
+                chapterStrategies: bestChapterStrategies.Select(tuple => tuple.Strategy).ToList()
+            )
         );
 
         var updater = new UpdateUsfmParserHandler(updateBlockHandlers: [quotationMarkDenormalizer]);

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

@@ -730,7 +730,7 @@ You shall not eat of any tree of the garden ? ""
         Assert.That(expectedActions.SequenceEqual(observedActions));
     }
 
-    public List<QuotationMarkUpdateStrategy> RunFirstPass(
+    private static List<QuotationMarkUpdateStrategy> RunFirstPass(
         string normalizedUsfm,
         string sourceQuoteConventionName,
         string targetQuoteConventionName
@@ -749,10 +749,10 @@ string targetQuoteConventionName
         var firstPassAnalyzer = new QuotationMarkUpdateFirstPass(sourceQuoteConvention, targetQuoteConvention);
         UsfmParser.Parse(normalizedUsfm, firstPassAnalyzer);
 
-        return firstPassAnalyzer.FindBestChapterStrategies();
+        return firstPassAnalyzer.FindBestChapterStrategies().Select(tuple => tuple.Strategy).ToList();
     }
 
-    public QuotationMarkUpdateStrategy RunFirstPassOnChapter(
+    private static QuotationMarkUpdateStrategy RunFirstPassOnChapter(
         List<string> verseTexts,
         string sourceQuoteConventionName,
         string targetQuoteConventionName
@@ -777,7 +777,7 @@ string targetQuoteConventionName
         return firstPassAnalyzer.FindBestStrategyForChapter(chapter);
     }
 
-    public QuoteConvention GetQuoteConventionByName(string name)
+    private static QuoteConvention GetQuoteConventionByName(string name)
     {
         QuoteConvention quoteConvention = QuoteConventions.Standard.GetQuoteConventionByName(name);
         Assert.IsNotNull(quoteConvention);