Merge branch 'master' into 0.5b1

MANIFEST.in

@@ -12,4 +12,4 @@ recursive-include tests *.py
 recursive-include tests/data *
 
 recursive-include doc/build/html *
-include doc/_build/latex/*.pdf
\ No newline at end of file
+include doc/build/latex/*.pdf
\ No newline at end of file

craw/annotation.py

@@ -19,7 +19,7 @@ class Entry:
                                                                                                                 values))
         self._values = [self._convert(f, v) for f, v in zip(self._fields, values)]
         if self.start is not None:
-            if not self.start <= self.ref <= self.stop or self.start >= self.ref >= self.stop:
+            if not self.start < self.ref < self.stop or self.start > self.ref > self.stop:
                 raise RuntimeError("error in line '{line}': {ref_col} {ref} is not "
                                    "between {start_col}: {start} and {stop_col}: {stop}".format(
                                     line=self,

doc/source/conf.py

@@ -63,9 +63,9 @@ author = u'Bertrand Néron'
 # built documents.
 #
 # The short X.Y version.
-version = '0.1a'
+version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.1a'
+release = '0.5b1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.