summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Fultz <jfultz@wolfram.com>2019-07-19 20:23:03 -0700
committerJohn Fultz <jfultz@wolfram.com>2019-07-19 20:23:03 -0700
commitb55d54480976b27766665511e4698af4a4b175e9 (patch)
tree84bf60144bf05848313c664ed0e889cba8f7a22f
parent3f0db0f2834738e963865a8e19c2a1d68a99482c (diff)
Add CSW19 dictionary.
Also, rename cswapr07 to csw07 (I think enough years have passed that the need to distinguish the "April update" has passed... but I nonetheless mention it in the copyrights file).
-rw-r--r--data/lexica/copyrights.txt2
-rw-r--r--data/lexica/csw07.dawg (renamed from data/lexica/cswapr07.dawg)bin2641082 -> 2641082 bytes
-rw-r--r--data/lexica/csw19.dawgbin0 -> 1470696 bytes
-rw-r--r--quacker/settings.cpp6
4 files changed, 5 insertions, 3 deletions
diff --git a/data/lexica/copyrights.txt b/data/lexica/copyrights.txt
index 0e436d7..32459f5 100644
--- a/data/lexica/copyrights.txt
+++ b/data/lexica/copyrights.txt
@@ -3,6 +3,8 @@ de591703:NASPA School Word List 2018 (NSWL2018), Copyright © 2019 North America
5a728cf0:School Scrabble Word List 2016 Edition (SSWL2016), Copyright © 2016 Hasbro, Inc. Published under license with Merriam-Webster, Incorporated.
9ea8d964:Official Tournament and Club Word List 2016 Edition (OTCWL2016), Copyright © 2016 Hasbro, Inc. Published under license with Merriam-Webster, Incorporated.
0109ce12:Official Tournament and Club Word List 2014 Edition (OTCWL2014), Copyright © 2014 Hasbro, Inc. Published under license with Merriam-Webster, Incorporated.
+f4fec274:Collins Offical Scrabble™ Wordlist 2019, ©HarperCollins Publishers Ltd 2019
48dea2c8:Collins Scrabble™ Words 2015, ©HarperCollins Publishers Ltd 2015
eea8dfe5:Collins Scrabble™ Words 2012, ©HarperCollins Publishers Ltd 2015
+23cd8bb8:Collins Scrabble™ Words 2007 (April update), ©HarperCollins Publishers Ltd 2015
d5aeccff:ODS7
diff --git a/data/lexica/cswapr07.dawg b/data/lexica/csw07.dawg
index 6e6dca7..6e6dca7 100644
--- a/data/lexica/cswapr07.dawg
+++ b/data/lexica/csw07.dawg
Binary files differ
diff --git a/data/lexica/csw19.dawg b/data/lexica/csw19.dawg
new file mode 100644
index 0000000..51df3f1
--- /dev/null
+++ b/data/lexica/csw19.dawg
Binary files differ
diff --git a/quacker/settings.cpp b/quacker/settings.cpp
index bb26dfc..b487bb0 100644
--- a/quacker/settings.cpp
+++ b/quacker/settings.cpp
@@ -215,11 +215,11 @@ void Settings::initialize()
QUACKLE_DATAMANAGER->setAppDataDirectory(m_appDataDir.toStdString());
QUACKLE_DATAMANAGER->setUserDataDirectory(m_userDataDir.toStdString());
- QString lexiconName = settings.value("quackle/settings/lexicon-name", QString("twl06")).toString();
+ QString lexiconName = settings.value("quackle/settings/lexicon-name", QString("nwl18")).toString();
// Handle Collins update.
- if (lexiconName == "cswfeb07")
- lexiconName = "cswapr07";
+ if (lexiconName == "cswfeb07" || lexiconName == "cswapr07")
+ lexiconName = "csw07";
setQuackleToUseLexiconName(lexiconName);
setQuackleToUseAlphabetName(settings.value("quackle/settings/alphabet-name", QString("english")).toString());