2 files changed, 11 insertions, 1 deletions
diff --git a/emoticons.txt b/emoticons.txt
index 15382b4..dd3742d 100644
--- a/emoticons.txt
+++ b/emoticons.txt

@@ -10,4 +10,8 @@ o_o
 X_X
 x_x
 ^_^
->_<
-\ No newline at end of file
+>_<
+:(
+:|
+:/
+:?
+\ No newline at end of file
diff --git a/kgramstats.cpp b/kgramstats.cpp
index 4daf474..e6048d9 100644
--- a/kgramstats.cpp
+++ b/kgramstats.cpp

@@ -61,6 +61,12 @@ kgramstats::kgramstats(std::string corpus, int maxK)
  freevar fv_emoticons {emoticons, "emoticons.txt"};
  std::map<std::string, std::string> canonical_form;
  
+  // Ensure the old-style freevars exist
+  canonical_form["$name$"] = "$name$";
+  words.emplace("$name$", std::string("$name$"));
+  canonical_form["$noun$"] = "$noun$";
+  words.emplace("$noun$", std::string("$noun$"));
+  
  AspellConfig* spell_config = new_aspell_config();
  AspellCanHaveError* possible_err = new_aspell_speller(spell_config);
  if (aspell_error_number(possible_err) != 0)