Merge branch 'master' into replace-backgroundworker-with-async-await

DistFiles/ReleaseNotes.md

@@ -46,6 +46,9 @@ back-up plan.)
 
 # Release Notes
 
+## September 23 2020 Glyssen 1.6.0
+Changed English and Russian reference texts to use chevrons instead of curly quotes for improved visibility when scripting.
+
 ## August 17 2020 Glyssen 1.5.0
 Improved reference text logic when matching to reporting clauses ("he said" blocks) to prevent duplication.
 English and Russian reference texts updated to match v. 101 of the FCBH New Testament Director's Guide.

DistFiles/reference_texts/English/1JN.xml

@@ -63,7 +63,7 @@
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="4" characterId="narrator-1JN">
     <verse num="4" />
-    <text>One who says, “I know him,” and doesn’t keep his commandments, is a liar, and the truth isn’t in him.</text>
+    <text>One who says, «I know him,» and doesn’t keep his commandments, is a liar, and the truth isn’t in him.</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="5" characterId="narrator-1JN">
     <verse num="5" />
@@ -345,7 +345,7 @@
   </block>
   <block style="p" paragraphStart="true" chapter="4" initialStartVerse="20" characterId="narrator-1JN">
     <verse num="20" />
-    <text>If a man says, “I love God,” and hates his brother, he is a liar; for he who doesn’t love his brother whom he has seen, how can he love God whom he has not seen?</text>
+    <text>If a man says, «I love God,» and hates his brother, he is a liar; for he who doesn’t love his brother whom he has seen, how can he love God whom he has not seen?</text>
   </block>
   <block style="p" paragraphStart="true" chapter="4" initialStartVerse="21" characterId="narrator-1JN">
     <verse num="21" />

DistFiles/reference_texts/English/1PE.xml

@@ -69,7 +69,7 @@
     <text>because it is written,</text>
   </block>
   <block style="p" paragraphStart="true" chapter="1" initialStartVerse="16" characterId="scripture">
-    <text>“You shall be holy; for I am holy.”</text>
+    <text>«You shall be holy; for I am holy.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="1" initialStartVerse="17" characterId="narrator-1PE">
     <verse num="17" />
@@ -102,11 +102,11 @@
     <text>For,</text>
   </block>
   <block style="p" paragraphStart="true" chapter="1" initialStartVerse="24" characterId="scripture">
-    <text>“All flesh is like grass, and all of man’s glory like the flower in the grass. The grass withers, and its flower falls;</text>
+    <text>«All flesh is like grass, and all of man’s glory like the flower in the grass. The grass withers, and its flower falls;</text>
   </block>
   <block style="p" paragraphStart="true" chapter="1" initialStartVerse="25" characterId="scripture">
     <verse num="25" />
-    <text>but the Lord’s word endures forever.”</text>
+    <text>but the Lord’s word endures forever.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="1" initialStartVerse="25" characterId="narrator-1PE">
     <text>This is the word of Good News which was preached to you.</text>
@@ -124,7 +124,7 @@
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="3" characterId="narrator-1PE">
     <verse num="3" />
-    <text>For as the Scriptures say: “You have discovered for yourself that the Lord is good.”</text>
+    <text>For as the Scriptures say: «You have discovered for yourself that the Lord is good.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="4" characterId="narrator-1PE">
     <verse num="4" />
@@ -139,21 +139,21 @@
     <text>Because it is contained in Scripture,</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="6" characterId="scripture">
-    <text>“Behold, I lay in Zion a chief cornerstone, chosen, and precious: He who believes in him will not be disappointed.”</text>
+    <text>«Behold, I lay in Zion a chief cornerstone, chosen, and precious: He who believes in him will not be disappointed.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="7" characterId="narrator-1PE">
     <verse num="7" />
     <text>For you who believe therefore is the honor, but for those who are disobedient,</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="7" characterId="scripture">
-    <text>“The stone which the builders rejected, has become the chief cornerstone,”</text>
+    <text>«The stone which the builders rejected, has become the chief cornerstone,»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="8" characterId="narrator-1PE">
     <verse num="8" />
     <text>and,</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="8" characterId="scripture">
-    <text>“a stone of stumbling, and a rock of offense.”</text>
+    <text>«a stone of stumbling, and a rock of offense.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="8" characterId="narrator-1PE">
     <text>For they stumble at the word, being disobedient, to which also they were appointed.</text>
@@ -212,7 +212,7 @@
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="22" characterId="scripture">
     <verse num="22" />
-    <text>“who did not sin, neither was deceit found in his mouth.”</text>
+    <text>«who did not sin, neither was deceit found in his mouth.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="2" initialStartVerse="23" characterId="narrator-1PE">
     <verse num="23" />
@@ -268,23 +268,23 @@
     <text>For,</text>
   </block>
   <block style="p" paragraphStart="true" chapter="3" initialStartVerse="10" characterId="scripture">
-    <text>“He who would love life, and see good days, let him keep his tongue from evil, and his lips from speaking deceit.</text>
+    <text>«He who would love life, and see good days, let him keep his tongue from evil, and his lips from speaking deceit.</text>
   </block>
   <block style="p" paragraphStart="true" chapter="3" initialStartVerse="11" characterId="scripture">
     <verse num="11" />
     <text>Let him turn away from evil, and do good. Let him seek peace, and pursue it.</text>
   </block>
   <block style="p" paragraphStart="true" chapter="3" initialStartVerse="12" characterId="scripture">
     <verse num="12" />
-    <text>For the eyes of the Lord are on the righteous, and his ears open to their prayer; but the face of the Lord is against those who do evil.”</text>
+    <text>For the eyes of the Lord are on the righteous, and his ears open to their prayer; but the face of the Lord is against those who do evil.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="3" initialStartVerse="13" characterId="narrator-1PE">
     <verse num="13" />
     <text>Now who is he who will harm you, if you become imitators of that which is good?</text>
   </block>
   <block style="p" paragraphStart="true" chapter="3" initialStartVerse="14" characterId="narrator-1PE">
     <verse num="14" />
-    <text>But even if you should suffer for righteousness’ sake, you are blessed. “Don’t fear what they fear, neither be troubled.”</text>
+    <text>But even if you should suffer for righteousness’ sake, you are blessed. «Don’t fear what they fear, neither be troubled.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="3" initialStartVerse="15" characterId="narrator-1PE">
     <verse num="15" />
@@ -312,7 +312,7 @@
   </block>
   <block style="p" paragraphStart="true" chapter="3" initialStartVerse="21" characterId="narrator-1PE">
     <verse num="21" />
-    <text>This water is a symbol of baptism, which now saves you-- not the putting away of the filth of the flesh, but the answer of a good conscience toward God, through the resurrection of Jesus Christ.</text>
+    <text>This water is a symbol of baptism, which now saves you—not the putting away of the filth of the flesh, but the answer of a good conscience toward God, through the resurrection of Jesus Christ.</text>
   </block>
   <block style="p" paragraphStart="true" chapter="3" initialStartVerse="22" characterId="narrator-1PE">
     <verse num="22" />
@@ -421,7 +421,7 @@
     <text>Likewise, you younger ones, be subject to the elder. Yes, all of you clothe yourselves with humility, to subject yourselves to one another; for</text>
   </block>
   <block style="p" paragraphStart="true" chapter="5" initialStartVerse="5" characterId="scripture">
-    <text>“God resists the proud, but gives grace to the humble.”</text>
+    <text>«God resists the proud, but gives grace to the humble.»</text>
   </block>
   <block style="p" paragraphStart="true" chapter="5" initialStartVerse="6" characterId="narrator-1PE">
     <verse num="6" />