Changeset 268
- Timestamp:
- 01/06/08 00:14:24 (1 year ago)
- Files:
-
- lex/trunk/jsp/clause.jsp (modified) (2 diffs)
- lex/trunk/jsp/gen-export.jsp (modified) (1 diff)
- lex/trunk/jsp/parse.jsp (modified) (1 diff)
- lex/trunk/src/com/qwirx/lex/morph/HebrewMorphemeGenerator.java (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
lex/trunk/jsp/clause.jsp
r263 r268 113 113 " graphical_nominal_ending, " + 114 114 " person, number, gender, state, " + 115 " surface_consonants " + 115 " surface_consonants, " + 116 " suffix_person, suffix_number, suffix_gender " + 116 117 " ]"+ 117 118 " ]"+ … … 1158 1159 EmdrosChange ch = (EmdrosChange)( 1159 1160 emdros.createChange(EmdrosChange.CREATE, 1160 "note", n ull));1161 "note", new int[]{selClauseId})); 1161 1162 ch.setString("text", newNoteText); 1162 ch.setMonadsFromObjects(new int[]{selClauseId});1163 1163 ch.execute(); 1164 1164 } lex/trunk/jsp/gen-export.jsp
r263 r268 37 37 " graphical_preformative, graphical_root_formation, " + 38 38 " graphical_lexeme, graphical_verbal_ending, " + 39 " graphical_nominal_ending, graphical_pron_suffix]" + 39 " graphical_nominal_ending, graphical_pron_suffix, " + 40 " suffix_person, suffix_number, suffix_gender] " + 40 41 " ]"+ 41 42 "]" lex/trunk/jsp/parse.jsp
r259 r268 271 271 " graphical_root_formation, " + 272 272 " graphical_nominal_ending, " + 273 " person, number, gender, state " + 273 " person, number, gender, state, " + 274 " suffix_person, suffix_number, suffix_gender " + 274 275 " ]"+ 275 276 " ]"+ lex/trunk/src/com/qwirx/lex/morph/HebrewMorphemeGenerator.java
r259 r268 65 65 "tense", 66 66 "stem", 67 "suffix_gender", 68 "suffix_number", 69 "suffix_person" 67 70 })); 68 71 } … … 82 85 83 86 String verbEnding = null; 84 String nounEnding = null; 87 String nounEnding = null; 88 89 String suffixText = 90 word.getEMdFValue("graphical_pron_suffix").getString(); 91 String suffixGloss = null; 85 92 86 93 if (generateGloss) … … 121 128 verbEnding = person + gender + number; 122 129 nounEnding = gender + number + state; 130 131 if (suffixText.equals("")) 132 { 133 suffixGloss = "SUFF"; 134 } 135 else 136 { 137 String suffixGender = word.getFeatureAsString( 138 word.getEMdFValueIndex("suffix_gender")); 139 if (suffixGender.equals("masculine")) { suffixGender = "M"; } 140 else if (suffixGender.equals("feminine")) { suffixGender = "F"; } 141 else if (suffixGender.equals("common")) { suffixGender = "="; } 142 143 String suffixNumber = word.getFeatureAsString( 144 word.getEMdFValueIndex("suffix_number")); 145 if (suffixNumber.equals("singular")) { suffixNumber = "sg"; } 146 else if (suffixNumber.equals("plural")) { suffixNumber = "pl"; } 147 148 String suffixPerson = word.getFeatureAsString( 149 word.getEMdFValueIndex("suffix_person")); 150 if (suffixPerson.equals("first_person")) { suffixPerson = "1"; } 151 else if (suffixPerson.equals("second_person")) { suffixPerson = "2"; } 152 else if (suffixPerson.equals("third_person")) { suffixPerson = "3"; } 153 154 suffixGloss = suffixPerson + suffixGender + suffixNumber; 155 } 123 156 } 124 157 … … 160 193 verbEnding, "V/PGN"); 161 194 162 handler.convert("graphical_pron_suffix", true, "SUFF", "V/SFX");195 handler.convert("graphical_pron_suffix", true, suffixGloss, "V/SFX"); 163 196 } 164 197 else if (psp.equals("noun") … … 175 208 handler.convert("graphical_nominal_ending", false, 176 209 nounEnding, "MARK/N"); 177 handler.convert("graphical_pron_suffix", true, "SUFF", "SFX/N");210 handler.convert("graphical_pron_suffix", true, suffixGloss, "SFX/N"); 178 211 } 179 212 else … … 234 267 "part of speech: " + psp); 235 268 } 236 237 handler.convert("graphical_lexeme", true, type, type); 269 270 boolean hasSuffix = !(suffixText.equals("")); 271 handler.convert("graphical_lexeme", !hasSuffix, type, type); 272 273 if (hasSuffix) 274 { 275 handler.convert("graphical_pron_suffix", true, 276 suffixGloss, type + "/SFX"); 277 } 238 278 } 239 279
