Added code to QuoteAnnotationPlugin to illustrate usage of IProject.C…

…onvertToUSFMTokens
ubsicap · Sep 13, 2022 · 8e8c2d0 · 8e8c2d0
1 parent f63244f
commit 8e8c2d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/QuoteAnnotationPlugin/AnnotationSource.cs b/QuoteAnnotationPlugin/AnnotationSource.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using Paratext.PluginInterfaces;
@@ -9,12 +10,13 @@ namespace QuoteAnnotationPlugin
 {
     internal class AnnotationSource : IPluginAnnotationSource
     {
-        private readonly IQuotationMarkInfo quotationMarks;
-        private readonly List<Regex> findMarksRegexes = new List<Regex>();
+	    private readonly IProject m_project;
+	    private readonly List<Regex> findMarksRegexes = new List<Regex>();
 
         public AnnotationSource(IProject project)
         {
-            quotationMarks = project.Language.QuotationMarkInfo;
+	        m_project = project;
+	        var quotationMarks = project.Language.QuotationMarkInfo;
             if (quotationMarks == null)
                 return;
 
@@ -76,8 +78,18 @@ public IReadOnlyList<IPluginAnnotation> GetAnnotations(IVerseRef verseRef, strin
             List<IPluginAnnotation> annotations = new List<IPluginAnnotation>();
             for (int level = 0; level < findMarksRegexes.Count; level++)
             {
-                if (findMarksRegexes[level] == null)
+	            var tokens = m_project.ConvertToUSFMTokens(usfm, verseRef.BookNum,
+		            verseRef.ChapterNum, verseRef.VerseNum);
+
+	            if (findMarksRegexes[level] == null)
+					continue;
+
+                // If this is in intro material or the verse only has section heads or other
+                // non-Scripture text, let's not annotate it. (In real life, this would probably
+                // not be the most sensible thing to do.)
+                if (tokens.OfType<IUSFMTextToken>().All(t => !t.IsScripture))
                     continue;
+
                 foreach (Match match in findMarksRegexes[level].Matches(usfm))
                 {
                     Selection sel = new Selection(match.Value, usfm.Substring(0, match.Index),

diff --git a/QuoteAnnotationPlugin/QuoteAnnotationPlugin.csproj b/QuoteAnnotationPlugin/QuoteAnnotationPlugin.csproj
@@ -9,7 +9,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="ParatextPluginInterfaces" Version="2.0.9" />
+    <PackageReference Include="ParatextPluginInterfaces" Version="2.0.23" />
   </ItemGroup>
 
 </Project>