Fix book logic

Author: Enkidu93

src/SIL.Machine/PunctuationAnalysis/ParatextProjectQuoteConventionDetector.cs

@@ -34,7 +34,7 @@ string bookId in Canon
                     .Select(num => Canon.BookNumberToId(num))
             )
             {
-                if (includeChapters != null && includeChapters.ContainsKey(Canon.BookIdToNumber(bookId)))
+                if (includeChapters != null && !includeChapters.ContainsKey(Canon.BookIdToNumber(bookId)))
                     continue;
 
                 string fileName = _settings.GetBookFileName(bookId);

src/SIL.Machine/PunctuationAnalysis/UsfmStructureExtractor.cs

@@ -142,7 +142,7 @@ public List<Chapter> GetChapters(Dictionary<int, List<int>> includeChapters = nu
             foreach (TextSegment textSegment in _textSegments)
             {
                 if (textSegment.Book != null)
-                    currentBook = Canon.BookIdToNumber(textSegment.Book) - 1; //make 0-indexed
+                    currentBook = Canon.BookIdToNumber(textSegment.Book);
                 if (textSegment.Chapter > 0)
                     currentChapter = textSegment.Chapter;
                 if (includeChapters != null && currentBook > 0)

tests/SIL.Machine.Tests/Corpora/ParatextProjectQuoteConvetionDetectorTests.cs

@@ -142,7 +142,7 @@ public QuoteConventionAnalysis GetQuoteConvention(string? scriptureRange = null)
             {
                 chapters = ScriptureRangeParser
                     .GetChapters(scriptureRange)
-                    .ToDictionary(kvp => Canon.BookIdToNumber(kvp.Key) - 1, kvp => kvp.Value); // make 0-indexed
+                    .ToDictionary(kvp => Canon.BookIdToNumber(kvp.Key), kvp => kvp.Value);
             }
             return Detector.GetQuoteConventionAnalysis(includeChapters: chapters);
         }