switch to MKJV as default and fix resulting bug found in parsing text content

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>one.shandan</groupId>
   <artifactId>pljava-jsword</artifactId>
-  <version>0.0.3-SNAPSHOT</version>
+  <version>0.0.4-SNAPSHOT</version>
 
   <!-- Coordinates are nice, but so are names and descriptions for humans. -->
 

src/main/java/PlJavaJSword.java

@@ -5,6 +5,8 @@ import java.lang.Boolean;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Arrays;
 import org.crosswire.jsword.passage.VerseRangeFactory;
 import org.crosswire.jsword.versification.system.SystemDefault;
 import org.crosswire.jsword.versification.BibleBook;
@@ -29,10 +31,11 @@ import static org.postgresql.pljava.annotation.Function.OnNullInput.RETURNS_NULL
 import static org.postgresql.pljava.annotation.Function.Trust.SANDBOXED;
 
 public class PlJavaJSword {
-  private static final String DEFAULT_BOOK = "KJV";
+  private static final String DEFAULT_BOOK = "MKJV";
   private static final String DEFAULT_VERSIFICATION = "KJV";
   private static final Versification kjv = Versifications.instance().getVersification(DEFAULT_VERSIFICATION);
   private static final Books BOOKS = Books.installed();
+  private static final HashSet<Character> PUNCTUATION = new HashSet<Character>(Arrays.asList('.', ',', ';', ':', '?'));
   private static final Logger logger = LoggerFactory.getLogger(PlJavaJSword.class);
 
   @Function(onNullInput=RETURNS_NULL, effects=IMMUTABLE, trust=SANDBOXED)
@@ -60,12 +63,14 @@ public class PlJavaJSword {
         Element e = (Element)c;
         if (e.getName() != "note"){
           verse += " " + e.getValue().trim();
-        } else {
-          verse += " ";
         }
       } else if (c.getCType() == CType.Text){
-        Text t = (Text)c;
-        verse += t.getValue().trim();
+        String t = ((Text)c).getValue().trim();
+        if (t.isEmpty() || PUNCTUATION.contains(t.charAt(0))){
+          verse += t;
+        } else {
+          verse += " " + t;
+        }
       }
     }
     return verse.trim();

src/test/java/TestPlJavaJSword.java

@@ -5,7 +5,8 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestPlJavaJSword {
-  private static final String GEN_1_1_3 = "In the beginning God created the heaven and the earth. And the earth was without form, and void; and darkness was upon the face of the deep. And the Spirit of God moved upon the face of the waters. And God said, Let there be light: and there was light.";
+  private static final String KJV_GEN_1_1_3 = "In the beginning God created the heaven and the earth. And the earth was without form, and void; and darkness was upon the face of the deep. And the Spirit of God moved upon the face of the waters. And God said, Let there be light: and there was light.";
+  private static final String MKJV_GEN_1_1_3 = "In the beginning God created the heaven and the earth. And the earth was without form and empty. And darkness was on the face of the deep. And the Spirit of God moved on the face of the waters. And God said, Let there be light. And there was light.";
   @Test
   public void testIsValidVerseValidVerse(){
     assertEquals(true, PlJavaJSword.isValidVerse("Gen 1:1"));
@@ -24,7 +25,11 @@ public class TestPlJavaJSword {
   }
   @Test
   public void testTextMany() throws BookException {
-    assertEquals(GEN_1_1_3, PlJavaJSword.getText("KJV", "Genesis 1:1-3"));
+    assertEquals(KJV_GEN_1_1_3, PlJavaJSword.getText("KJV", "Genesis 1:1-3"));
+  }
+  @Test
+  public void testTextParseMany() throws BookException {
+    assertEquals(MKJV_GEN_1_1_3, PlJavaJSword.getText("MKJV", "Genesis 1:1-3"));
   }
   @Test
   public void testDefaultText() throws BookException {
@@ -32,6 +37,6 @@ public class TestPlJavaJSword {
   }
   @Test
   public void testDefaultTextMany() throws BookException {
-    assertEquals(GEN_1_1_3, PlJavaJSword.getDefaultText("Genesis 1:1-3"));
+    assertEquals(MKJV_GEN_1_1_3, PlJavaJSword.getDefaultText("Genesis 1:1-3"));
   }
 }