Merge pull request #14 from ndw/single-char

Fix bug in processing a line containing a single non-whitespace character

Author: ndw

gradle.properties

@@ -1,5 +1,5 @@
 basename=sinclude
 sincludeTitle=Saxon XInclude
-sincludeVersion=5.2.0
+sincludeVersion=5.2.1
 
 saxonVersion=11.5

src/main/java/com/nwalsh/sinclude/XInclude.java

@@ -467,9 +467,9 @@ public XdmNode process(XdmNode node) throws XPathException {
                                 while (last > first && lines[pos].charAt(last) == ' ') {
                                     last--;
                                 }
-                                if (first != last) {
-                                    ReceiverUtils.handleCharacters(receiver, lines[pos].substring(first, last+1));
-                                }
+                                // There must be at least one non-space character on the line, so
+                                // this is always going to be a legal substring
+                                ReceiverUtils.handleCharacters(receiver, lines[pos].substring(first, last+1));
                             }
                         }
                         // Only output newlines between lines, not after the last line

src/test/java/com/nwalsh/sinclude/FakeDocumentResolver.java

@@ -172,7 +172,7 @@ public class FakeDocumentResolver implements DocumentResolver {
                 "  </section>\n" +
                 "</doc>\n");
         xmlMap.put("trimtext.xml", "<doc xmlns:xi='http://www.w3.org/2001/XInclude'>\n" +
-                "<xi:include href='four.txt' parse='text' fragid='L2-L4'/>\n" +
+                "<xi:include href='four.txt' parse='text' fragid='L2-L6'/>\n" +
                 "</doc>\n");
     }
 
@@ -182,7 +182,7 @@ public class FakeDocumentResolver implements DocumentResolver {
         textMap.put("one.txt", "This is line one.\n");
         textMap.put("two.txt", "\n\n\n\n\n\n\n\n\nThis is line 10.\n\n\n\n\nThis is line 15.");
         textMap.put("three.xml", "<doc>Document three.</doc>");
-        textMap.put("four.txt", "    Four leading blanks\n   Three leading blanks\n      Six leading blanks\nNo leading blanks");
+        textMap.put("four.txt", "    Four leading blanks\n   {\n      Three leading blanks\n  }\n       Four leading blanks\nNo leading blanks");
     }
 
     private static Map<String, String> expandedMap = null;
@@ -318,7 +318,7 @@ public class FakeDocumentResolver implements DocumentResolver {
                 "</doc>\n");
         expandedMap.put("selfrefloop.xml", "<doc/>");
         expandedMap.put("trimtext.xml", "<doc xmlns:xi='http://www.w3.org/2001/XInclude'>\n" +
-                "Three leading blanks\n   Six leading blanks\nNo leading blanks\n\n" +
+                "{\n   Three leading blanks\n}\n    Four leading blanks\nNo leading blanks\n\n" +
                 "</doc>\n");
 
     }