Merge pull request #213 from rrthomas/master

Minor fix, and hence new minor release

.travis.yml

@@ -43,7 +43,10 @@ matrix:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install glib dbus-glib aspell hspell hunspell libvoikko unittest-cpp ; fi
+  # Note: aspell should work on macOS, but has been removed from the next
+  # line because one of the tests fails; see
+  # https://github.com/Homebrew/homebrew-core/issues/40976
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install glib dbus-glib hspell hunspell libvoikko unittest-cpp ; fi
 
 script:
   - ./bootstrap

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([enchant],[2.2.3])
+AC_INIT([enchant],[2.2.4])
 AC_CONFIG_SRCDIR(src/enchant.h)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -77,6 +77,7 @@ if test "$gl_gcc_warnings" = yes; then
   nw="$nw -Wstrict-overflow"  # Use a lower level (see below).
   nw="$nw -Wconversion"       # These warnings usually don’t point to mistakes.
   nw="$nw -Wsign-conversion"  # Likewise.
+  nw="$nw -Wimplicit-fallthrough=5" # We want to allow "fallthrough" comments.
 
   gl_MANYWARN_ALL_GCC([warnings])
 

index.html

@@ -14,6 +14,7 @@ <h1>Enchant</h1>
 
 <h2>News</h2>
 
+<p>June 17, 2018: Enchant 2.2.4 released.
 <p>February 4, 2018: Enchant 2.2.3 released.
 <p>January 3, 2018: Enchant 2.2.1 released.
 <p>December 12, 2017: Enchant 2.2.0 released.

src/enchant.c

@@ -197,17 +197,13 @@ static GSList *
 tokenize_line (EnchantDict * dict, GString * line)
 {
 	GSList * tokens = NULL;
-	char *utf = (char *) line->str;
-
-	GString * word;
-
-	gunichar uc;
+	gchar *utf = (char *) line->str;
 	size_t cur_pos = 0;
 	size_t start_pos = 0;
-	word = g_string_new (NULL);
+	GString * word = g_string_new (NULL);
 
 	while (cur_pos < line->len && *utf) {
-		int i;
+		gunichar uc;
 
 	        /* Skip non-word characters. */
 		cur_pos = g_utf8_pointer_to_offset ((const char*)line->str, utf);
@@ -228,10 +224,12 @@ tokenize_line (EnchantDict * dict, GString * line)
 		}
 
 	        /* Skip backwards over any characters that can't appear at the end of a word. */
-		i = word->len-1;
-	        while ((i >= 0) && !enchant_dict_is_word_character(dict, word->str[i], 2)) {
-	                g_string_truncate (word, i);
-			i--;
+	        for (gchar *i_utf = word->str + word->len;
+		     (i_utf = g_utf8_find_prev_char (word->str, i_utf)) != NULL;
+		     g_string_truncate (word, i_utf - word->str)) {
+			uc = g_utf8_get_char (i_utf);
+			if (enchant_dict_is_word_character(dict, uc, 2))
+				break;
 		}
 
 		/* Save (word, position) tuple. */