Added whitespace/newline in textcontent behaviour check and bumped ve…

…rsion (proycon/folia#34)

pynlpl/__init__.py

@@ -2,4 +2,4 @@
 
 The library is divided into several packages and modules. It is designed for Python 2.6 and upwards. Including Python 3."""
 
-VERSION = "1.2"
+VERSION = "1.2.1"

pynlpl/tests/folia.py

@@ -37,7 +37,7 @@
     stderr = sys.stderr
     stdout = sys.stdout
 
-FOLIARELEASE = "v1.5.0.57"
+FOLIARELEASE = "v1.5.0.58"
 #FOLIARELEASE = None #development version, do *NOT* release if this is set!
 
 if os.path.exists('../../../FoLiA'):
@@ -3681,7 +3681,7 @@ def test013g_correction(self):
         self.assertTrue(raised)
 
     def test014_fullparagraph(self):
-        """Validation - Text Validation on a full paragraph"""
+        """Validation - Text Validation with sentence text delimiter inheritance"""
         xml = """<?xml version="1.0" encoding="UTF-8"?>
 <FoLiA xmlns="http://ilk.uvt.nl/folia" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="test" version="{version}" generator="{generator}">
   <metadata type="native">
@@ -3894,6 +3894,24 @@ def test014_fullparagraph(self):
         doc = folia.Document(string=xml, textvalidation=True)
 
 
+    def test015_textwhitespace(self):
+        """Validation - Text Validation with sentence text delimiter inheritance"""
+        xml = """<?xml version="1.0" encoding="UTF-8"?>
+<FoLiA xmlns="http://ilk.uvt.nl/folia" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="test" version="{version}" generator="{generator}">
+  <metadata type="native">
+    <annotations>
+    </annotations>
+  </metadata>
+  <text xml:id="test">
+      <s xml:id="test.s"><t>Dit
+         is een rare test.
+         </t>
+      </s>
+    </text>
+</FoLiA>""".format(version=folia.FOLIAVERSION, generator='pynlpl.formats.folia-v' + folia.LIBVERSION)
+        doc = folia.Document(string=xml, textvalidation=True)
+        self.assertEqual( doc['test.s'].text(), "Dit\n         is een rare test.\n         ")
+
 
 with io.open(FOLIAPATH + '/test/example.xml', 'r',encoding='utf-8') as foliaexample_f:
     FOLIAEXAMPLE = foliaexample_f.read()

setup.py

@@ -23,7 +23,7 @@ def read(fname):
 
 setup(
     name = "PyNLPl",
-    version = "1.2", #edit version in __init__.py as well and ensure tests/folia.py FOLIARELEASE points to the right version and is not set to None!
+    version = "1.2.1", #edit version in __init__.py as well and ensure tests/folia.py FOLIARELEASE points to the right version and is not set to None!
     author = "Maarten van Gompel",
     author_email = "proycon@anaproy.nl",
     description = ("PyNLPl, pronounced as 'pineapple', is a Python library for Natural Language Processing. It contains various modules useful for common, and less common, NLP tasks. PyNLPl contains modules for basic tasks, clients for interfacting with server, and modules for parsing several file formats common in NLP, most notably FoLiA."),