Make sure to put the right things in the alphabet of the binary FST. …

…Fixes bug introduced in 6c2486a

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ(2.52)
 
 m4_define([PKG_VERSION_MAJOR], [3])
 m4_define([PKG_VERSION_MINOR], [6])
-m4_define([PKG_VERSION_PATCH], [5])
+m4_define([PKG_VERSION_PATCH], [6])
 
 AC_INIT([lttoolbox], [PKG_VERSION_MAJOR.PKG_VERSION_MINOR.PKG_VERSION_PATCH], [apertium-stuff@lists.sourceforge.net], [lttoolbox], [https://wiki.apertium.org/wiki/Lttoolbox])
 

lttoolbox/att_compiler.cc

@@ -88,7 +88,7 @@ AttCompiler::is_word_punct(UChar32 symbol)
 void
 AttCompiler::update_alphabet(UChar32 c)
 {
- if (is_word_punct(c) || !(u_ispunct(c) && u_isspace(c))) {
+ if (is_word_punct(c) || !(u_ispunct(c) || u_isspace(c))) {
  letters.insert(c);
  if(u_islower(c)) {
  letters.insert(u_toupper(c));

tests/data/alphabet.att

@@ -0,0 +1,9 @@
+0 1 a a
+1 2 b b
+2 3 c c
+0 3 . .
+4 3 <h> <h>
+0 4 c c
+4 3 @_SPACE_@ @_SPACE_@
+0 3 ? ?
+3

tests/lt_print/__init__.py

@@ -40,3 +40,17 @@ class SectionsFst(unittest.TestCase, PrintTest):
 1\t2\tε\t<np>\t0.000000\t
 2\t0.000000
 """
+
+
+class Alphabet(unittest.TestCase, PrintTest):
+ printdix = "data/alphabet.att"
+ printdir = "lr"
+ printflags = ["-a"]
+ expectedOutput = """A
+B
+C
+a
+b
+c
+<h>
+"""

tests/printtest.py

@@ -15,6 +15,7 @@ class PrintTest(BasicTest):
  printdir = "lr"
  expectedOutput = ""
  expectedRetCodeFail = False
+ printflags = []
 
  def compileTest(self, tmpd):
  self.assertEqual(0, call([os.environ['LTTOOLBOX_PATH']+"/lt-comp",
@@ -27,7 +28,7 @@ def runTest(self):
  tmpd = mkdtemp()
  try:
  self.compileTest(tmpd)
- self.printresult = Popen([os.environ['LTTOOLBOX_PATH']+"/lt-print"] + [tmpd+"/compiled.bin"],
+ self.printresult = Popen([os.environ['LTTOOLBOX_PATH']+"/lt-print"] + self.printflags + [tmpd+"/compiled.bin"],
  stdout=PIPE,
  stderr=PIPE)