Merge pull request #109 from dlyongemallo/master

Accept a new tag "epithet" for "excl" entries.

Author: De7vID

CHANGELOG

@@ -1,5 +1,7 @@
 CHANGELOG
 
+2021-04-09: Treat epithets as beings capable of language for the purposes of analysis.
+2021-04-07: Add {qolqoS} font.
 2021-03-28: Fixed bug where inhps words displayed wrong message about plural suffix.
 2021-02-22: Minor bug fixes. Added support for Anki decks and KLCP1 vocabulary.
 2021-02-06: Improve database upgrade logic.

app/src/main/java/org/tlhInganHol/android/klingonassistant/KlingonContentProvider.java

@@ -482,6 +482,9 @@ private enum SentenceType {
 
     private SentenceType mSentenceType = SentenceType.PHRASE;
 
+    // Exclamation attributes.
+    boolean mIsEpithet = false;
+
     // Categories of words and phrases.
     boolean mIsAnimal = false;
     boolean mIsArchaic = false;
@@ -748,6 +751,12 @@ private void processMetadata() {
         } else if (attr.equals("joke")) {
           mSentenceType = SentenceType.JOKE;
 
+          // Exclamation attributes.
+        } else if (attr.equals("epithet")) {
+          mIsEpithet = true;
+          // TODO: Determine whether epithets are treated as if they always implicitly refer to
+          // beings capable of language, and if so, set mIsBeingCapableOfLanguage to true here.
+
           // Categories.
         } else if (attr.equals("anim")) {
           mIsAnimal = true;
@@ -1422,6 +1431,10 @@ public boolean isPlural() {
       return mIsPlural;
     }
 
+    public boolean isEpithet() {
+      return mIsEpithet;
+    }
+
     public boolean isArchaic() {
       return mIsArchaic;
     }
@@ -1824,11 +1837,13 @@ public boolean isSatisfiedBy(Entry candidate) {
         }
         // The parts of speech must match, except when: we're looking for a verb, in which
         // case a pronoun will satisfy the requirement; or we're looking for a noun, in which case
-        // the question words {nuq} and {'Iv} are accepted. We have these exceptions because we want
-        // to allow constructions like {ghaHtaH} and for those two question words to take the place
-        // of the nouns they are asking about. Note that entries knows nothing about affixes, so
-        // it's up to the caller to exclude, e.g., prefixes on pronouns. The homophony of {'Iv:ques}
-        // and {'Iv:n} necessitates adding a homophone number to distinguish them.
+        // the question words {nuq} and {'Iv}, as well as exclamations which are epithets, are
+        // accepted. We have these exceptions because we want to allow constructions like {ghaHtaH},
+        // for those two question words to take the place of the nouns they are asking about, and
+        // to parse constructions such as {petaQpu'}. Note that entries knows nothing about affixes,
+        // so it's up to the caller to exclude, e.g., prefixes on pronouns. The homophony of
+        // {'Iv:ques} and {'Iv:n} necessitates adding a homophone number (in the database) to
+        // distinguish them.
         // TODO: Remove redundant {nuq} + {-Daq}.
         Log.d(TAG, "mBasePartOfSpeech: " + mBasePartOfSpeech);
         Log.d(TAG, "candidate.getBasePartOfSpeech: " + candidate.getBasePartOfSpeech());
@@ -1839,8 +1854,12 @@ public boolean isSatisfiedBy(Entry candidate) {
             (mBasePartOfSpeech == BasePartOfSpeechEnum.NOUN
                 && (candidate.getEntryName().equals("nuq")
                     || candidate.getEntryName().equals("'Iv")));
+        boolean candidateIsExclamationActingAsNoun =
+            (mBasePartOfSpeech == BasePartOfSpeechEnum.NOUN && candidate.isEpithet());
         if (mBasePartOfSpeech != candidate.getBasePartOfSpeech()) {
-          if (!candidateIsPronounActingAsVerb && !candidateIsQuestionWordActingAsNoun) {
+          if (!candidateIsPronounActingAsVerb
+              && !candidateIsQuestionWordActingAsNoun
+              && !candidateIsExclamationActingAsNoun) {
             return false;
           }
         }

app/src/main/res/values/strings.xml

@@ -184,7 +184,7 @@
     <string name="font_latin">Off</string>
     <string name="font_tng">TNG-style</string>
     <string name="font_dsc">DSC-style</string>
-    <string name="font_core">{qolqoS}</string>
+    <string name="font_core">\"Sans-serif\"-style</string>
 
     <!-- Choices for secondary languages. -->
     <string name="secondary_language_none">None</string>